chore: release v0.1.0.107

Remove unused decryptJson import after crew decrypt fix.
Fixes client TypeScript build blocked by pre-deploy checks. Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-03 11:50:37 +02:00 · 2026-06-03 11:50:01 +02:00 · 2026-06-03 11:49:23 +02:00 · 2026-06-03 11:48:45 +02:00 · 2026-06-03 11:43:10 +02:00 · 2026-06-03 11:27:16 +02:00
206 changed files with 24548 additions and 1135 deletions
@@ -1,13 +1,36 @@
 OpenWeatherMapAPIKey=<owm_api_key>

+# OpenRouter API (AI travel day summaries — server-side proxy)
+OpenRouterAPIKey=
+# Optional model override (default: anthropic/claude-3.5-haiku)
+# Valid examples: anthropic/claude-3.5-haiku, anthropic/claude-3-haiku, anthropic/claude-haiku-4.5
+# OpenRouterModel=anthropic/claude-3.5-haiku
+
+# DeepL API (for scripts/translate-locales.mjs and scripts/translate-flyer.mjs)
+# Free plan keys use api-free.deepl.com automatically (suffix :fx)
+DeepLAPIKey=
+
 # Passkey configuration (WebAuthn Relying Party ID and Origin)
-# For local dev: localhost and http://localhost
-# For production: e.g. kapteins-daagbok.eu and https://kapteins-daagbok.eu
+# For local dev: use localhost (NOT 127.0.0.1 — browsers reject IP addresses for Passkeys)
+# Production (kapteins-daagbok.eu):
+#   RP_ID=kapteins-daagbok.eu
+#   ORIGIN=https://kapteins-daagbok.eu
 RP_ID=localhost
-# Must match the frontend URL (Vite dev: http://localhost:5173; Docker: http://localhost)
+# Must match the frontend URL exactly (Vite dev: http://localhost:5173; Docker: http://localhost)
 ORIGIN=http://localhost:5173
-# Optional: comma-separated CORS origins (defaults to ORIGIN; dev also allows 127.0.0.1:5173)
-# CORS_ORIGINS=http://localhost:5173,http://127.0.0.1:5173
+
+# Behind reverse proxy — see docs/deployment/npm-security.md
+# Docker Compose (NPM → frontend nginx → backend): TRUST_PROXY=1
+# TRUST_PROXY=1
+
+# Docker Compose database (required for production deploy)
+# Generate: openssl rand -hex 24
+# Rotate on running server: ./scripts/rotate-postgres-password.sh (see docs/deployment/postgres-password.md)
+# POSTGRES_USER=postgres
+# POSTGRES_PASSWORD=
+# POSTGRES_DB=daagbox
+# Optional: comma-separated CORS origins (defaults to ORIGIN; 127.0.0.1 may be allowed for CORS but not for login)
+# CORS_ORIGINS=http://localhost:5173

 # API session signing (min. 32 chars; required in production)
 # Generate: openssl rand -base64 48
@@ -11,3 +11,5 @@ server/dist/
 .env.local
 .env.*.local
 *.log
+
+userfeedback/
@@ -219,13 +219,19 @@ cd server && npx prisma db push && cd ..
 | Health Check | http://localhost:5000/api/health |
 | Public Demo | http://localhost:5173/demo |

-### 5. Tests (Frontend)
+### 5. Qualität & Tests
+
+Vor jedem Deploy auf [kapteins-daagbok.eu](https://kapteins-daagbok.eu/) (kein externes CI):

 ```bash
-cd client && npm test
+npm run check
+# oder: ./scripts/predeploy-check.sh
 ```

-Vitest-Unit-Tests für Utils, i18n und Services (z. B. Kurswinkel, Benutzereinstellungen).
+Einzeln: `npm test` (Client + Server) · `npm run build` · optional `npm run lint` (Client, noch nicht in `check`)
+
+- **Client:** Vitest für Utils, i18n, Services
+- **Server:** Smoke-Tests (`/api/health`, Auth-Guards) mit Supertest — siehe `server/src/api.smoke.test.ts`

 ## Docker (produktionsnah)

@@ -237,11 +243,12 @@ Gesamten Stack lokal bauen und starten:

 Frontend: http://localhost · API: http://localhost/api/health · Demo: http://localhost/demo

-Umgebungsvariablen in `.env` setzen — mindestens `RP_ID`, `ORIGIN` (z. B. `http://localhost`) und `SESSION_SECRET`. Für Push die VAPID-Variablen an den Backend-Container durchreichen (`docker-compose.yml` → `backend.environment`). Für Feedback `NTFY_*` setzen.
+Umgebungsvariablen in `.env` setzen — mindestens `RP_ID`, `ORIGIN` (z. B. `http://localhost`), `SESSION_SECRET` und für Docker Compose `POSTGRES_PASSWORD`. Für Push die VAPID-Variablen an den Backend-Container durchreichen (`docker-compose.yml` → `backend.environment`). Für Feedback `NTFY_*` setzen.

 ## Deployment

-Produktions-Update auf den Server (konfigurierbar via Umgebungsvariablen):
+Produktions-Update auf den Server (konfigurierbar via Umgebungsvariablen). Führt vor dem SSH-Deploy automatisch [`predeploy-check.sh`](scripts/predeploy-check.sh) aus (`npm run check`):
+

 ```bash
 ./scripts/update-prod.sh
@@ -249,12 +256,17 @@ Produktions-Update auf den Server (konfigurierbar via Umgebungsvariablen):

 Standard-Ziel: `root@10.0.0.25:/opt/kapteins-daagbok` — per `REMOTE_HOST`, `REMOTE_USER`, `REMOTE_DIR` überschreibbar.

-Auf dem Server müssen `server/.env` (oder gleichwertige Umgebung) u. a. `DATABASE_URL`, `RP_ID`, `ORIGIN`, `SESSION_SECRET` (≥ 32 Zeichen) und bei Push `VAPID_*` enthalten. Optional `NTFY_*` für Feedback. Nach Schema-Änderungen: `npx prisma db push` im Backend-Container.
+Auf dem Server müssen `.env` u. a. `POSTGRES_PASSWORD`, `RP_ID`, `ORIGIN` (`https://kapteins-daagbok.eu`), `SESSION_SECRET` (≥ 32 Zeichen), `TRUST_PROXY` (NPM, z. B. `172.16.10.10` oder `1`) und bei Push `VAPID_*` enthalten. Optional `NTFY_*` für Feedback. Nach Schema-Änderungen: `npx prisma db push` im Backend-Container.
+
+Hinter **Nginx Proxy Manager**: [docs/deployment/npm-security.md](docs/deployment/npm-security.md).

 ## Dokumentation

 | Dokument | Inhalt |
 |----------|--------|
+| [docs/deployment/npm-security.md](docs/deployment/npm-security.md) | NPM, TLS, `trust proxy`, Security-Header |
+| [docs/deployment/predeploy.md](docs/deployment/predeploy.md) | Pre-Deploy-Checks ohne CI |
+| [docs/deployment/postgres-password.md](docs/deployment/postgres-password.md) | PostgreSQL-Passwort rotieren / App-Rolle |
 | [docs/plausible-events.md](docs/plausible-events.md) | Custom Events für Plausible Analytics |
 | [docs/push-notifications-plan.md](docs/push-notifications-plan.md) | Web Push: Architektur, API, Testplan |
 | [docs/plan-compass-course-dial.md](docs/plan-compass-course-dial.md) | Kompass-Dial: UX- und Implementierungsplan |
@@ -1 +1 @@
-0.1.0.59
+0.1.0.108
@@ -12,6 +12,9 @@
    <link rel="canonical" href="https://kapteins-daagbok.eu/" />
    <link rel="alternate" hreflang="de" href="https://kapteins-daagbok.eu/?lng=de" />
    <link rel="alternate" hreflang="en" href="https://kapteins-daagbok.eu/?lng=en" />
+    <link rel="alternate" hreflang="da" href="https://kapteins-daagbok.eu/?lng=da" />
+    <link rel="alternate" hreflang="sv" href="https://kapteins-daagbok.eu/?lng=sv" />
+    <link rel="alternate" hreflang="nb" href="https://kapteins-daagbok.eu/?lng=nb" />
    <link rel="alternate" hreflang="x-default" href="https://kapteins-daagbok.eu/" />
    <meta name="mobile-web-app-capable" content="yes" />
    <meta name="apple-mobile-web-app-capable" content="yes" />
@@ -19,6 +22,7 @@
    <meta name="apple-mobile-web-app-title" content="Daagbok" />
    <meta name="theme-color" content="#0b0c10" />
    <script src="/appearance-bootstrap.js"></script>
+    <script src="/bootstrap-watchdog.js"></script>
    <link rel="apple-touch-icon" href="/logo.png" />
    <meta property="og:type" content="website" />
    <meta property="og:site_name" content="Kapteins Daagbok" />
@@ -3,15 +3,32 @@ server {
    server_name localhost;
    client_max_body_size 50M;

+    # Security headers (TLS/HSTS at NPM — see docs/deployment/npm-security.md)
+    add_header X-Content-Type-Options "nosniff" always;
+    add_header X-Frame-Options "SAMEORIGIN" always;
+    add_header Referrer-Policy "strict-origin-when-cross-origin" always;
+    add_header Permissions-Policy "camera=(self), geolocation=(self), microphone=()" always;
+    add_header Content-Security-Policy "default-src 'self'; script-src 'self' https://plausible.elpatron.me; connect-src 'self' https://plausible.elpatron.me; img-src 'self' data: blob: https://*.tile.openstreetmap.org; style-src 'self' 'unsafe-inline'; font-src 'self'; object-src 'none'; base-uri 'self'; frame-ancestors 'self';" always;
+
    # Service worker and app shell must revalidate so PWA updates are detected
-    location ~* ^/(sw\.js|workbox-.*\.js|manifest\.webmanifest)$ {
+    location ~* ^/(sw\.js|workbox-.*\.js|manifest\.webmanifest|version\.json)$ {
        root /usr/share/nginx/html;
-        add_header Cache-Control "no-cache, no-store, must-revalidate";
+        add_header Cache-Control "no-cache, no-store, must-revalidate" always;
+        add_header X-Content-Type-Options "nosniff" always;
+        add_header X-Frame-Options "SAMEORIGIN" always;
+        add_header Referrer-Policy "strict-origin-when-cross-origin" always;
+        add_header Permissions-Policy "camera=(self), geolocation=(self), microphone=()" always;
+        add_header Content-Security-Policy "default-src 'self'; script-src 'self' https://plausible.elpatron.me; connect-src 'self' https://plausible.elpatron.me; img-src 'self' data: blob: https://*.tile.openstreetmap.org; style-src 'self' 'unsafe-inline'; font-src 'self'; object-src 'none'; base-uri 'self'; frame-ancestors 'self';" always;
    }

    location = /index.html {
        root /usr/share/nginx/html;
-        add_header Cache-Control "no-cache, must-revalidate";
+        add_header Cache-Control "no-cache, must-revalidate" always;
+        add_header X-Content-Type-Options "nosniff" always;
+        add_header X-Frame-Options "SAMEORIGIN" always;
+        add_header Referrer-Policy "strict-origin-when-cross-origin" always;
+        add_header Permissions-Policy "camera=(self), geolocation=(self), microphone=()" always;
+        add_header Content-Security-Policy "default-src 'self'; script-src 'self' https://plausible.elpatron.me; connect-src 'self' https://plausible.elpatron.me; img-src 'self' data: blob: https://*.tile.openstreetmap.org; style-src 'self' 'unsafe-inline'; font-src 'self'; object-src 'none'; base-uri 'self'; frame-ancestors 'self';" always;
    }

    location / {
@@ -26,6 +43,9 @@ server {
        proxy_set_header Upgrade $http_upgrade;
        proxy_set_header Connection 'upgrade';
        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
        proxy_cache_bypass $http_upgrade;
    }
 }
@@ -17,6 +17,7 @@
        "jspdf": "^4.2.1",
        "leaflet": "^1.9.4",
        "lucide-react": "^1.16.0",
+        "qrcode": "^1.5.4",
        "react": "^19.2.6",
        "react-dom": "^19.2.6",
        "react-i18next": "^17.0.8"
@@ -25,6 +26,7 @@
        "@eslint/js": "^10.0.1",
        "@types/leaflet": "^1.9.21",
        "@types/node": "^24.12.3",
+        "@types/qrcode": "^1.5.5",
        "@types/react": "^19.2.14",
        "@types/react-dom": "^19.2.3",
        "@vitejs/plugin-react": "^4.7.0",
@@ -34,7 +36,6 @@
        "globals": "^17.6.0",
        "happy-dom": "^20.9.0",
        "playwright": "^1.51.0",
-        "qrcode": "^1.5.4",
        "typescript": "~6.0.2",
        "typescript-eslint": "^8.59.2",
        "vite": "^6.3.5",
@@ -2970,6 +2971,16 @@
      "integrity": "sha512-VWDCbrLeVXJM9fihYodcLiIv0ku+AlOa/TQ1SvYOaBuyrSKgEcro95LJyIsJ4vSo6BXIxOKxiJAat04CmST9Fw==",
      "license": "MIT"
    },
+    "node_modules/@types/qrcode": {
+      "version": "1.5.6",
+      "resolved": "https://registry.npmjs.org/@types/qrcode/-/qrcode-1.5.6.tgz",
+      "integrity": "sha512-te7NQcV2BOvdj2b1hCAHzAoMNuj65kNBMz0KBaxM6c3VGBOhU0dURQKOtH8CFNI/dsKkwlv32p26qYQTWoB5bw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
    "node_modules/@types/raf": {
      "version": "3.4.3",
      "resolved": "https://registry.npmjs.org/@types/raf/-/raf-3.4.3.tgz",
@@ -3461,7 +3472,6 @@
      "version": "5.0.1",
      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
      "license": "MIT",
      "engines": {
        "node": ">=8"
@@ -3471,7 +3481,6 @@
      "version": "4.3.0",
      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "color-convert": "^2.0.1"
@@ -3777,7 +3786,6 @@
      "version": "5.3.1",
      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "dev": true,
      "license": "MIT",
      "engines": {
        "node": ">=6"
@@ -3855,7 +3863,6 @@
      "version": "6.0.0",
      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-      "dev": true,
      "license": "ISC",
      "dependencies": {
        "string-width": "^4.2.0",
@@ -3867,7 +3874,6 @@
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "color-name": "~1.1.4"
@@ -3880,7 +3886,6 @@
      "version": "1.1.4",
      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true,
      "license": "MIT"
    },
    "node_modules/commander": {
@@ -4051,7 +4056,6 @@
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
-      "dev": true,
      "license": "MIT",
      "engines": {
        "node": ">=0.10.0"
@@ -4140,7 +4144,6 @@
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/dijkstrajs/-/dijkstrajs-1.0.3.tgz",
      "integrity": "sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA==",
-      "dev": true,
      "license": "MIT"
    },
    "node_modules/dompurify": {
@@ -4195,7 +4198,6 @@
      "version": "8.0.0",
      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true,
      "license": "MIT"
    },
    "node_modules/entities": {
@@ -4948,7 +4950,6 @@
      "version": "2.0.5",
      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "dev": true,
      "license": "ISC",
      "engines": {
        "node": "6.* || 8.* || >= 10.*"
@@ -5498,7 +5499,6 @@
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
      "license": "MIT",
      "engines": {
        "node": ">=8"
@@ -6208,7 +6208,6 @@
      "version": "2.2.0",
      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true,
      "license": "MIT",
      "engines": {
        "node": ">=6"
@@ -6231,7 +6230,6 @@
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
      "license": "MIT",
      "engines": {
        "node": ">=8"
@@ -6376,7 +6374,6 @@
      "version": "5.0.0",
      "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-5.0.0.tgz",
      "integrity": "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==",
-      "dev": true,
      "license": "MIT",
      "engines": {
        "node": ">=10.13.0"
@@ -6458,7 +6455,6 @@
      "version": "1.5.4",
      "resolved": "https://registry.npmjs.org/qrcode/-/qrcode-1.5.4.tgz",
      "integrity": "sha512-1ca71Zgiu6ORjHqFBDpnSMTR2ReToX4l1Au1VFLyVeBTFavzQnv5JxMFr3ukHVKpSrSA2MCk0lNJSykjUfz7Zg==",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "dijkstrajs": "^1.0.1",
@@ -6653,7 +6649,6 @@
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
-      "dev": true,
      "license": "MIT",
      "engines": {
        "node": ">=0.10.0"
@@ -6673,7 +6668,6 @@
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-      "dev": true,
      "license": "ISC"
    },
    "node_modules/resolve": {
@@ -6845,7 +6839,6 @@
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
-      "dev": true,
      "license": "ISC"
    },
    "node_modules/set-function-length": {
@@ -7113,7 +7106,6 @@
      "version": "4.2.3",
      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "emoji-regex": "^8.0.0",
@@ -7230,7 +7222,6 @@
      "version": "6.0.1",
      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "ansi-regex": "^5.0.1"
@@ -8067,7 +8058,6 @@
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
      "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==",
-      "dev": true,
      "license": "ISC"
    },
    "node_modules/which-typed-array": {
@@ -8343,7 +8333,6 @@
      "version": "6.2.0",
      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "ansi-styles": "^4.0.0",
@@ -8380,7 +8369,6 @@
      "version": "4.0.3",
      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
-      "dev": true,
      "license": "ISC"
    },
    "node_modules/yallist": {
@@ -8394,7 +8382,6 @@
      "version": "15.4.1",
      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "cliui": "^6.0.0",
@@ -8417,7 +8404,6 @@
      "version": "18.1.3",
      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
-      "dev": true,
      "license": "ISC",
      "dependencies": {
        "camelcase": "^5.0.0",
@@ -8431,7 +8417,6 @@
      "version": "4.1.0",
      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "locate-path": "^5.0.0",
@@ -8445,7 +8430,6 @@
      "version": "5.0.0",
      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "p-locate": "^4.1.0"
@@ -8458,7 +8442,6 @@
      "version": "2.3.0",
      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "p-try": "^2.0.0"
@@ -8474,7 +8457,6 @@
      "version": "4.1.0",
      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "p-limit": "^2.2.0"
@@ -10,7 +10,12 @@
    "test": "vitest run",
    "preview": "vite preview",
    "generate:flyer": "node ../scripts/generate-beta-flyer.mjs",
-    "generate:flyer:setup": "playwright install chromium"
+    "generate:flyer:png": "node ../scripts/generate-beta-flyer.mjs --png",
+    "generate:flyer:all": "node ../scripts/generate-beta-flyer.mjs --all",
+    "generate:flyer:setup": "playwright install chromium",
+    "translate:locales": "node ../scripts/translate-locales.mjs",
+    "translate:flyer": "node ../scripts/translate-flyer.mjs",
+    "validate:i18n": "node ../scripts/validate-i18n-keys.mjs"
  },
  "dependencies": {
    "@simplewebauthn/browser": "^13.3.0",
@@ -24,12 +29,14 @@
    "lucide-react": "^1.16.0",
    "react": "^19.2.6",
    "react-dom": "^19.2.6",
-    "react-i18next": "^17.0.8"
+    "react-i18next": "^17.0.8",
+    "qrcode": "^1.5.4"
  },
  "devDependencies": {
    "@eslint/js": "^10.0.1",
    "@types/leaflet": "^1.9.21",
    "@types/node": "^24.12.3",
+    "@types/qrcode": "^1.5.5",
    "@types/react": "^19.2.14",
    "@types/react-dom": "^19.2.3",
    "@vitejs/plugin-react": "^4.7.0",
@@ -39,7 +46,6 @@
    "globals": "^17.6.0",
    "happy-dom": "^20.9.0",
    "playwright": "^1.51.0",
-    "qrcode": "^1.5.4",
    "typescript": "~6.0.2",
    "typescript-eslint": "^8.59.2",
    "vite": "^6.3.5",
@@ -0,0 +1,221 @@
+/**
+ * Boot watchdog for production PWAs.
+ * Recovers from white/black screens when stale HTML points to missing JS chunks.
+ * Does not clear caches automatically while offline to protect unsynced data.
+ */
+(function () {
+  if (location.hostname === 'localhost' || location.hostname === '127.0.0.1') {
+    return
+  }
+
+  var BOOT_TIMEOUT_MS = 12000
+  var ATTEMPT_WINDOW_MS = 120000
+  var ATTEMPT_COUNT_KEY = 'pwa_boot_watchdog_attempt_count'
+  var ATTEMPT_LAST_KEY = 'pwa_boot_watchdog_attempt_last_ts'
+  var PENDING_EVENTS_KEY = 'pwa_boot_pending_events'
+  var MAX_PENDING_EVENTS = 12
+
+  function enqueueEvent(name, props) {
+    try {
+      var current = JSON.parse(sessionStorage.getItem(PENDING_EVENTS_KEY) || '[]')
+      if (!Array.isArray(current)) current = []
+      current.push({ name: name, props: props, ts: Date.now() })
+      if (current.length > MAX_PENDING_EVENTS) {
+        current = current.slice(current.length - MAX_PENDING_EVENTS)
+      }
+      sessionStorage.setItem(PENDING_EVENTS_KEY, JSON.stringify(current))
+    } catch (_) {
+      /* ignore analytics queue errors */
+    }
+  }
+
+  function emit(name, props) {
+    if (typeof window.plausible === 'function') {
+      if (props && Object.keys(props).length > 0) {
+        window.plausible(name, { props: props })
+      } else {
+        window.plausible(name)
+      }
+      return
+    }
+    enqueueEvent(name, props)
+  }
+
+  function hasBootstrapped() {
+    return window.__KDB_APP_BOOTSTRAPPED === true
+  }
+
+  function resetAttempts() {
+    try {
+      sessionStorage.removeItem(ATTEMPT_COUNT_KEY)
+      sessionStorage.removeItem(ATTEMPT_LAST_KEY)
+    } catch (_) {
+      /* ignore storage errors */
+    }
+  }
+
+  function nextAttempt() {
+    try {
+      var now = Date.now()
+      var last = Number(sessionStorage.getItem(ATTEMPT_LAST_KEY) || '0')
+      var count = Number(sessionStorage.getItem(ATTEMPT_COUNT_KEY) || '0')
+      if (now - last > ATTEMPT_WINDOW_MS) {
+        count = 0
+      }
+      count += 1
+      sessionStorage.setItem(ATTEMPT_COUNT_KEY, String(count))
+      sessionStorage.setItem(ATTEMPT_LAST_KEY, String(now))
+      return count
+    } catch (_) {
+      return 1
+    }
+  }
+
+  function createRecoveryUrl(reason) {
+    try {
+      var url = new URL(location.href)
+      url.searchParams.set('boot_recover', reason)
+      url.searchParams.set('_', String(Date.now()))
+      return url.toString()
+    } catch (_) {
+      return location.href
+    }
+  }
+
+  async function clearServiceWorkerCaches() {
+    if ('serviceWorker' in navigator) {
+      try {
+        var registrations = await navigator.serviceWorker.getRegistrations()
+        await Promise.all(
+          registrations.map(function (registration) {
+            return registration.unregister()
+          })
+        )
+      } catch (_) {
+        /* ignore SW cleanup errors */
+      }
+    }
+    if ('caches' in window) {
+      try {
+        var keys = await caches.keys()
+        await Promise.all(
+          keys.map(function (key) {
+            return caches.delete(key)
+          })
+        )
+      } catch (_) {
+        /* ignore cache cleanup errors */
+      }
+    }
+  }
+
+  function renderFallback(isOffline) {
+    var root = document.getElementById('root')
+    if (!root) return
+
+    root.innerHTML =
+      '<div class="auth-screen">' +
+      '<div class="auth-card glass" role="alert" style="max-width:460px">' +
+      '<h2 style="margin-top:0">Kapteins Daagbok</h2>' +
+      '<p style="color:var(--app-text-muted);line-height:1.5;margin-bottom:8px">' +
+      (isOffline
+        ? 'Die App konnte offline nicht sauber starten. Deine lokalen, nicht synchronisierten Daten bleiben erhalten.'
+        : 'Die App konnte nicht sauber starten. Deine lokalen, nicht synchronisierten Daten bleiben erhalten.') +
+      '</p>' +
+      '<p style="color:var(--app-text-muted);line-height:1.5;margin-top:0">' +
+      (isOffline
+        ? 'Bitte neu laden. Wenn wieder Netz verfügbar ist, kann die App-Engine automatisch repariert werden.'
+        : 'Du kannst jetzt eine App-Reparatur ausfuehren, ohne IndexedDB-Logbuchdaten zu loeschen.') +
+      '</p>' +
+      '<button type="button" class="btn primary" id="boot-reload-btn" style="width:100%">' +
+      'Neu laden' +
+      '</button>' +
+      (!isOffline
+        ? '<button type="button" class="btn secondary" id="boot-repair-btn" style="width:100%;margin-top:12px">' +
+          'App-Reparatur (Cache + Service Worker)' +
+          '</button>'
+        : '') +
+      '</div>' +
+      '</div>'
+
+    var reloadBtn = document.getElementById('boot-reload-btn')
+    if (reloadBtn) {
+      reloadBtn.addEventListener('click', function () {
+        location.replace(createRecoveryUrl('retry'))
+      })
+    }
+
+    var repairBtn = document.getElementById('boot-repair-btn')
+    if (repairBtn) {
+      repairBtn.addEventListener('click', function () {
+        emit('PWA Boot Watchdog Manual Repair', {
+          attempt: Number(sessionStorage.getItem(ATTEMPT_COUNT_KEY) || '0'),
+          online: navigator.onLine
+        })
+        Promise.resolve()
+          .then(clearServiceWorkerCaches)
+          .finally(function () {
+            resetAttempts()
+            location.replace(createRecoveryUrl('manual-hard-recovery'))
+          })
+      })
+    }
+  }
+
+  function runWatchdog() {
+    window.setTimeout(function () {
+      if (hasBootstrapped()) {
+        resetAttempts()
+        return
+      }
+
+      var attempt = nextAttempt()
+      var online = navigator.onLine
+
+      if (attempt === 1) {
+        emit('PWA Boot Watchdog Soft', {
+          attempt: attempt,
+          online: online,
+          reason: online ? 'soft-reload' : 'offline-retry'
+        })
+        Promise.resolve()
+          .then(function () {
+            if ('serviceWorker' in navigator && navigator.serviceWorker.getRegistration) {
+              return navigator.serviceWorker.getRegistration().then(function (registration) {
+                if (registration) {
+                  return registration.update().catch(function () {})
+                }
+              })
+            }
+          })
+          .finally(function () {
+            location.replace(createRecoveryUrl(online ? 'soft-reload' : 'offline-retry'))
+          })
+        return
+      }
+
+      if (attempt === 2 && online) {
+        emit('PWA Boot Watchdog Hard', {
+          attempt: attempt,
+          online: online,
+          reason: 'hard-recovery'
+        })
+        Promise.resolve()
+          .then(clearServiceWorkerCaches)
+          .finally(function () {
+            location.replace(createRecoveryUrl('hard-recovery'))
+          })
+        return
+      }
+
+      emit('PWA Boot Watchdog Fallback', {
+        attempt: attempt,
+        online: online,
+        reason: online ? 'retries-exhausted' : 'offline-retries-exhausted'
+      })
+      renderFallback(!online)
+    }, BOOT_TIMEOUT_MS)
+  }
+
+  runWatchdog()
+})()
@@ -1,11 +1,14 @@
 import { useState, useEffect, useCallback, useRef } from 'react'
-import './App.css'
 import { DialogProvider } from './components/ModalDialog.tsx'
 import AuthOnboarding from './components/AuthOnboarding.tsx'
 import UserProfilePage from './components/UserProfilePage.tsx'
 import LogbookDashboard from './components/LogbookDashboard.tsx'
-import VesselForm from './components/VesselForm.tsx'
-import CrewForm from './components/CrewForm.tsx'
+import LogbookVesselPicker from './components/LogbookVesselPicker.tsx'
+import LogbookCrewPicker from './components/LogbookCrewPicker.tsx'
+import { migrateLegacyCrewToPoolIfNeeded } from './services/crewMigration.js'
+import { migrateLegacyYachtsToPoolIfNeeded } from './services/vesselMigration.js'
+import { syncVesselPool } from './services/vesselPoolSync.js'
+import { syncPersonPool } from './services/personPoolSync.js'
 // Compass Deviation Table — für Freizeit-Skipper vorerst deaktiviert (Komponente bleibt erhalten)
 // import DeviationForm from './components/DeviationForm.tsx'
 import LogEntriesList from './components/LogEntriesList.tsx'
@@ -29,6 +32,7 @@ import {
  resolveColorScheme,
  subscribeToSystemColorScheme
 } from './services/appearance.js'
+import { syncAppearancePrefs } from './services/appearancePrefs.js'
 import { startBackgroundSync, stopBackgroundSync, syncAllLogbooks, subscribeToSyncState } from './services/sync.js'
 import ReadOnlyViewer from './components/ReadOnlyViewer.tsx'
 import DemoViewer from './components/DemoViewer.tsx'
@@ -44,13 +48,17 @@ import { useLiveQuery } from 'dexie-react-hooks'
 import { Ship, LogOut, ChevronLeft, Users, FileText, Settings, Wifi, WifiOff, Languages, BarChart2 } from 'lucide-react'
 import DisclaimerHeaderButton from './components/DisclaimerHeaderButton.tsx'
 import FeedbackHeaderButton from './components/FeedbackHeaderButton.tsx'
+import ProfileHeaderButton from './components/ProfileHeaderButton.tsx'
 import { useTranslation } from 'react-i18next'
+import { cycleAppLanguage } from './utils/i18nLanguages.js'
 import {
  resolveTourLogbookContext,
  seedDemoLogbookIfNeeded
 } from './services/demoLogbook.js'
 import { fetchLogbooks, parseCollaborationRole } from './services/logbook.js'
 import { ensurePushSubscriptionIfEnabled } from './services/pushNotifications.js'
+import SyncConflictBanner from './components/SyncConflictBanner.tsx'
+import { requestPersistentStorage } from './utils/storagePersist.js'

 const PENDING_PUSH_LOGBOOK_KEY = 'pending_push_logbook_id'

@@ -69,6 +77,7 @@ function App() {
  const [isSyncing, setIsSyncing] = useState(false)
  const [isAcceptingInvite, setIsAcceptingInvite] = useState(false)
  const [showUserProfile, setShowUserProfile] = useState(false)
+  const [storagePersistHint, setStoragePersistHint] = useState(false)
  const tourLogbookRef = useRef<{ id: string; title: string } | null>(null)
  const activeLogbookRef = useRef<{ id: string | null; title: string | null }>({
    id: activeLogbookId,
@@ -94,7 +103,7 @@ function App() {
    [activeLogbookId]
  )

-  const [activeAccessRole, setActiveAccessRole] = useState<LogbookAccessRole | null>('OWNER')
+  const [activeAccessRole, setActiveAccessRole] = useState<LogbookAccessRole | null>(null)

  useEffect(() => {
    if (!activeLogbookId) {
@@ -151,6 +160,15 @@ function App() {
    })
  }, [])

+  useEffect(() => {
+    if (!isAuthenticated) return
+    const userId = localStorage.getItem('active_userid')
+    if (!userId) return
+    void syncAppearancePrefs(userId)
+    void migrateLegacyCrewToPoolIfNeeded().then(() => syncPersonPool())
+    void migrateLegacyYachtsToPoolIfNeeded().then(() => syncVesselPool())
+  }, [isAuthenticated])
+
  useEffect(() => {
    const handleOnline = () => {
      setOnline(true)
@@ -419,10 +437,19 @@ function App() {
    return () => navigator.serviceWorker.removeEventListener('message', onSwMessage)
  }, [isAuthenticated, openLogbookById])

+  useEffect(() => {
+    if (!isAuthenticated) return
+    if (sessionStorage.getItem('storage_persist_hint_dismissed')) return
+    void requestPersistentStorage().then(({ persisted, supported }) => {
+      if (supported && !persisted) setStoragePersistHint(true)
+    })
+  }, [isAuthenticated])
+
  const handleAuthenticated = async () => {
    setIsAuthenticated(true)
    trackPlausibleEvent(PlausibleEvents.LOGGED_IN)
    void ensurePushSubscriptionIfEnabled()
+    void requestPersistentStorage()

    try {
      const demo = await seedDemoLogbookIfNeeded()
@@ -489,8 +516,7 @@ function App() {
  }

  const toggleLanguage = () => {
-    const nextLang = i18n.language.startsWith('de') ? 'en' : 'de'
-    i18n.changeLanguage(nextLang)
+    cycleAppLanguage(i18n)
  }

  const handleExitDemo = () => {
@@ -548,24 +574,30 @@ function App() {
  const logbookReadOnly =
    activeLogbookRecord?.isShared === 1 && activeAccessRole === 'READ'
  const isLogbookOwner =
-    activeAccessRole === 'OWNER' || activeLogbookRecord?.isShared !== 1
+    activeAccessRole === 'OWNER' ||
+    (activeLogbookRecord != null && activeLogbookRecord.isShared !== 1)
+
+  if (showUserProfile) {
+    return (
+      <div style={{ display: 'contents' }}>
+        {pwaInstallBanner}
+        <UserProfilePage
+          onBack={() => setShowUserProfile(false)}
+          onLogout={handleLogout}
+        />
+      </div>
+    )
+  }

  if (!activeLogbookId) {
    return (
      <div style={{ display: 'contents' }}>
        {pwaInstallBanner}
-        {showUserProfile ? (
-          <UserProfilePage
-            onBack={() => setShowUserProfile(false)}
-            onLogout={handleLogout}
-          />
-        ) : (
-          <LogbookDashboard
-            onSelectLogbook={selectLogbook}
-            onLogout={handleLogout}
-            onOpenProfile={() => setShowUserProfile(true)}
-          />
-        )}
+        <LogbookDashboard
+          onSelectLogbook={selectLogbook}
+          onLogout={handleLogout}
+          onOpenProfile={() => setShowUserProfile(true)}
+        />
      </div>
    )
  }
@@ -593,7 +625,7 @@ function App() {
              <p className="app-subtitle">
                {activeAccessRole && activeAccessRole !== 'OWNER'
                  ? t('dashboard.section_shared_hint')
-                  : `${t('app.name')} / ${activeLogbookId?.substring(0, 8)}...`}
+                  : t('app.tagline')}
              </p>
            </div>
          </div>
@@ -615,6 +647,8 @@ function App() {
              <Languages size={18} />
            </button>

+            <ProfileHeaderButton onClick={() => setShowUserProfile(true)} />
+
            <DisclaimerHeaderButton />

            <FeedbackHeaderButton
@@ -631,10 +665,28 @@ function App() {
          </div>
        </header>

+        <SyncConflictBanner logbookId={activeLogbookId} />
+
+        {storagePersistHint && (
+          <div className="storage-persist-hint glass" role="status">
+            <p>{t('pwa.storage_persist_hint')}</p>
+            <button
+              type="button"
+              className="btn secondary"
+              onClick={() => {
+                sessionStorage.setItem('storage_persist_hint_dismissed', '1')
+                setStoragePersistHint(false)
+              }}
+            >
+              {t('pwa.later')}
+            </button>
+          </div>
+        )}
+
      {/* Active Workspace */}
      <div className="app-body">
        {/* Navigation Sidebar */}
-        <aside className="app-sidebar">
+        <aside className="app-sidebar" aria-label={t('nav.dashboard')}>
          <button
            className={`sidebar-btn ${activeTab === 'logs' ? 'active' : ''}`}
            onClick={() => void handleTabChange('logs')}
@@ -656,7 +708,7 @@ function App() {
          <button
            className={`sidebar-btn ${activeTab === 'crew' ? 'active' : ''}`}
            onClick={() => void handleTabChange('crew')}
-            data-tour="nav-crew"
+            data-tour="nav-logbook-crew"
          >
            <Users size={18} />
            {t('nav.crew')}
@@ -703,14 +755,19 @@ function App() {
          )}

          {activeTab === 'vessel' && (
-            <VesselForm logbookId={activeLogbookId} readOnly={logbookReadOnly || !isLogbookOwner} />
+            <LogbookVesselPicker
+              logbookId={activeLogbookId}
+              readOnly={logbookReadOnly || !isLogbookOwner}
+              selectionOnly={!isLogbookOwner && activeLogbookRecord?.isShared === 1}
+              onOpenProfile={isLogbookOwner ? () => setShowUserProfile(true) : undefined}
+            />
          )}

          {activeTab === 'crew' && (
-            <CrewForm
+            <LogbookCrewPicker
              logbookId={activeLogbookId}
              readOnly={logbookReadOnly}
-              skipperReadOnly={!isLogbookOwner}
+              selectionOnly={!isLogbookOwner && activeLogbookRecord?.isShared === 1}
            />
          )}

@@ -731,6 +788,53 @@ function App() {
            />
          )}
        </main>
+
+        <nav className="app-bottom-nav" aria-label={t('nav.dashboard')}>
+          <button
+            type="button"
+            className={`bottom-nav-btn ${activeTab === 'logs' ? 'active' : ''}`}
+            onClick={() => void handleTabChange('logs')}
+            data-tour="nav-logs"
+          >
+            <FileText size={20} />
+            <span>{t('nav.logs')}</span>
+          </button>
+          <button
+            type="button"
+            className={`bottom-nav-btn ${activeTab === 'vessel' ? 'active' : ''}`}
+            onClick={() => void handleTabChange('vessel')}
+            data-tour="nav-vessel"
+          >
+            <Ship size={20} />
+            <span>{t('nav.vessel')}</span>
+          </button>
+          <button
+            type="button"
+            className={`bottom-nav-btn ${activeTab === 'crew' ? 'active' : ''}`}
+            onClick={() => void handleTabChange('crew')}
+            data-tour="nav-logbook-crew"
+          >
+            <Users size={20} />
+            <span>{t('nav.crew')}</span>
+          </button>
+          <button
+            type="button"
+            className={`bottom-nav-btn ${activeTab === 'stats' ? 'active' : ''}`}
+            onClick={() => void handleTabChange('stats')}
+            data-tour="nav-stats"
+          >
+            <BarChart2 size={20} />
+            <span>{t('nav.stats')}</span>
+          </button>
+          <button
+            type="button"
+            className={`bottom-nav-btn ${activeTab === 'settings' ? 'active' : ''}`}
+            onClick={() => void handleTabChange('settings')}
+          >
+            <Settings size={20} />
+            <span>{t('nav.settings')}</span>
+          </button>
+        </nav>
      </div>
    </div>
  </div>
@@ -1,20 +1,28 @@
 import React, { useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { 
-  registerUser, 
-  loginUser, 
-  completeLoginWithRecovery, 
-  setLocalPin, 
-  hasLocalPin, 
-  decryptWithLocalPin, 
+import { cycleAppLanguage, getNextLanguage } from '../utils/i18nLanguages.js'
+import {
+  registerUser,
+  loginUser,
+  completeLoginWithRecovery,
+  setLocalPin,
+  hasLocalPin,
+  decryptWithLocalPin,
  getActiveMasterKey,
  getKnownUsernames,
-  forgetUsername
+  forgetUsername,
+  hasUnlockedLocalSession,
+  logoutUser
 } from '../services/auth.js'
 import { KeyRound, ShieldAlert, Languages, HelpCircle, UserRound, X } from 'lucide-react'
 import RegistrationDisclaimer from './RegistrationDisclaimer.tsx'
 import DisclaimerModal from './DisclaimerModal.tsx'
 import BetaBadge from './BetaBadge.tsx'
+import {
+  isPasskeyCompatibleLocation,
+  localizeWebAuthnError,
+  toPasskeyCompatibleUrl
+} from '../utils/passkeyHost.ts'

 interface AuthOnboardingProps {
  onAuthenticated: () => void
@@ -53,6 +61,16 @@ export default function AuthOnboarding({ onAuthenticated, onOpenDemo }: AuthOnbo
  const [showDisclaimer, setShowDisclaimer] = useState(false)
  const [showHelp, setShowHelp] = useState(false)

+  const passkeyHostOk = isPasskeyCompatibleLocation()
+  const passkeyCompatibleUrl = passkeyHostOk ? null : toPasskeyCompatibleUrl(window.location.href)
+
+  const formatAuthError = (message: string) =>
+    localizeWebAuthnError(message, {
+      invalidHost: t('auth.error_invalid_host'),
+      cancelled: t('auth.error_passkey_cancelled'),
+      invalidRpId: t('auth.error_invalid_rp_id')
+    })
+
  const finishAuth = () => {
    if (isNewRegistration) {
      setShowDisclaimer(true)
@@ -80,7 +98,7 @@ export default function AuthOnboarding({ onAuthenticated, onOpenDemo }: AuthOnbo
        setRecoveryPhrase(result.recoveryPhrase)
      }
    } catch (err: any) {
-      setError(err.message || 'Registration failed')
+      setError(formatAuthError(err.message || 'Registration failed'))
    } finally {
      setLoading(false)
    }
@@ -120,7 +138,7 @@ export default function AuthOnboarding({ onAuthenticated, onOpenDemo }: AuthOnbo
        }
      }
    } catch (err: any) {
-      setError(err.message || 'Login failed')
+      setError(formatAuthError(err.message || 'Login failed'))
    } finally {
      setLoading(false)
    }
@@ -184,19 +202,33 @@ export default function AuthOnboarding({ onAuthenticated, onOpenDemo }: AuthOnbo

  const handlePinLoginSubmit = async (e: React.FormEvent) => {
    e.preventDefault()
-    if (!pinLoginInput.trim()) return
+    if (!pinLoginInput.trim() || loading) return
+
+    const resolvedUser =
+      username.trim() ||
+      encryptedPayloads?.username ||
+      localStorage.getItem('active_username') ||
+      ''
+    if (!resolvedUser) {
+      setError(t('auth.error_session_incomplete'))
+      return
+    }

    setLoading(true)
    setError(null)
    try {
-      const resolvedUser = username.trim() || encryptedPayloads?.username
      const key = await decryptWithLocalPin(pinLoginInput.trim(), resolvedUser)
-      if (key) {
-        onAuthenticated()
-      } else {
+      if (!key) {
        setError(t('auth.error_incorrect_pin'))
+        return
      }
-    } catch (err: any) {
+      if (!hasUnlockedLocalSession()) {
+        setError(t('auth.error_session_incomplete'))
+        return
+      }
+      setShowPinLogin(false)
+      onAuthenticated()
+    } catch {
      setError(t('auth.error_incorrect_pin'))
    } finally {
      setLoading(false)
@@ -209,8 +241,7 @@ export default function AuthOnboarding({ onAuthenticated, onOpenDemo }: AuthOnbo
  }

  const toggleLanguage = () => {
-    const nextLang = i18n.language.startsWith('de') ? 'en' : 'de'
-    i18n.changeLanguage(nextLang)
+    cycleAppLanguage(i18n)
  }

  const copyToClipboard = () => {
@@ -361,6 +392,24 @@ export default function AuthOnboarding({ onAuthenticated, onOpenDemo }: AuthOnbo
            >
              {t('auth.use_recovery_instead')}
            </button>
+
+            <button
+              type="button"
+              className="btn secondary"
+              onClick={() => {
+                void (async () => {
+                  setShowPinLogin(false)
+                  setPinLoginInput('')
+                  setEncryptedPayloads(null)
+                  setError(null)
+                  await logoutUser()
+                })()
+              }}
+              disabled={loading}
+              style={{ width: '100%' }}
+            >
+              {t('auth.back')}
+            </button>
          </div>
        </form>
      </div>
@@ -379,16 +428,37 @@ export default function AuthOnboarding({ onAuthenticated, onOpenDemo }: AuthOnbo
          {t('auth.recovery_fallback_warning')}
        </p>

-        <form onSubmit={handleRecoverySubmit} className="auth-form">
-          <textarea
-            className="input-textarea"
-            placeholder={t('auth.recovery_placeholder')}
-            value={recoveryInput}
-            onChange={(e) => setRecoveryInput(e.target.value)}
-            disabled={loading}
-            rows={3}
-            required
-          />
+        <form onSubmit={handleRecoverySubmit} className="auth-form" autoComplete="on">
+          {(username.trim() || encryptedPayloads?.username) && (
+            <input
+              type="text"
+              name="username"
+              autoComplete="username"
+              value={username.trim() || encryptedPayloads?.username || ''}
+              readOnly
+              tabIndex={-1}
+              aria-hidden="true"
+              style={{ position: 'absolute', width: 0, height: 0, opacity: 0, pointerEvents: 'none' }}
+            />
+          )}
+          <div className="input-group">
+            <label htmlFor="recovery-key" className="input-label" style={{ display: 'block', marginBottom: '8px', color: '#94a3b8' }}>
+              {t('auth.enter_recovery')}
+            </label>
+            <input
+              id="recovery-key"
+              name="recovery-key"
+              type="password"
+              className="input-text"
+              placeholder={t('auth.recovery_placeholder')}
+              value={recoveryInput}
+              onChange={(e) => setRecoveryInput(e.target.value)}
+              disabled={loading}
+              required
+              autoComplete="current-password"
+              style={{ width: '100%', padding: '12px', boxSizing: 'border-box' }}
+            />
+          </div>

          {error && <div className="auth-error">{error}</div>}

@@ -424,12 +494,21 @@ export default function AuthOnboarding({ onAuthenticated, onOpenDemo }: AuthOnbo
      </div>

      <div className="auth-form" style={{ width: '100%', display: 'flex', flexDirection: 'column', gap: '20px' }}>
+        {!passkeyHostOk && passkeyCompatibleUrl && (
+          <div className="auth-error" role="alert">
+            <p style={{ margin: '0 0 8px' }}>{t('auth.error_invalid_host')}</p>
+            <a href={passkeyCompatibleUrl} className="btn secondary" style={{ display: 'inline-block', textDecoration: 'none' }}>
+              {t('auth.use_localhost_link')}
+            </a>
+          </div>
+        )}
+
        {/* Prominent Login button */}
        <button
          type="button"
          className="btn primary"
          onClick={() => handleLogin()}
-          disabled={loading}
+          disabled={loading || !passkeyHostOk}
          style={{ width: '100%', padding: '16px' }}
        >
          {loading
@@ -562,7 +641,7 @@ export default function AuthOnboarding({ onAuthenticated, onOpenDemo }: AuthOnbo
          <button
            type="submit"
            className="btn secondary"
-            disabled={loading || !username.trim()}
+            disabled={loading || !username.trim() || !passkeyHostOk}
            style={{ width: '100%' }}
          >
            {t('auth.register')}
@@ -575,7 +654,7 @@ export default function AuthOnboarding({ onAuthenticated, onOpenDemo }: AuthOnbo
      <div className="auth-footer">
        <button type="button" className="btn-icon-text" onClick={toggleLanguage}>
          <Languages size={18} />
-          {i18n.language.startsWith('de') ? 'English' : 'Deutsch'}
+          {t(`languages.${getNextLanguage(i18n.language)}`)}
        </button>
        <button
          type="button"
@@ -6,6 +6,7 @@ import { getLogbookKey } from '../services/logbookKeys.js'
 import { encryptJson, decryptJson } from '../services/crypto.js'
 import { syncLogbook } from '../services/sync.js'
 import { PlausibleEvents, trackPlausibleEvent } from '../services/analytics.js'
+import { MAX_POOL_CREW_MEMBERS } from '../types/person.js'
 import { useDialog } from './ModalDialog.tsx'
 import { Users, User, Plus, Trash2, Edit2, Save, X, Check, Camera } from 'lucide-react'

@@ -603,7 +604,7 @@ export default function CrewForm({
            <Users size={24} className="form-icon" />
            <h2>{t('crew.crew_section')}</h2>
          </div>
-          {!readOnly && crewList.length < 5 && !showMemberForm && (
+          {!readOnly && crewList.length < MAX_POOL_CREW_MEMBERS && !showMemberForm && (
            <button className="btn primary" onClick={openAddMember} style={{ width: 'auto', padding: '8px 16px' }}>
              <Plus size={16} />
              {t('crew.add_crew')}
@@ -1,10 +1,15 @@
 import { useState, useEffect } from 'react'
 import { useTranslation } from 'react-i18next'
-import VesselForm from './VesselForm.tsx'
-import CrewForm from './CrewForm.tsx'
+import { cycleAppLanguage, getNextLanguage } from '../utils/i18nLanguages.js'
+import LogbookVesselPicker from './LogbookVesselPicker.tsx'
+import LogbookCrewPicker from './LogbookCrewPicker.tsx'
+import type { LogbookCrewSelectionData } from '../types/person.js'
+import { personToSnapshot } from '../utils/personSnapshots.js'
 import LogEntriesList from './LogEntriesList.tsx'
 import { Ship, Users, FileText, Lock, Globe, ChevronLeft, UserPlus } from 'lucide-react'
 import { buildPublicDemoFixture, type PublicDemoFixture } from '../services/demoLogbookData.js'
+import type { VesselData } from '../types/vessel.js'
+import type { LogbookVesselSelectionData } from '../types/vessel.js'
 import { useAppTour, type AppTab } from '../context/AppTourContext.tsx'
 import { PlausibleEvents, trackPlausibleEvent } from '../services/analytics.js'

@@ -31,7 +36,9 @@ export default function DemoViewer({ onExit }: DemoViewerProps) {
    registerNavigation({
      setActiveTab,
      setSelectedEntryId: setTourSelectedEntryId,
-      setFeedbackOpen: () => {}
+      setFeedbackOpen: () => {},
+      setLogbookActive: () => {},
+      setProfileOpen: () => {}
    })
    registerDemoTourContext({ firstEntryId: fixture.firstEntryId })

@@ -46,11 +53,32 @@ export default function DemoViewer({ onExit }: DemoViewerProps) {
  }, [registerNavigation, registerDemoTourContext, startTour, fixture.firstEntryId])

  const toggleLanguage = () => {
-    const nextLang = i18n.language.startsWith('de') ? 'en' : 'de'
-    i18n.changeLanguage(nextLang)
+    cycleAppLanguage(i18n)
  }

-  const { title, yacht, crews, entries, gpsTracks, photos, firstEntryId } = fixture
+  const {
+    title,
+    yacht,
+    vesselPool,
+    logbookVesselSelection,
+    personPool,
+    logbookCrewSelection,
+    entries,
+    gpsTracks,
+    photos,
+    firstEntryId
+  } = fixture
+
+  const demoSelection: LogbookCrewSelectionData = {
+    activeSkipperId: logbookCrewSelection.activeSkipperId,
+    activeCrewIds: logbookCrewSelection.activeCrewIds,
+    snapshotsById: Object.fromEntries(
+      Object.entries(logbookCrewSelection.snapshotsById).map(([id, snap]) => [
+        id,
+        personToSnapshot(id, snap)
+      ])
+    )
+  }

  return (
    <div className="app-layout">
@@ -85,7 +113,7 @@ export default function DemoViewer({ onExit }: DemoViewerProps) {
          </button>
          <button className="btn secondary" onClick={toggleLanguage} style={{ width: 'auto', padding: '6px 12px', fontSize: '13px' }}>
            <Globe size={14} style={{ marginRight: '4px' }} />
-            {i18n.language.startsWith('de') ? 'English' : 'Deutsch'}
+            {t(`languages.${getNextLanguage(i18n.language)}`)}
          </button>
        </div>
      </header>
@@ -113,7 +141,7 @@ export default function DemoViewer({ onExit }: DemoViewerProps) {
          <button
            className={`sidebar-btn ${activeTab === 'crew' ? 'active' : ''}`}
            onClick={() => setActiveTab('crew')}
-            data-tour="nav-crew"
+            data-tour="nav-logbook-crew"
          >
            <Users size={18} />
            {t('nav.crew')}
@@ -136,11 +164,24 @@ export default function DemoViewer({ onExit }: DemoViewerProps) {
          )}

          {activeTab === 'vessel' && (
-            <VesselForm logbookId="demo" readOnly={true} preloadedData={yacht} />
+            <LogbookVesselPicker
+              logbookId="demo"
+              readOnly={true}
+              preloadedPool={vesselPool.map((v) => ({
+                payloadId: v.payloadId,
+                data: v.data as VesselData
+              }))}
+              preloadedSelection={logbookVesselSelection as LogbookVesselSelectionData}
+            />
          )}

          {activeTab === 'crew' && (
-            <CrewForm logbookId="demo" readOnly={true} preloadedData={crews} />
+            <LogbookCrewPicker
+              logbookId="demo"
+              readOnly={true}
+              preloadedPool={personPool}
+              preloadedSelection={demoSelection}
+            />
          )}
        </main>
      </div>
@@ -13,7 +13,12 @@ export default function DisclaimerModal({ open, onClose }: DisclaimerModalProps)
      if (event.key === 'Escape') onClose()
    }
    window.addEventListener('keydown', onKeyDown)
-    return () => window.removeEventListener('keydown', onKeyDown)
+    const prevOverflow = document.body.style.overflow
+    document.body.style.overflow = 'hidden'
+    return () => {
+      window.removeEventListener('keydown', onKeyDown)
+      document.body.style.overflow = prevOverflow
+    }
  }, [open, onClose])

  if (!open) return null
@@ -0,0 +1,168 @@
+import { useEffect, useMemo, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { Users } from 'lucide-react'
+import type { EntryCrewFields, PersonSnapshot } from '../types/person.js'
+import { loadPersonPool } from '../services/personPool.js'
+import { loadLogbookCrewSelection } from '../services/logbookCrewSelection.js'
+import { buildSnapshotsForSelection } from '../utils/personSnapshots.js'
+import type { PersonData } from '../types/person.js'
+
+export interface EntryCrewSectionProps {
+  logbookId: string
+  readOnly?: boolean
+  value: EntryCrewFields
+  onChange: (next: EntryCrewFields) => void
+  /** Demo: fixed pool */
+  preloadedPool?: Map<string, PersonData>
+}
+
+export default function EntryCrewSection({
+  logbookId,
+  readOnly = false,
+  value,
+  onChange,
+  preloadedPool
+}: EntryCrewSectionProps) {
+  const { t } = useTranslation()
+  const [pool, setPool] = useState<Map<string, PersonData>>(preloadedPool ?? new Map())
+
+  useEffect(() => {
+    if (preloadedPool) {
+      setPool(preloadedPool)
+      return
+    }
+    let cancelled = false
+    void (async () => {
+      try {
+        const people = await loadPersonPool()
+        if (cancelled) return
+        setPool(new Map(people.map((p) => [p.payloadId, p.data])))
+      } catch {
+        /* use snapshots only */
+      }
+    })()
+    return () => {
+      cancelled = true
+    }
+  }, [preloadedPool])
+
+  const displayPool = useMemo(() => {
+    const merged = new Map(pool)
+    for (const snap of Object.values(value.crewSnapshotsById)) {
+      if (!merged.has(snap.id)) {
+        merged.set(snap.id, {
+          name: snap.name,
+          address: snap.address,
+          birthDate: snap.birthDate,
+          phone: snap.phone,
+          nationality: snap.nationality,
+          passportNumber: snap.passportNumber,
+          bloodType: snap.bloodType,
+          allergies: snap.allergies,
+          diseases: snap.diseases,
+          role: snap.role,
+          photo: snap.photo
+        })
+      }
+    }
+    return merged
+  }, [pool, value.crewSnapshotsById])
+
+  const skippers = [...displayPool.entries()].filter(([, d]) => d.role === 'skipper')
+  const crewEntries = [...displayPool.entries()].filter(([, d]) => d.role === 'crew')
+
+  const applyChange = (skipperId: string | null, crewIds: string[]) => {
+    const snapshots = buildSnapshotsForSelection(skipperId, crewIds, displayPool)
+    onChange({
+      selectedSkipperId: skipperId,
+      selectedCrewIds: crewIds,
+      crewSnapshotsById: snapshots
+    })
+  }
+
+  const toggleCrew = (id: string) => {
+    if (readOnly) return
+    const next = value.selectedCrewIds.includes(id)
+      ? value.selectedCrewIds.filter((x) => x !== id)
+      : [...value.selectedCrewIds, id]
+    applyChange(value.selectedSkipperId, next)
+  }
+
+  return (
+    <div className="form-card" data-tour="entry-crew">
+      <div className="form-header">
+        <Users size={22} className="form-icon" />
+        <h3>{t('entry_crew.title')}</h3>
+      </div>
+      <p className="help-text mb-3">{t('entry_crew.subtitle')}</p>
+
+      <div className="input-group mb-3">
+        <label>{t('entry_crew.day_skipper')}</label>
+        {skippers.length === 0 ? (
+          <p className="help-text">{t('entry_crew.no_skipper')}</p>
+        ) : (
+          <div className="crew-selection-list">
+            {skippers.map(([id, data]) => (
+              <label key={id} className="crew-selection-item">
+                <input
+                  type="radio"
+                  name={`entry-skipper-${logbookId}`}
+                  checked={value.selectedSkipperId === id}
+                  onChange={() => !readOnly && applyChange(id, value.selectedCrewIds)}
+                  disabled={readOnly}
+                />
+                <span>{data.name || t('logbook_crew.unnamed')}</span>
+              </label>
+            ))}
+          </div>
+        )}
+      </div>
+
+      <div className="input-group">
+        <label>{t('entry_crew.day_crew')}</label>
+        {crewEntries.length === 0 ? (
+          <p className="help-text">{t('entry_crew.no_crew')}</p>
+        ) : (
+          <div className="crew-selection-list">
+            {crewEntries.map(([id, data]) => (
+              <label key={id} className="crew-selection-item">
+                <input
+                  type="checkbox"
+                  checked={value.selectedCrewIds.includes(id)}
+                  onChange={() => toggleCrew(id)}
+                  disabled={readOnly}
+                />
+                <span>{data.name || t('logbook_crew.unnamed')}</span>
+              </label>
+            ))}
+          </div>
+        )}
+      </div>
+    </div>
+  )
+}
+
+export async function loadDefaultEntryCrewForNewDay(
+  logbookId: string,
+  previousEntry: Record<string, unknown> | null
+): Promise<EntryCrewFields> {
+  if (previousEntry) {
+    const selectedSkipperId =
+      typeof previousEntry.selectedSkipperId === 'string' ? previousEntry.selectedSkipperId : null
+    const selectedCrewIds = Array.isArray(previousEntry.selectedCrewIds)
+      ? previousEntry.selectedCrewIds.filter((id): id is string => typeof id === 'string')
+      : []
+    const crewSnapshotsById =
+      previousEntry.crewSnapshotsById && typeof previousEntry.crewSnapshotsById === 'object'
+        ? (previousEntry.crewSnapshotsById as Record<string, PersonSnapshot>)
+        : {}
+    return { selectedSkipperId, selectedCrewIds, crewSnapshotsById }
+  }
+
+  const selection = await loadLogbookCrewSelection(logbookId)
+  return {
+    selectedSkipperId: selection.activeSkipperId,
+    selectedCrewIds: [...selection.activeCrewIds],
+    crewSnapshotsById: { ...selection.snapshotsById }
+  }
+}
@@ -1,5 +1,6 @@
 import { useId, useMemo } from 'react'
 import { joinTimeHHMM, splitTimeHHMM } from '../utils/logEntryPayload.js'
+import { preferNativeCameraPicker } from '../utils/captureVideoFrame.js'

 const HOURS = Array.from({ length: 24 }, (_, i) => String(i).padStart(2, '0'))
 const MINUTES = Array.from({ length: 60 }, (_, i) => String(i).padStart(2, '0'))
@@ -18,7 +19,29 @@ export default function EventTimeInput24h({
  'aria-label': ariaLabel
 }: EventTimeInput24hProps) {
  const baseId = useId()
+  const useNativePicker = preferNativeCameraPicker()
  const { hours, minutes } = useMemo(() => splitTimeHHMM(value), [value])
+  const timeValue = useMemo(() => joinTimeHHMM(hours, minutes), [hours, minutes])
+
+  if (useNativePicker) {
+    return (
+      <div className="time-input-24h">
+        <input
+          id={baseId}
+          type="time"
+          step={60}
+          className="input-text time-input-24h__native"
+          value={timeValue}
+          onChange={(e) => {
+            const next = e.target.value
+            if (next) onChange(next.slice(0, 5))
+          }}
+          disabled={disabled}
+          aria-label={ariaLabel}
+        />
+      </div>
+    )
+  }

  return (
    <div className="time-input-24h">
@@ -172,6 +172,7 @@ export default function FeedbackModal({
                    <option value="general">{t('feedback.category_general')}</option>
                    <option value="bug">{t('feedback.category_bug')}</option>
                    <option value="feature">{t('feedback.category_feature')}</option>
+                    <option value="translation">{t('feedback.category_translation')}</option>
                  </select>
                </label>

@@ -1,5 +1,6 @@
 import React, { useState, useEffect, useCallback, useRef } from 'react'
 import { useTranslation } from 'react-i18next'
+import { cycleAppLanguage, getNextLanguage } from '../utils/i18nLanguages.js'
 import { Ship, LogIn, UserPlus, AlertTriangle, ShieldCheck, Languages, ArrowRight, KeyRound } from 'lucide-react'
 import {
  getActiveMasterKey,
@@ -308,7 +309,7 @@ export default function InvitationAcceptance({ onAccepted, onCancel }: Invitatio
  }

  const toggleLanguage = () => {
-    i18n.changeLanguage(i18n.language.startsWith('de') ? 'en' : 'de')
+    cycleAppLanguage(i18n)
  }

  if (recoveryPhrase) {
@@ -344,15 +345,36 @@ export default function InvitationAcceptance({ onAccepted, onCancel }: Invitatio
          <h2>{t('auth.enter_recovery')}</h2>
        </div>
        <p className="recovery-warning">{t('auth.recovery_fallback_warning')}</p>
-        <form onSubmit={handleRecoverySubmit}>
-          <textarea
-            className="input-text"
-            placeholder={t('auth.recovery_placeholder')}
-            value={recoveryInput}
-            onChange={(e) => setRecoveryInput(e.target.value)}
-            rows={3}
-            required
-          />
+        <form onSubmit={handleRecoverySubmit} autoComplete="on">
+          {(username.trim() || encryptedPayloads?.username) && (
+            <input
+              type="text"
+              name="username"
+              autoComplete="username"
+              value={username.trim() || encryptedPayloads?.username || ''}
+              readOnly
+              tabIndex={-1}
+              aria-hidden="true"
+              style={{ position: 'absolute', width: 0, height: 0, opacity: 0, pointerEvents: 'none' }}
+            />
+          )}
+          <div className="input-group">
+            <label htmlFor="invitation-recovery-key" className="input-label" style={{ display: 'block', marginBottom: '8px', color: '#94a3b8' }}>
+              {t('auth.enter_recovery')}
+            </label>
+            <input
+              id="invitation-recovery-key"
+              name="recovery-key"
+              type="password"
+              className="input-text"
+              placeholder={t('auth.recovery_placeholder')}
+              value={recoveryInput}
+              onChange={(e) => setRecoveryInput(e.target.value)}
+              required
+              autoComplete="current-password"
+              style={{ width: '100%', padding: '12px', boxSizing: 'border-box' }}
+            />
+          </div>
          <div className="auth-actions mt-4">
            <button type="button" className="btn secondary" onClick={() => setShowRecoveryFallback(false)}>
              {t('auth.back')}
@@ -490,7 +512,7 @@ export default function InvitationAcceptance({ onAccepted, onCancel }: Invitatio
      <div className="auth-footer" style={{ borderTop: '1px solid rgba(255,255,255,0.05)', paddingTop: '16px', marginTop: '24px' }}>
        <button className="btn-icon-text" onClick={toggleLanguage}>
          <Languages size={18} />
-          {i18n.language.startsWith('de') ? t('invitation.switch_language_en') : t('invitation.switch_language_de')}
+          {t(`languages.${getNextLanguage(i18n.language)}`)}
        </button>
      </div>
    </div>
@@ -0,0 +1,54 @@
+import { useEffect, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import QRCode from 'qrcode'
+
+interface LinkQrCodeProps {
+  value: string
+  size?: number
+}
+
+export default function LinkQrCode({ value, size = 200 }: LinkQrCodeProps) {
+  const { t } = useTranslation()
+  const [dataUrl, setDataUrl] = useState<string | null>(null)
+
+  useEffect(() => {
+    if (!value.trim()) {
+      setDataUrl(null)
+      return
+    }
+
+    let cancelled = false
+    void QRCode.toDataURL(value, {
+      width: size,
+      margin: 2,
+      errorCorrectionLevel: 'M',
+      color: { dark: '#0f172a', light: '#ffffff' }
+    })
+      .then((url) => {
+        if (!cancelled) setDataUrl(url)
+      })
+      .catch((err) => {
+        console.error('QR code generation failed:', err)
+        if (!cancelled) setDataUrl(null)
+      })
+
+    return () => {
+      cancelled = true
+    }
+  }, [value, size])
+
+  if (!value.trim() || !dataUrl) return null
+
+  return (
+    <div className="link-qr-block">
+      <p className="link-qr-label">{t('settings.link_qr_hint')}</p>
+      <img
+        src={dataUrl}
+        width={size}
+        height={size}
+        className="link-qr-image"
+        alt={t('settings.link_qr_alt')}
+      />
+    </div>
+  )
+}
@@ -0,0 +1,323 @@
+import { useCallback, useEffect, useRef, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { Camera, X } from 'lucide-react'
+import {
+  captureVideoFrame,
+  preferNativeCameraPicker
+} from '../utils/captureVideoFrame.js'
+
+interface LiveCameraCaptureProps {
+  open: boolean
+  busy?: boolean
+  caption?: string
+  onCaptionChange?: (value: string) => void
+  onClose: () => void
+  onCapture: (blob: Blob) => void
+}
+
+type Phase = 'live' | 'preview' | 'native'
+
+export default function LiveCameraCapture({
+  open,
+  busy = false,
+  caption = '',
+  onCaptionChange,
+  onClose,
+  onCapture
+}: LiveCameraCaptureProps) {
+  const { t } = useTranslation()
+  const videoRef = useRef<HTMLVideoElement | null>(null)
+  const fileInputRef = useRef<HTMLInputElement | null>(null)
+  const streamRef = useRef<MediaStream | null>(null)
+  const previewUrlRef = useRef<string | null>(null)
+
+  const [cameraError, setCameraError] = useState<string | null>(null)
+  const [ready, setReady] = useState(false)
+  const [capturing, setCapturing] = useState(false)
+  const [phase, setPhase] = useState<Phase>(() => (preferNativeCameraPicker() ? 'native' : 'live'))
+  const [previewUrl, setPreviewUrl] = useState<string | null>(null)
+  const [previewBlob, setPreviewBlob] = useState<Blob | null>(null)
+  const [streamGeneration, setStreamGeneration] = useState(0)
+
+  const clearPreview = useCallback(() => {
+    if (previewUrlRef.current) {
+      URL.revokeObjectURL(previewUrlRef.current)
+      previewUrlRef.current = null
+    }
+    setPreviewUrl(null)
+    setPreviewBlob(null)
+  }, [])
+
+  const stopStream = useCallback(() => {
+    for (const track of streamRef.current?.getTracks() ?? []) {
+      track.stop()
+    }
+    streamRef.current = null
+    if (videoRef.current) {
+      videoRef.current.srcObject = null
+    }
+    setReady(false)
+  }, [])
+
+  const enterPreview = useCallback((blob: Blob) => {
+    stopStream()
+    clearPreview()
+    const url = URL.createObjectURL(blob)
+    previewUrlRef.current = url
+    setPreviewBlob(blob)
+    setPreviewUrl(url)
+    setPhase('preview')
+  }, [stopStream, clearPreview])
+
+  const resetToLive = useCallback(() => {
+    clearPreview()
+    setCameraError(null)
+    setCapturing(false)
+    if (preferNativeCameraPicker()) {
+      setPhase('native')
+    } else {
+      setPhase('live')
+      setStreamGeneration((n) => n + 1)
+    }
+  }, [clearPreview])
+
+  useEffect(() => {
+    if (!open) {
+      stopStream()
+      clearPreview()
+      setCameraError(null)
+      setCapturing(false)
+      setPhase(preferNativeCameraPicker() ? 'native' : 'live')
+      return
+    }
+    setPhase(preferNativeCameraPicker() ? 'native' : 'live')
+    clearPreview()
+  }, [open, stopStream, clearPreview])
+
+  useEffect(() => {
+    if (!open || phase !== 'live') {
+      stopStream()
+      return
+    }
+
+    let cancelled = false
+
+    const start = async () => {
+      setCameraError(null)
+      setReady(false)
+      if (!navigator.mediaDevices?.getUserMedia) {
+        setCameraError(t('logs.live_photo_camera_unavailable'))
+        return
+      }
+
+      try {
+        const stream = await navigator.mediaDevices.getUserMedia({
+          video: {
+            facingMode: { ideal: 'environment' },
+            width: { ideal: 1280 },
+            height: { ideal: 720 }
+          },
+          audio: false
+        })
+        if (cancelled) {
+          for (const track of stream.getTracks()) track.stop()
+          return
+        }
+        streamRef.current = stream
+        const video = videoRef.current
+        if (!video) return
+
+        const markReady = () => {
+          if (cancelled) return
+          if (video.videoWidth > 0 && video.videoHeight > 0) {
+            setReady(true)
+          }
+        }
+
+        video.onloadedmetadata = markReady
+        video.srcObject = stream
+        await video.play()
+        markReady()
+      } catch (err) {
+        console.error('Camera access failed:', err)
+        if (!cancelled) {
+          setCameraError(t('logs.live_photo_camera_denied'))
+        }
+      }
+    }
+
+    void start()
+    return () => {
+      cancelled = true
+      stopStream()
+    }
+  }, [open, phase, streamGeneration, stopStream, t])
+
+  const handleCapture = async () => {
+    const video = videoRef.current
+    if (!video || !ready || busy || capturing) return
+
+    setCapturing(true)
+    setCameraError(null)
+    try {
+      const blob = await captureVideoFrame(video)
+      enterPreview(blob)
+    } catch (err) {
+      console.error('Live camera capture failed:', err)
+      setCameraError(t('logs.live_photo_capture_failed'))
+    } finally {
+      setCapturing(false)
+    }
+  }
+
+  const handleNativeFile = async (e: React.ChangeEvent<HTMLInputElement>) => {
+    const file = e.target.files?.[0]
+    e.target.value = ''
+    if (!file || busy) return
+
+    setCameraError(null)
+    try {
+      enterPreview(file)
+    } catch (err) {
+      console.error('Live camera file pick failed:', err)
+      setCameraError(t('logs.live_photo_capture_failed'))
+    }
+  }
+
+  const handleSave = () => {
+    if (!previewBlob || busy) return
+    onCapture(previewBlob)
+  }
+
+  const handleRetake = () => {
+    if (busy) return
+    resetToLive()
+  }
+
+  const openNativePicker = () => {
+    if (busy) return
+    fileInputRef.current?.click()
+  }
+
+  if (!open) return null
+
+  const showPreview = phase === 'preview' && previewUrl
+
+  return (
+    <div
+      className="live-log-modal-backdrop live-camera-backdrop"
+      onClick={(e) => { if (e.target === e.currentTarget && !busy) onClose() }}
+    >
+      <div className="live-log-modal live-camera-modal" onClick={(e) => e.stopPropagation()}>
+        <div className="live-camera-header">
+          <h3>{t('logs.live_photo_btn')}</h3>
+          <button
+            type="button"
+            className="btn secondary live-camera-close"
+            onClick={onClose}
+            disabled={busy}
+            aria-label={t('logs.confirm_no')}
+          >
+            <X size={18} />
+          </button>
+        </div>
+
+        <input
+          ref={fileInputRef}
+          type="file"
+          accept="image/*"
+          capture="environment"
+          className="live-camera-file-input"
+          onChange={(e) => void handleNativeFile(e)}
+        />
+
+        {cameraError && (
+          <p className="live-log-modal-hint auth-error">{cameraError}</p>
+        )}
+
+        {showPreview ? (
+          <div className="live-camera-preview-wrap">
+            <img
+              src={previewUrl}
+              alt=""
+              className="live-camera-preview live-camera-preview-still"
+            />
+          </div>
+        ) : phase === 'native' ? (
+          <div className="live-camera-native-prompt">
+            <p className="live-log-modal-hint">{t('logs.live_photo_native_hint')}</p>
+            <button
+              type="button"
+              className="btn primary live-camera-open-native"
+              onClick={openNativePicker}
+              disabled={busy}
+            >
+              <Camera size={18} />
+              {t('logs.live_photo_open_camera_btn')}
+            </button>
+          </div>
+        ) : cameraError && !ready ? null : (
+          <div className="live-camera-preview-wrap">
+            <video
+              ref={videoRef}
+              className="live-camera-preview"
+              playsInline
+              muted
+              autoPlay
+            />
+            {!ready && (
+              <p className="live-camera-loading">{t('logs.live_photo_camera_starting')}</p>
+            )}
+          </div>
+        )}
+
+        {onCaptionChange && (
+          <div className="input-group live-camera-caption">
+            <label>{t('logs.photo_caption_label')}</label>
+            <input
+              type="text"
+              className="input-text"
+              placeholder={t('logs.photo_caption_placeholder')}
+              value={caption}
+              onChange={(e) => onCaptionChange(e.target.value)}
+              disabled={busy}
+            />
+          </div>
+        )}
+
+        <div className="live-log-modal-actions live-camera-actions">
+          <button type="button" className="btn secondary" onClick={onClose} disabled={busy}>
+            {t('logs.confirm_no')}
+          </button>
+
+          {showPreview ? (
+            <>
+              <button type="button" className="btn secondary" onClick={handleRetake} disabled={busy}>
+                {t('logs.live_photo_retake_btn')}
+              </button>
+              <button
+                type="button"
+                className="btn primary live-camera-shutter"
+                onClick={handleSave}
+                disabled={busy || !previewBlob}
+              >
+                <Camera size={18} />
+                {busy ? t('logs.photo_processing') : t('logs.live_photo_save_btn')}
+              </button>
+            </>
+          ) : phase === 'native' ? null : (
+            <button
+              type="button"
+              className="btn primary live-camera-shutter"
+              onClick={() => void handleCapture()}
+              disabled={busy || capturing || !ready || !!cameraError}
+            >
+              <Camera size={18} />
+              {capturing ? t('logs.photo_processing') : t('logs.live_photo_capture_btn')}
+            </button>
+          )}
+        </div>
+      </div>
+    </div>
+  )
+}
@@ -3,16 +3,25 @@ import { useTranslation } from 'react-i18next'
 import { db } from '../services/db.js'
 import { getActiveMasterKey } from '../services/auth.js'
 import { getLogbookKey } from '../services/logbookKeys.js'
-import { decryptJson, encryptJson } from '../services/crypto.js'
+import { encryptJson } from '../services/crypto.js'
 import { syncLogbook } from '../services/sync.js'
 import { downloadCsv, shareCsv } from '../services/csvExport.js'
 import { downloadLogbookPagePdf } from '../services/pdfExport.js'
 import { PlausibleEvents, trackPlausibleEvent } from '../services/analytics.js'
+import { getErrorMessage } from '../utils/errors.js'
+import { findTodayEntryId, tryDecryptEntryPayload } from '../services/quickEventLog.js'
 import LogEntryEditor from './LogEntryEditor.tsx'
+import LiveLogView from './LiveLogView.tsx'
 import EntrySkipperSignBadge from './EntrySkipperSignBadge.tsx'
 import { useDialog } from './ModalDialog.tsx'
 import { getSkipperSignStatus, type SkipperSignStatus } from '../utils/signatures.js'
-import { FileText, Plus, Trash2, ChevronRight, Calendar, Download, Share2 } from 'lucide-react'
+import {
+  buildEntryListCache,
+  entryListItemFromLocal,
+  putEntryRecord
+} from '../utils/entryListCache.js'
+import { forEachInBatches } from '../utils/yieldToMain.js'
+import { FileText, Plus, Trash2, ChevronRight, Calendar, Download, Share2, Radio, List } from 'lucide-react'
 import {
  carryOverFromPreviousDay,
  compareTravelDaysChronological,
@@ -36,6 +45,8 @@ interface LogEntriesListProps {
  highlightEntryId?: string | null
 }

+type LogsViewMode = 'list' | 'live'
+
 interface DecryptedEntryItem {
  id: string
  date: string
@@ -75,6 +86,8 @@ export default function LogEntriesList({
  const [loading, setLoading] = useState(false)
  const [exporting, setExporting] = useState(false)
  const [error, setError] = useState<string | null>(null)
+  const [viewMode, setViewMode] = useState<LogsViewMode>('list')
+  const [returnToLiveAfterEditor, setReturnToLiveAfterEditor] = useState(false)
  const prevSelectedEntryIdRef = useRef<string | null | undefined>(undefined)

  const loadEntries = useCallback(async () => {
@@ -109,24 +122,34 @@ export default function LogEntriesList({
      if (!masterKey) throw new Error('Encryption key not found. Please log in.')

      const local = await db.entries.where({ logbookId }).toArray()
-      
+
      const list: DecryptedEntryItem[] = []
-      
+      const needsDecrypt: typeof local = []
+
      for (const entry of local) {
-        const decrypted = await decryptJson(entry.encryptedData, entry.iv, entry.tag, masterKey)
-        if (decrypted) {
-          list.push({
-            id: entry.payloadId,
-            date: decrypted.date || '',
-            dayOfTravel: decrypted.dayOfTravel || '',
-            departure: decrypted.departure || '',
-            destination: decrypted.destination || '',
-            updatedAt: entry.updatedAt,
-            skipperSignStatus: await getSkipperSignStatus(decrypted as Record<string, unknown>)
-          })
+        const cached = entryListItemFromLocal(entry)
+        if (cached) {
+          list.push(cached)
+        } else {
+          needsDecrypt.push(entry)
        }
      }

+      await forEachInBatches(needsDecrypt, 8, async (entry) => {
+        const decrypted = await tryDecryptEntryPayload(entry, masterKey)
+        if (!decrypted) return
+
+        const listCache = await buildEntryListCache(decrypted as Record<string, unknown>)
+        list.push({
+          id: entry.payloadId,
+          ...listCache,
+          updatedAt: entry.updatedAt
+        })
+        void db.entries.update(entry.payloadId, { listCache }).catch((err) => {
+          console.warn('Failed to persist entry list cache:', err)
+        })
+      })
+
      // Sort chronological descending (by date, or dayOfTravel numerical)
      list.sort((a, b) => {
        const dateCompare = new Date(b.date).getTime() - new Date(a.date).getTime()
@@ -137,24 +160,26 @@ export default function LogEntriesList({
      setEntries(list)
    } catch (err: any) {
      console.error('Failed to load log entries:', err)
-      setError(err.message || 'Decryption failed. Could not load journal list.')
+      setError(getErrorMessage(err, t('errors.load_failed')))
    } finally {
      setLoading(false)
    }
  }, [logbookId, readOnly, preloadedEntries])

  useEffect(() => {
+    if (viewMode === 'live') return
    loadEntries()
-  }, [loadEntries])
+  }, [loadEntries, viewMode])

  useEffect(() => {
+    if (viewMode === 'live') return
    const prevSelectedEntryId = prevSelectedEntryIdRef.current
    prevSelectedEntryIdRef.current = selectedEntryId

    if (prevSelectedEntryId !== undefined && prevSelectedEntryId !== null && selectedEntryId === null) {
      loadEntries()
    }
-  }, [selectedEntryId, loadEntries])
+  }, [selectedEntryId, loadEntries, viewMode])

  const handleDownloadCsv = async () => {
    setExporting(true)
@@ -169,7 +194,7 @@ export default function LogEntriesList({
      trackPlausibleEvent(PlausibleEvents.CSV_EXPORTED)
    } catch (err: any) {
      console.error('Failed to download CSV:', err)
-      setError(err.message || 'Failed to generate CSV export.')
+      setError(getErrorMessage(err, t('errors.export_failed')))
    } finally {
      setExporting(false)
    }
@@ -197,7 +222,7 @@ export default function LogEntriesList({
        setError(t('logs.share_unsupported'))
      } else {
        console.error('Failed to share CSV:', err)
-        setError(err.message || 'Failed to share CSV export.')
+        setError(getErrorMessage(err, t('errors.export_failed')))
      }
    } finally {
      setExporting(false)
@@ -218,7 +243,7 @@ export default function LogEntriesList({
      trackPlausibleEvent(PlausibleEvents.PDF_EXPORTED, { scope: 'entry' })
    } catch (err: any) {
      console.error('Failed to download PDF:', err)
-      setError(err.message || 'Failed to generate PDF export.')
+      setError(getErrorMessage(err, t('errors.export_failed')))
    } finally {
      setExporting(false)
    }
@@ -231,24 +256,31 @@ export default function LogEntriesList({
      const masterKey = await getLogbookKey(logbookId) || getActiveMasterKey()
      if (!masterKey) throw new Error('Encryption key not found. Please log in.')

+      const existingTodayId = await findTodayEntryId(logbookId)
+      if (existingTodayId) {
+        setSelectedEntryId(existingTodayId)
+        return
+      }
+
      const localEntries = await db.entries.where({ logbookId }).toArray()
      const decryptedEntries: Array<LogEntryTankSource & TravelDaySortable> = []

      for (const entry of localEntries) {
-        const decrypted = await decryptJson(entry.encryptedData, entry.iv, entry.tag, masterKey)
+        const decrypted = await tryDecryptEntryPayload(entry, masterKey)
        if (decrypted) decryptedEntries.push(decrypted as LogEntryTankSource & TravelDaySortable)
      }

      decryptedEntries.sort(compareTravelDaysChronological)
      const previousEntry = decryptedEntries.at(-1) ?? null
-      let { freshwater, fuel, departure } = carryOverFromPreviousDay(previousEntry)
+      let { freshwater, fuel, greywaterLevel, departure } = carryOverFromPreviousDay(previousEntry)

-      if (previousEntry && hasCarryOverFromPreviousDay({ freshwater, fuel, departure })) {
+      if (previousEntry && hasCarryOverFromPreviousDay({ freshwater, fuel, greywaterLevel, departure })) {
        const confirmed = await showConfirm(
          t('logs.carry_over_tanks_confirm', {
            departure: departure || '—',
            fw: formatTankLiters(freshwater.morning),
-            fuel: formatTankLiters(fuel.morning)
+            fuel: formatTankLiters(fuel.morning),
+            greywater: formatTankLiters(greywaterLevel)
          }),
          t('logs.carry_over_tanks_title'),
          t('logs.carry_over_tanks_yes'),
@@ -257,6 +289,7 @@ export default function LogEntriesList({
        if (!confirmed) {
          freshwater = emptyTankLevels()
          fuel = emptyTankLevels()
+          greywaterLevel = 0
          departure = ''
        }
      }
@@ -267,6 +300,12 @@ export default function LogEntriesList({
      const nowStr = new Date().toISOString()
      const todayStr = nowStr.substring(0, 10)

+      const { loadDefaultEntryCrewForNewDay } = await import('./EntryCrewSection.js')
+      const entryCrew = await loadDefaultEntryCrewForNewDay(
+        logbookId,
+        previousEntry as Record<string, unknown> | null
+      )
+
      const initialPayload = {
        date: todayStr,
        dayOfTravel: getNextTravelDayNumber(decryptedEntries),
@@ -274,6 +313,10 @@ export default function LogEntriesList({
        destination: '',
        freshwater,
        fuel,
+        ...(greywaterLevel > 0 ? { greywater: { level: greywaterLevel } } : {}),
+        selectedSkipperId: entryCrew.selectedSkipperId,
+        selectedCrewIds: entryCrew.selectedCrewIds,
+        crewSnapshotsById: entryCrew.crewSnapshotsById,
        signSkipper: '',
        signCrew: '',
        events: []
@@ -282,14 +325,17 @@ export default function LogEntriesList({
      const encrypted = await encryptJson(initialPayload, masterKey)

      // Save locally
-      await db.entries.put({
-        payloadId: localId,
-        logbookId,
-        encryptedData: encrypted.ciphertext,
-        iv: encrypted.iv,
-        tag: encrypted.tag,
-        updatedAt: nowStr
-      })
+      await putEntryRecord(
+        {
+          payloadId: localId,
+          logbookId,
+          encryptedData: encrypted.ciphertext,
+          iv: encrypted.iv,
+          tag: encrypted.tag,
+          updatedAt: nowStr
+        },
+        initialPayload
+      )

      // Queue for background sync
      await db.syncQueue.put({
@@ -307,7 +353,7 @@ export default function LogEntriesList({
      syncLogbook(logbookId).catch((err) => console.warn('Background sync failed:', err))
    } catch (err: any) {
      console.error('Failed to create entry:', err)
-      setError(err.message || 'Failed to create new log entry.')
+      setError(getErrorMessage(err, t('errors.save_failed')))
    } finally {
      setLoading(false)
    }
@@ -337,7 +383,7 @@ export default function LogEntriesList({
        syncLogbook(logbookId).catch((err) => console.warn('Background sync failed:', err))
      } catch (err: any) {
        console.error('Failed to delete log entry:', err)
-        setError(err.message || 'Failed to delete log entry.')
+        setError(getErrorMessage(err, t('errors.delete_failed')))
      }
    }
  }
@@ -347,7 +393,13 @@ export default function LogEntriesList({
      <LogEntryEditor
        entryId={selectedEntryId}
        logbookId={logbookId}
-        onBack={() => setSelectedEntryId(null)}
+        onBack={() => {
+          setSelectedEntryId(null)
+          if (returnToLiveAfterEditor) {
+            setViewMode('live')
+            setReturnToLiveAfterEditor(false)
+          }
+        }}
        readOnly={readOnly}
        preloadedEntry={preloadedEntries?.find(entry => (entry.payloadId || entry.id) === selectedEntryId)}
        preloadedPhotos={preloadedPhotos}
@@ -356,6 +408,22 @@ export default function LogEntriesList({
    )
  }

+  if (viewMode === 'live' && !readOnly) {
+    return (
+      <LiveLogView
+        logbookId={logbookId}
+        onOpenEditor={(entryId) => {
+          setReturnToLiveAfterEditor(true)
+          setSelectedEntryId(entryId)
+        }}
+        onSwitchToList={() => {
+          setViewMode('list')
+          void loadEntries()
+        }}
+      />
+    )
+  }
+
  if (loading) {
    return (
      <div className="tab-placeholder">
@@ -371,13 +439,36 @@ export default function LogEntriesList({
      : entries[0]?.id ?? null

  return (
-    <div className="form-card">
+    <div className="logs-journal">
      <div className="section-title-bar mb-6">
        <div className="form-header" style={{ margin: 0 }}>
          <Calendar size={24} className="form-icon" />
          <h2>{t('logs.title')}</h2>
        </div>
        <div className="section-toolbar">
+          {!readOnly && (
+            <div className="logs-view-toggle" role="group" aria-label={t('logs.view_mode_label')}>
+              <button
+                type="button"
+                className={`btn secondary logs-view-toggle-btn ${viewMode === 'list' ? 'is-active' : ''}`}
+                onClick={() => setViewMode('list')}
+                title={t('logs.view_list')}
+              >
+                <List size={16} />
+                <span className="hide-mobile">{t('logs.view_list')}</span>
+              </button>
+              <button
+                type="button"
+                className={`btn secondary logs-view-toggle-btn ${viewMode === 'live' ? 'is-active' : ''}`}
+                onClick={() => setViewMode('live')}
+                title={t('logs.live_mode')}
+              >
+                <Radio size={16} />
+                <span className="hide-mobile">{t('logs.live_mode')}</span>
+              </button>
+            </div>
+          )}
+
          <button className="btn secondary" onClick={handleDownloadCsv} disabled={loading || exporting || entries.length === 0} style={{ width: 'auto', padding: '8px 16px' }} title={t('logs.export_csv')}>
            <Download size={16} />
            <span className="hide-mobile">{exporting ? t('logs.exporting') : t('logs.export_csv')}</span>
@@ -408,9 +499,19 @@ export default function LogEntriesList({
              key={item.id}
              className="logbook-card glass"
              data-tour={tourFirstEntryId === item.id ? 'entry-first' : undefined}
-              onClick={() => setSelectedEntryId(item.id)}
            >
-              <div className="card-icon">
+              <button
+                type="button"
+                className="logbook-card-select"
+                onClick={() => setSelectedEntryId(item.id)}
+                aria-label={
+                  item.departure && item.destination
+                    ? `${item.departure} → ${item.destination}, ${t('logs.travel_day_number', { number: item.dayOfTravel })}`
+                    : `${t('logs.new_entry')}, ${t('logs.travel_day_number', { number: item.dayOfTravel })}`
+                }
+              />
+
+              <div className="card-icon" aria-hidden>
                <FileText size={24} />
              </div>

@@ -422,7 +523,7 @@ export default function LogEntriesList({
                </h3>
                <div className="card-meta">
                  <span className="sync-badge synced">
-                    {t('logs.day_of_travel')} {item.dayOfTravel}
+                    {t('logs.travel_day_number', { number: item.dayOfTravel })}
                  </span>
                  <EntrySkipperSignBadge status={item.skipperSignStatus} />
                  <span className="date-badge">
@@ -431,6 +532,8 @@ export default function LogEntriesList({
                </div>
              </div>

+              <ChevronRight size={18} className="logbook-card-chevron" aria-hidden />
+
              <button className="btn-pdf" onClick={(e) => handleDownloadPdf(item.id, item.date, e)} title={t('logs.export_pdf')} disabled={exporting}>
                <Download size={18} />
              </button>
@@ -440,8 +543,6 @@ export default function LogEntriesList({
                  <Trash2 size={18} />
                </button>
              )}
-              
-              <ChevronRight size={18} style={{ color: '#475569', marginLeft: 'auto' }} />
            </div>
          ))}
        </div>
@@ -0,0 +1,224 @@
+import { useCallback, useEffect, useMemo, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { Users, User, Save, Check } from 'lucide-react'
+import type { LogbookCrewSelectionData, PersonSnapshot } from '../types/person.js'
+import type { DecryptedPerson } from '../services/personPool.js'
+import { loadPersonPool, filterSkippers, filterCrew } from '../services/personPool.js'
+import { loadLogbookCrewSelection, saveLogbookCrewSelectionFromIds } from '../services/logbookCrewSelection.js'
+import { PlausibleEvents, trackPlausibleEvent } from '../services/analytics.js'
+
+export interface LogbookCrewPickerProps {
+  logbookId: string
+  readOnly?: boolean
+  /** Demo / share: in-memory pool */
+  preloadedPool?: Array<{ payloadId: string; data: DecryptedPerson['data'] }>
+  preloadedSelection?: LogbookCrewSelectionData
+  /** Shared logbook: only people from selection snapshots */
+  selectionOnly?: boolean
+}
+
+function snapshotsToPoolList(
+  selection: LogbookCrewSelectionData
+): Array<{ payloadId: string; data: DecryptedPerson['data'] }> {
+  return Object.values(selection.snapshotsById).map((snap) => ({
+    payloadId: snap.id,
+    data: {
+      name: snap.name,
+      address: snap.address,
+      birthDate: snap.birthDate,
+      phone: snap.phone,
+      nationality: snap.nationality,
+      passportNumber: snap.passportNumber,
+      bloodType: snap.bloodType,
+      allergies: snap.allergies,
+      diseases: snap.diseases,
+      role: snap.role,
+      photo: snap.photo
+    }
+  }))
+}
+
+export default function LogbookCrewPicker({
+  logbookId,
+  readOnly = false,
+  preloadedPool,
+  preloadedSelection,
+  selectionOnly = false
+}: LogbookCrewPickerProps) {
+  const { t } = useTranslation()
+  const [loading, setLoading] = useState(!preloadedSelection)
+  const [saving, setSaving] = useState(false)
+  const [saved, setSaved] = useState(false)
+  const [error, setError] = useState<string | null>(null)
+  const [pool, setPool] = useState<DecryptedPerson[]>([])
+  const [activeSkipperId, setActiveSkipperId] = useState<string | null>(null)
+  const [activeCrewIds, setActiveCrewIds] = useState<string[]>([])
+
+  const loadData = useCallback(async () => {
+    setLoading(true)
+    setError(null)
+    try {
+      const selection =
+        preloadedSelection ??
+        (logbookId === 'demo' ? null : await loadLogbookCrewSelection(logbookId))
+
+      if (selection) {
+        setActiveSkipperId(selection.activeSkipperId)
+        setActiveCrewIds([...selection.activeCrewIds])
+      }
+
+      if (preloadedPool) {
+        setPool(
+          preloadedPool.map((p) => ({
+            payloadId: p.payloadId,
+            data: p.data
+          }))
+        )
+      } else if (selectionOnly && selection) {
+        setPool(snapshotsToPoolList(selection))
+      } else {
+        setPool(await loadPersonPool())
+      }
+    } catch (err: unknown) {
+      setError(err instanceof Error ? err.message : 'Failed to load crew selection')
+    } finally {
+      setLoading(false)
+    }
+  }, [logbookId, preloadedPool, preloadedSelection, selectionOnly])
+
+  useEffect(() => {
+    void loadData()
+  }, [loadData])
+
+  const skippers = useMemo(() => filterSkippers(pool), [pool])
+  const crewMembers = useMemo(() => filterCrew(pool), [pool])
+
+  const toggleCrew = (id: string) => {
+    if (readOnly) return
+    setActiveCrewIds((prev) =>
+      prev.includes(id) ? prev.filter((x) => x !== id) : [...prev, id]
+    )
+  }
+
+  const handleSave = async () => {
+    if (readOnly || logbookId === 'demo') return
+    setSaving(true)
+    setError(null)
+    setSaved(false)
+    try {
+      await saveLogbookCrewSelectionFromIds(logbookId, activeSkipperId, activeCrewIds)
+      setSaved(true)
+      trackPlausibleEvent(PlausibleEvents.CREW_SAVED, { context: 'logbook_selection' })
+      setTimeout(() => setSaved(false), 3000)
+    } catch (err: unknown) {
+      setError(err instanceof Error ? err.message : 'Failed to save')
+    } finally {
+      setSaving(false)
+    }
+  }
+
+  if (loading) {
+    return (
+      <div className="tab-placeholder">
+        <Users className="header-logo spin" size={48} />
+        <p>{t('person_pool.loading')}</p>
+      </div>
+    )
+  }
+
+  return (
+    <div className="crew-dashboard-layout" data-tour="logbook-crew-picker">
+      <div className="form-card">
+        <div className="form-header">
+          <Users size={24} className="form-icon" />
+          <h2>{t('logbook_crew.title')}</h2>
+        </div>
+        <p className="help-text mb-4">{t('logbook_crew.subtitle')}</p>
+        {selectionOnly && <p className="help-text mb-4">{t('logbook_crew.selection_only_hint')}</p>}
+        {error && <div className="auth-error mb-4">{error}</div>}
+
+        <div className="input-group mb-4">
+          <label>{t('logbook_crew.active_skipper')}</label>
+          {skippers.length === 0 ? (
+            <p className="help-text">{t('logbook_crew.no_skippers_in_pool')}</p>
+          ) : (
+            <div className="crew-selection-list">
+              {skippers.map((s) => (
+                <label key={s.payloadId} className="crew-selection-item">
+                  <input
+                    type="radio"
+                    name={`skipper-${logbookId}`}
+                    checked={activeSkipperId === s.payloadId}
+                    onChange={() => !readOnly && setActiveSkipperId(s.payloadId)}
+                    disabled={readOnly}
+                  />
+                  <User size={16} aria-hidden="true" />
+                  <span>{s.data.name || t('logbook_crew.unnamed')}</span>
+                </label>
+              ))}
+              {!readOnly && (
+                <label className="crew-selection-item">
+                  <input
+                    type="radio"
+                    name={`skipper-${logbookId}`}
+                    checked={activeSkipperId === null}
+                    onChange={() => setActiveSkipperId(null)}
+                  />
+                  <span>{t('logbook_crew.no_skipper')}</span>
+                </label>
+              )}
+            </div>
+          )}
+        </div>
+
+        <div className="input-group mb-4">
+          <label>{t('logbook_crew.active_crew')}</label>
+          {crewMembers.length === 0 ? (
+            <p className="help-text">{t('logbook_crew.no_crew_in_pool')}</p>
+          ) : (
+            <div className="crew-selection-list">
+              {crewMembers.map((c) => (
+                <label key={c.payloadId} className="crew-selection-item">
+                  <input
+                    type="checkbox"
+                    checked={activeCrewIds.includes(c.payloadId)}
+                    onChange={() => toggleCrew(c.payloadId)}
+                    disabled={readOnly}
+                  />
+                  <span>{c.data.name || t('logbook_crew.unnamed')}</span>
+                </label>
+              ))}
+            </div>
+          )}
+        </div>
+
+        {!readOnly && logbookId !== 'demo' && (
+          <div className="form-actions">
+            {saved && (
+              <div className="success-toast">
+                <Check size={16} />
+                <span>{t('logbook_crew.saved')}</span>
+              </div>
+            )}
+            <button type="button" className="btn primary" onClick={() => void handleSave()} disabled={saving}>
+              <Save size={18} />
+              {t('logbook_crew.save')}
+            </button>
+          </div>
+        )}
+      </div>
+    </div>
+  )
+}
+
+export function selectionFromSnapshots(
+  snapshotsById: Record<string, PersonSnapshot>
+): LogbookCrewSelectionData {
+  const snapshots = Object.values(snapshotsById)
+  const skipper = snapshots.find((s) => s.role === 'skipper')
+  return {
+    activeSkipperId: skipper?.id ?? null,
+    activeCrewIds: snapshots.filter((s) => s.role === 'crew').map((s) => s.id),
+    snapshotsById
+  }
+}
@@ -1,15 +1,20 @@
-import React, { useState, useEffect, useRef } from 'react'
+import React, { useState, useEffect, useRef, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
+import { cycleAppLanguage } from '../utils/i18nLanguages.js'
 import { useSyncIndicator } from '../hooks/useSyncIndicator.js'
 import { fetchLogbooks, createLogbook, deleteLogbook, updateLogbookTitle, type DecryptedLogbook } from '../services/logbook.js'
+import { loadLogbookSearchFieldsBatch } from '../services/logbookSearchIndex.js'
+import { logbookMatchesFilter, type LogbookSearchFields } from '../utils/logbookFilter.js'
 import LogbookRoleBadge from './LogbookRoleBadge.tsx'
 import BetaBadge from './BetaBadge.tsx'
 import { PlausibleEvents, trackPlausibleEvent } from '../services/analytics.js'
+import { getErrorMessage } from '../utils/errors.js'
 import { logoutUser } from '../services/auth.js'
 import { useDialog } from './ModalDialog.tsx'
-import { BookOpen, Plus, Trash2, LogOut, Languages, RefreshCw, Ship, User, Wifi, WifiOff } from 'lucide-react'
+import { BookOpen, Plus, Trash2, LogOut, Languages, RefreshCw, Ship, Wifi, WifiOff, Search, X, CalendarDays, CaseSensitive, ArrowUp, ArrowDown } from 'lucide-react'
 import DisclaimerHeaderButton from './DisclaimerHeaderButton.tsx'
 import FeedbackHeaderButton from './FeedbackHeaderButton.tsx'
+import ProfileHeaderButton from './ProfileHeaderButton.tsx'

 interface LogbookDashboardProps {
  onSelectLogbook: (id: string, title: string) => void
@@ -17,6 +22,26 @@ interface LogbookDashboardProps {
  onOpenProfile: () => void
 }

+type LogbookSortKey = 'name' | 'date'
+type LogbookSortDirection = 'asc' | 'desc'
+
+function sortLogbooks(
+  items: DecryptedLogbook[],
+  sortBy: LogbookSortKey,
+  direction: LogbookSortDirection,
+  locale: string
+): DecryptedLogbook[] {
+  const sorted = [...items]
+  sorted.sort((a, b) => {
+    const cmp =
+      sortBy === 'name'
+        ? a.title.localeCompare(b.title, locale, { sensitivity: 'base' })
+        : new Date(a.updatedAt).getTime() - new Date(b.updatedAt).getTime()
+    return direction === 'asc' ? cmp : -cmp
+  })
+  return sorted
+}
+
 export default function LogbookDashboard({ onSelectLogbook, onLogout, onOpenProfile }: LogbookDashboardProps) {
  const { t, i18n } = useTranslation()
  const { showConfirm } = useDialog()
@@ -28,8 +53,14 @@ export default function LogbookDashboard({ onSelectLogbook, onLogout, onOpenProf
  const [loading, setLoading] = useState(false)
  const [refreshing, setRefreshing] = useState(false)
  const [error, setError] = useState<string | null>(null)
+  const [filterQuery, setFilterQuery] = useState('')
+  const [searchFieldsByLogbookId, setSearchFieldsByLogbookId] = useState<Map<string, LogbookSearchFields>>(
+    () => new Map()
+  )
+  const [sortBy, setSortBy] = useState<LogbookSortKey>('date')
+  const [sortDirection, setSortDirection] = useState<LogbookSortDirection>('desc')
+  const filterInputRef = useRef<HTMLInputElement>(null)
  const [online, setOnline] = useState(navigator.onLine)
-  const [username] = useState(localStorage.getItem('active_username') || 'Skipper')

  const { pendingCount, showSpinner, showPendingWarning, connStatusClassName } = useSyncIndicator()

@@ -50,6 +81,23 @@ export default function LogbookDashboard({ onSelectLogbook, onLogout, onOpenProf
    loadLogbooks()
  }, [])

+  useEffect(() => {
+    const ids = logbooks.map((lb) => lb.id)
+    if (ids.length === 0) {
+      setSearchFieldsByLogbookId(new Map())
+      return
+    }
+
+    let cancelled = false
+    void loadLogbookSearchFieldsBatch(ids).then((index) => {
+      if (!cancelled) setSearchFieldsByLogbookId(index)
+    })
+
+    return () => {
+      cancelled = true
+    }
+  }, [logbooks])
+
  const loadLogbooks = async (isRefresh = false) => {
    if (isRefresh) setRefreshing(true)
    else setLoading(true)
@@ -57,8 +105,8 @@ export default function LogbookDashboard({ onSelectLogbook, onLogout, onOpenProf
    try {
      const data = await fetchLogbooks()
      setLogbooks(data)
-    } catch (err: any) {
-      setError(err.message || 'Failed to load logbooks')
+    } catch (err: unknown) {
+      setError(getErrorMessage(err, t('errors.load_failed')))
    } finally {
      setLoading(false)
      setRefreshing(false)
@@ -76,8 +124,8 @@ export default function LogbookDashboard({ onSelectLogbook, onLogout, onOpenProf
      setLogbooks((prev) => [created, ...prev])
      setNewTitle('')
      trackPlausibleEvent(PlausibleEvents.LOGBOOK_CREATED)
-    } catch (err: any) {
-      setError(err.message || 'Failed to create logbook')
+    } catch (err: unknown) {
+      setError(getErrorMessage(err, t('errors.save_failed')))
    } finally {
      setLoading(false)
    }
@@ -93,7 +141,7 @@ export default function LogbookDashboard({ onSelectLogbook, onLogout, onOpenProf
        await deleteLogbook(id)
        setLogbooks((prev) => prev.filter((lb) => lb.id !== id))
      } catch (err: any) {
-        setError(err.message || 'Failed to delete logbook')
+        setError(getErrorMessage(err, t('errors.delete_failed')))
      } finally {
        setLoading(false)
      }
@@ -137,7 +185,7 @@ export default function LogbookDashboard({ onSelectLogbook, onLogout, onOpenProf
        )
      )
    } catch (err: any) {
-      setError(err.message || 'Failed to update logbook title')
+      setError(getErrorMessage(err, t('errors.save_failed')))
    } finally {
      setLoading(false)
    }
@@ -149,23 +197,55 @@ export default function LogbookDashboard({ onSelectLogbook, onLogout, onOpenProf
  }

  const toggleLanguage = () => {
-    const nextLang = i18n.language.startsWith('de') ? 'en' : 'de'
-    i18n.changeLanguage(nextLang)
+    cycleAppLanguage(i18n)
  }

  const ownedLogbooks = logbooks.filter((lb) => !lb.isShared)
  const sharedLogbooks = logbooks.filter((lb) => lb.isShared)

+  const filterActive = filterQuery.trim().length > 0
+  const filteredOwnedLogbooks = useMemo(
+    () =>
+      ownedLogbooks.filter((lb) =>
+        logbookMatchesFilter(lb, filterQuery, i18n.language, searchFieldsByLogbookId.get(lb.id))
+      ),
+    [ownedLogbooks, filterQuery, i18n.language, searchFieldsByLogbookId]
+  )
+  const filteredSharedLogbooks = useMemo(
+    () =>
+      sharedLogbooks.filter((lb) =>
+        logbookMatchesFilter(lb, filterQuery, i18n.language, searchFieldsByLogbookId.get(lb.id))
+      ),
+    [sharedLogbooks, filterQuery, i18n.language, searchFieldsByLogbookId]
+  )
+  const sortedOwnedLogbooks = useMemo(
+    () => sortLogbooks(filteredOwnedLogbooks, sortBy, sortDirection, i18n.language),
+    [filteredOwnedLogbooks, sortBy, sortDirection, i18n.language]
+  )
+  const sortedSharedLogbooks = useMemo(
+    () => sortLogbooks(filteredSharedLogbooks, sortBy, sortDirection, i18n.language),
+    [filteredSharedLogbooks, sortBy, sortDirection, i18n.language]
+  )
+  const filteredLogbookCount = sortedOwnedLogbooks.length + sortedSharedLogbooks.length
+
  const renderLogbookCard = (lb: DecryptedLogbook) => {
    const isEditingTitle = editingLogbookId === lb.id

    return (
    <div
      key={lb.id}
-      className={`logbook-card glass${lb.isShared ? ' logbook-card--shared' : ''}`}
-      onClick={() => onSelectLogbook(lb.id, lb.title)}
+      className={`logbook-card glass${lb.isShared ? ' logbook-card--shared' : ''}${isEditingTitle ? ' logbook-card--editing-title' : ''}`}
    >
-      <div className="card-icon">
+      {!isEditingTitle && (
+        <button
+          type="button"
+          className="logbook-card-select"
+          onClick={() => onSelectLogbook(lb.id, lb.title)}
+          aria-label={t('dashboard.open_logbook', { title: lb.title })}
+        />
+      )}
+
+      <div className="card-icon" aria-hidden>
        <BookOpen size={24} />
      </div>

@@ -178,7 +258,6 @@ export default function LogbookDashboard({ onSelectLogbook, onLogout, onOpenProf
              className="logbook-title-inline-edit input-text"
              value={editingTitleDraft}
              onChange={(e) => setEditingTitleDraft(e.target.value)}
-              onClick={(e) => e.stopPropagation()}
              onKeyDown={(e) => {
                if (e.key === 'Enter') {
                  e.preventDefault()
@@ -307,18 +386,7 @@ export default function LogbookDashboard({ onSelectLogbook, onLogout, onOpenProf
            )}
          </div>

-          {/* Skipper profile */}
-          <button
-            type="button"
-            className="btn-icon skipper-badge"
-            onClick={onOpenProfile}
-            title={t('dashboard.open_profile', { name: username })}
-            aria-label={t('dashboard.open_profile', { name: username })}
-            data-tour="nav-profile"
-          >
-            <User size={18} aria-hidden="true" />
-            <span className="skipper-badge__name">{username}</span>
-          </button>
+          <ProfileHeaderButton onClick={onOpenProfile} />

          {/* Lang toggle */}
          <button className="btn-icon" onClick={toggleLanguage} title="Switch Language">
@@ -376,17 +444,115 @@ export default function LogbookDashboard({ onSelectLogbook, onLogout, onOpenProf
          ) : logbooks.length === 0 ? (
            <div className="dashboard-status-msg glass">{t('dashboard.no_logbooks')}</div>
          ) : (
-            <div className="logbook-sections">
-              {ownedLogbooks.length > 0 && renderLogbookSection(
-                sharedLogbooks.length > 0 ? t('dashboard.section_owned') : t('dashboard.title'),
-                ownedLogbooks
+            <>
+              <div className="dashboard-list-controls">
+                <div className="dashboard-filter-bar">
+                  <label className="dashboard-filter-label" htmlFor="logbook-list-filter">
+                    {t('dashboard.filter_label')}
+                  </label>
+                  <div className="dashboard-filter-input-wrap">
+                    <Search size={18} className="dashboard-filter-icon" aria-hidden="true" />
+                    <input
+                      ref={filterInputRef}
+                      id="logbook-list-filter"
+                      type="search"
+                      className="input-text dashboard-filter-input"
+                      placeholder={t('dashboard.filter_placeholder')}
+                      value={filterQuery}
+                      onChange={(e) => setFilterQuery(e.target.value)}
+                      autoComplete="off"
+                      spellCheck={false}
+                      aria-describedby={filterActive ? 'logbook-filter-status' : undefined}
+                    />
+                    {filterActive && (
+                      <button
+                        type="button"
+                        className="dashboard-filter-clear"
+                        onClick={() => {
+                          setFilterQuery('')
+                          filterInputRef.current?.focus()
+                        }}
+                        title={t('dashboard.filter_clear')}
+                        aria-label={t('dashboard.filter_clear')}
+                      >
+                        <X size={16} aria-hidden="true" />
+                      </button>
+                    )}
+                  </div>
+                  {filterActive && (
+                    <p id="logbook-filter-status" className="dashboard-filter-meta" role="status">
+                      {t('dashboard.filter_results', { count: filteredLogbookCount })}
+                    </p>
+                  )}
+                </div>
+
+                <div className="dashboard-sort-bar">
+                  <span className="dashboard-sort-label">{t('dashboard.sort_label')}</span>
+                  <div className="dashboard-sort-row">
+                    <div className="dashboard-sort-group" role="group" aria-label={t('dashboard.sort_by_label')}>
+                      <button
+                        type="button"
+                        className={`dashboard-sort-btn${sortBy === 'name' ? ' is-active' : ''}`}
+                        onClick={() => setSortBy('name')}
+                        aria-pressed={sortBy === 'name'}
+                        aria-label={t('dashboard.sort_by_name')}
+                        title={t('dashboard.sort_by_name')}
+                      >
+                        <CaseSensitive size={16} aria-hidden="true" />
+                      </button>
+                      <button
+                        type="button"
+                        className={`dashboard-sort-btn${sortBy === 'date' ? ' is-active' : ''}`}
+                        onClick={() => setSortBy('date')}
+                        aria-pressed={sortBy === 'date'}
+                        aria-label={t('dashboard.sort_by_date')}
+                        title={t('dashboard.sort_by_date')}
+                      >
+                        <CalendarDays size={16} aria-hidden="true" />
+                      </button>
+                    </div>
+                    <div className="dashboard-sort-group" role="group" aria-label={t('dashboard.sort_dir_label')}>
+                      <button
+                        type="button"
+                        className={`dashboard-sort-btn${sortDirection === 'asc' ? ' is-active' : ''}`}
+                        onClick={() => setSortDirection('asc')}
+                        aria-pressed={sortDirection === 'asc'}
+                        aria-label={sortBy === 'name' ? t('dashboard.sort_name_asc') : t('dashboard.sort_date_asc')}
+                        title={sortBy === 'name' ? t('dashboard.sort_name_asc') : t('dashboard.sort_date_asc')}
+                      >
+                        <ArrowUp size={16} aria-hidden="true" />
+                      </button>
+                      <button
+                        type="button"
+                        className={`dashboard-sort-btn${sortDirection === 'desc' ? ' is-active' : ''}`}
+                        onClick={() => setSortDirection('desc')}
+                        aria-pressed={sortDirection === 'desc'}
+                        aria-label={sortBy === 'name' ? t('dashboard.sort_name_desc') : t('dashboard.sort_date_desc')}
+                        title={sortBy === 'name' ? t('dashboard.sort_name_desc') : t('dashboard.sort_date_desc')}
+                      >
+                        <ArrowDown size={16} aria-hidden="true" />
+                      </button>
+                    </div>
+                  </div>
+                </div>
+              </div>
+
+              {filterActive && filteredLogbookCount === 0 ? (
+                <div className="dashboard-status-msg glass">{t('dashboard.filter_no_results')}</div>
+              ) : (
+                <div className="logbook-sections">
+                  {sortedOwnedLogbooks.length > 0 && renderLogbookSection(
+                    sortedSharedLogbooks.length > 0 ? t('dashboard.section_owned') : t('dashboard.title'),
+                    sortedOwnedLogbooks
+                  )}
+                  {sortedSharedLogbooks.length > 0 && renderLogbookSection(
+                    t('dashboard.section_shared'),
+                    sortedSharedLogbooks,
+                    t('dashboard.section_shared_hint')
+                  )}
+                </div>
              )}
-              {sharedLogbooks.length > 0 && renderLogbookSection(
-                t('dashboard.section_shared'),
-                sharedLogbooks,
-                t('dashboard.section_shared_hint')
-              )}
-            </div>
+            </>
          )}
        </section>
      </main>
@@ -0,0 +1,199 @@
+import { useCallback, useEffect, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { Ship, Save, Check } from 'lucide-react'
+import type { LogbookVesselSelectionData, VesselData } from '../types/vessel.js'
+import type { DecryptedVessel } from '../services/vesselPool.js'
+import { loadVesselPool } from '../services/vesselPool.js'
+import { loadLogbookVesselSelection, saveLogbookVesselSelectionFromId } from '../services/logbookVesselSelection.js'
+import { resolveVesselForLogbook } from '../services/resolveVessel.js'
+import { vesselDataFromSnapshot } from '../utils/vesselSnapshot.js'
+import { PlausibleEvents, trackPlausibleEvent } from '../services/analytics.js'
+
+export interface LogbookVesselPickerProps {
+  logbookId: string
+  readOnly?: boolean
+  preloadedPool?: Array<{ payloadId: string; data: VesselData }>
+  preloadedSelection?: LogbookVesselSelectionData
+  selectionOnly?: boolean
+  onOpenProfile?: () => void
+}
+
+export default function LogbookVesselPicker({
+  logbookId,
+  readOnly = false,
+  preloadedPool,
+  preloadedSelection,
+  selectionOnly = false,
+  onOpenProfile
+}: LogbookVesselPickerProps) {
+  const { t } = useTranslation()
+  const [loading, setLoading] = useState(!preloadedSelection)
+  const [saving, setSaving] = useState(false)
+  const [saved, setSaved] = useState(false)
+  const [error, setError] = useState<string | null>(null)
+  const [pool, setPool] = useState<DecryptedVessel[]>([])
+  const [activeVesselId, setActiveVesselId] = useState<string | null>(null)
+  const [resolvedVessel, setResolvedVessel] = useState<VesselData | null>(null)
+
+  const loadData = useCallback(async () => {
+    setLoading(true)
+    setError(null)
+    try {
+      const selection =
+        preloadedSelection ??
+        (logbookId === 'demo' ? null : await loadLogbookVesselSelection(logbookId))
+
+      if (selection) {
+        setActiveVesselId(selection.activeVesselId)
+      }
+
+      if (preloadedPool) {
+        setPool(preloadedPool.map((p) => ({ payloadId: p.payloadId, data: p.data })))
+      } else if (selectionOnly && selection?.vesselSnapshot) {
+        const data = vesselDataFromSnapshot(selection.vesselSnapshot)
+        if (data) {
+          setPool([{ payloadId: selection.vesselSnapshot.id, data }])
+        }
+      } else {
+        setPool(await loadVesselPool())
+      }
+
+      const vessel = await resolveVesselForLogbook(logbookId, {
+        preloadedSelection: selection ?? undefined
+      })
+      setResolvedVessel(vessel)
+    } catch (err: unknown) {
+      setError(err instanceof Error ? err.message : 'Failed to load vessel selection')
+    } finally {
+      setLoading(false)
+    }
+  }, [logbookId, preloadedPool, preloadedSelection, selectionOnly])
+
+  useEffect(() => {
+    void loadData()
+  }, [loadData])
+
+  const handleSave = async () => {
+    if (readOnly || logbookId === 'demo') return
+    setSaving(true)
+    setError(null)
+    setSaved(false)
+    try {
+      const selection = await saveLogbookVesselSelectionFromId(logbookId, activeVesselId)
+      const vessel = vesselDataFromSnapshot(selection.vesselSnapshot)
+      setResolvedVessel(vessel)
+      setSaved(true)
+      trackPlausibleEvent(PlausibleEvents.VESSEL_SAVED, { context: 'logbook_selection' })
+      setTimeout(() => setSaved(false), 3000)
+    } catch (err: unknown) {
+      setError(err instanceof Error ? err.message : 'Failed to save')
+    } finally {
+      setSaving(false)
+    }
+  }
+
+  if (loading) {
+    return (
+      <div className="tab-placeholder">
+        <Ship className="header-logo spin" size={48} />
+        <p>{t('vessel_pool.loading')}</p>
+      </div>
+    )
+  }
+
+  return (
+    <div className="crew-dashboard-layout" data-tour="logbook-vessel-picker">
+      <div className="form-card">
+        <div className="form-header">
+          <Ship size={24} className="form-icon" />
+          <h2>{t('logbook_vessel.title')}</h2>
+        </div>
+        <p className="help-text mb-4">{t('logbook_vessel.subtitle')}</p>
+        {selectionOnly && <p className="help-text mb-4">{t('logbook_vessel.selection_only_hint')}</p>}
+        {!selectionOnly && !readOnly && onOpenProfile && (
+          <p className="help-text mb-4">
+            <button type="button" className="btn-link" onClick={onOpenProfile}>
+              {t('logbook_vessel.manage_in_profile')}
+            </button>
+          </p>
+        )}
+        {error && <div className="auth-error mb-4">{error}</div>}
+
+        <div className="input-group mb-4">
+          <label>{t('logbook_vessel.active_vessel')}</label>
+          {pool.length === 0 ? (
+            <p className="help-text">{t('logbook_vessel.no_vessels_in_pool')}</p>
+          ) : (
+            <div className="crew-selection-list">
+              {pool.map((v) => (
+                <label key={v.payloadId} className="crew-selection-item">
+                  <input
+                    type="radio"
+                    name={`vessel-${logbookId}`}
+                    checked={activeVesselId === v.payloadId}
+                    onChange={() => !readOnly && setActiveVesselId(v.payloadId)}
+                    disabled={readOnly}
+                  />
+                  <Ship size={16} aria-hidden="true" />
+                  <span>{v.data.name || t('logbook_vessel.unnamed')}</span>
+                </label>
+              ))}
+              {!readOnly && (
+                <label className="crew-selection-item">
+                  <input
+                    type="radio"
+                    name={`vessel-${logbookId}`}
+                    checked={activeVesselId === null}
+                    onChange={() => setActiveVesselId(null)}
+                  />
+                  <span>{t('logbook_vessel.no_vessel')}</span>
+                </label>
+              )}
+            </div>
+          )}
+        </div>
+
+        {resolvedVessel && (
+          <div className="member-editor-card glass mb-4 logbook-vessel-summary">
+            <h3 className="mb-2">{resolvedVessel.name}</h3>
+            <dl className="profile-dl">
+              {resolvedVessel.homePort && (
+                <div className="profile-dl-row">
+                  <dt>{t('vessel.port')}</dt>
+                  <dd>{resolvedVessel.homePort}</dd>
+                </div>
+              )}
+              {resolvedVessel.registrationNumber && (
+                <div className="profile-dl-row">
+                  <dt>{t('vessel.registration')}</dt>
+                  <dd>{resolvedVessel.registrationNumber}</dd>
+                </div>
+              )}
+              {resolvedVessel.mmsi && (
+                <div className="profile-dl-row">
+                  <dt>{t('vessel.mmsi')}</dt>
+                  <dd>{resolvedVessel.mmsi}</dd>
+                </div>
+              )}
+            </dl>
+          </div>
+        )}
+
+        {!readOnly && logbookId !== 'demo' && (
+          <div className="form-actions">
+            {saved && (
+              <div className="success-toast">
+                <Check size={16} />
+                <span>{t('logbook_vessel.saved')}</span>
+              </div>
+            )}
+            <button type="button" className="btn primary" onClick={() => void handleSave()} disabled={saving}>
+              <Save size={18} />
+              {t('logbook_vessel.save')}
+            </button>
+          </div>
+        )}
+      </div>
+    </div>
+  )
+}
@@ -0,0 +1,196 @@
+import React, { useCallback } from 'react'
+import { useTranslation } from 'react-i18next'
+
+export interface MetricRangeInputProps {
+  id?: string
+  label: string
+  value: string
+  onChange: (value: string) => void
+  disabled?: boolean
+  min?: number
+  max?: number
+  step?: number
+  discreteValues?: readonly number[]
+  parse: (value: string) => number | null
+  format: (numeric: number) => string
+  defaultNumeric: number
+  /** Shown next to the label (current value). */
+  formatDisplay: (numeric: number, unset: boolean) => string
+  numberMin?: number
+  numberMax?: number
+  numberStep?: number | 'any'
+  numberPlaceholder?: string
+  allowLegacyText?: boolean
+  hideNumberInput?: boolean
+}
+
+function clamp(n: number, min: number, max: number): number {
+  return Math.min(max, Math.max(min, n))
+}
+
+export default function MetricRangeInput({
+  id,
+  label,
+  value,
+  onChange,
+  disabled = false,
+  min,
+  max,
+  discreteValues,
+  parse,
+  format,
+  defaultNumeric,
+  formatDisplay,
+  numberMin,
+  numberMax,
+  numberStep = 'any',
+  numberPlaceholder,
+  allowLegacyText = false,
+  hideNumberInput = false
+}: MetricRangeInputProps) {
+  const { t } = useTranslation()
+  const unsetLabel = t('logs.weather_slider_unset', { defaultValue: '—' })
+
+  const isLegacyText =
+    allowLegacyText && value.trim() !== '' && parse(value) === null
+
+  const emitNumeric = useCallback(
+    (numeric: number) => {
+      onChange(format(numeric))
+    },
+    [onChange, format]
+  )
+
+  const parsed = parse(value)
+  const unset = parsed === null
+  const sliderNumeric = unset ? defaultNumeric : parsed
+
+  const useDiscrete = discreteValues != null && discreteValues.length > 1
+
+  let sliderMin = 0
+  let sliderMax = 0
+  let sliderValue = 0
+
+  if (useDiscrete) {
+    sliderMin = 0
+    sliderMax = discreteValues.length - 1
+    if (unset) {
+      sliderValue = 0
+    } else {
+      let bestIdx = 0
+      let bestDiff = Math.abs(discreteValues[0] - sliderNumeric)
+      for (let i = 1; i < discreteValues.length; i++) {
+        const diff = Math.abs(discreteValues[i] - sliderNumeric)
+        if (diff < bestDiff) {
+          bestDiff = diff
+          bestIdx = i
+        }
+      }
+      sliderValue = bestIdx
+    }
+  } else if (min != null && max != null) {
+    sliderMin = min
+    sliderMax = max
+    sliderValue = clamp(sliderNumeric, min, max)
+  }
+
+  const handleSliderChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    const idx = Number(e.target.value)
+    if (useDiscrete && discreteValues) {
+      emitNumeric(discreteValues[clamp(idx, 0, discreteValues.length - 1)])
+      return
+    }
+    if (min != null && max != null) {
+      emitNumeric(Number(e.target.value))
+    }
+  }
+
+  const handleNumberChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    onChange(e.target.value)
+  }
+
+  const handleNumberBlur = () => {
+    const next = parse(value)
+    if (next == null) {
+      if (!value.trim()) onChange('')
+      return
+    }
+    onChange(format(next))
+  }
+
+  const hintNumeric = useDiscrete && discreteValues
+    ? discreteValues[sliderValue]
+    : sliderValue
+
+  const displayLabel = unset ? unsetLabel : formatDisplay(hintNumeric, false)
+
+  if (isLegacyText) {
+    return (
+      <div className="input-group metric-range-input metric-range-input--compact">
+        <div className="metric-range-header">
+          <label htmlFor={id}>{label}</label>
+        </div>
+        <input
+          id={id}
+          type="text"
+          className="input-text"
+          value={value}
+          onChange={(e) => onChange(e.target.value)}
+          disabled={disabled}
+          placeholder={numberPlaceholder}
+        />
+      </div>
+    )
+  }
+
+  const hasSlider = useDiscrete || (min != null && max != null)
+
+  return (
+    <div className="input-group metric-range-input metric-range-input--compact">
+      <div className="metric-range-header">
+        <label htmlFor={hideNumberInput ? undefined : id}>{label}</label>
+        {hasSlider && (
+          <span className="metric-range-value" aria-live="polite">
+            {displayLabel}
+          </span>
+        )}
+      </div>
+      {hasSlider && (
+        <div className="metric-range-control-row">
+          <input
+            type="range"
+            className="tank-liter-slider metric-range-slider"
+            min={sliderMin}
+            max={sliderMax}
+            step={1}
+            value={sliderValue}
+            onChange={handleSliderChange}
+            disabled={disabled}
+            aria-valuemin={sliderMin}
+            aria-valuemax={sliderMax}
+            aria-valuenow={sliderValue}
+            aria-label={label}
+            aria-valuetext={displayLabel}
+          />
+          {!hideNumberInput && (
+            <input
+              id={id}
+              type="number"
+              className="input-text metric-range-number"
+              value={unset ? '' : value.replace(/\s*hPa\s*$/i, '').replace(/°\s*$/, '')}
+              onChange={handleNumberChange}
+              onBlur={handleNumberBlur}
+              disabled={disabled}
+              min={numberMin}
+              max={numberMax}
+              step={numberStep}
+              placeholder={numberPlaceholder}
+              inputMode="decimal"
+              aria-label={label}
+            />
+          )}
+        </div>
+      )}
+    </div>
+  )
+}
@@ -1,8 +1,28 @@
-import React, { createContext, useContext, useState, useRef, useCallback, useMemo } from 'react'
+import React, {
+  createContext,
+  useContext,
+  useState,
+  useRef,
+  useCallback,
+  useMemo,
+  useEffect,
+  useId
+} from 'react'
+import { useTranslation } from 'react-i18next'
+
+export type ConfirmLeaveChoice = 'stay' | 'save' | 'discard'

 interface DialogContextType {
  showAlert: (message: string, title?: string, confirmText?: string) => Promise<void>
  showConfirm: (message: string, title?: string, confirmText?: string, cancelText?: string) => Promise<boolean>
+  showConfirmLeave: (
+    message: string,
+    title?: string,
+    stayLabel?: string,
+    saveLabel?: string,
+    discardLabel?: string,
+    options?: { showSave?: boolean }
+  ) => Promise<ConfirmLeaveChoice>
 }

 const DialogContext = createContext<DialogContextType | undefined>(undefined)
@@ -16,26 +36,36 @@ export function useDialog() {
 }

 export function DialogProvider({ children }: { children: React.ReactNode }) {
+  const { t } = useTranslation()
+  const titleId = useId()
+  const messageId = useId()
+  const confirmRef = useRef<HTMLButtonElement>(null)
+
  const [isOpen, setIsOpen] = useState(false)
  const [title, setTitle] = useState('')
  const [message, setMessage] = useState('')
-  const [type, setType] = useState<'alert' | 'confirm'>('alert')
+  const [type, setType] = useState<'alert' | 'confirm' | 'confirm-leave'>('alert')
  const [confirmLabel, setConfirmLabel] = useState('OK')
  const [cancelLabel, setCancelLabel] = useState('Cancel')
+  const [saveLabel, setSaveLabel] = useState('')
+  const [discardLabel, setDiscardLabel] = useState('')
+  const [showSaveOption, setShowSaveOption] = useState(false)

-  const resolveRef = useRef<((val: any) => void) | null>(null)
+  const alertResolveRef = useRef<(() => void) | null>(null)
+  const confirmResolveRef = useRef<((val: boolean) => void) | null>(null)
+  const confirmLeaveResolveRef = useRef<((val: ConfirmLeaveChoice) => void) | null>(null)

  const showAlert = useCallback((msg: string, headerTitle?: string, btnText?: string): Promise<void> => {
    setMessage(msg)
    setTitle(headerTitle || '')
    setType('alert')
-    setConfirmLabel(btnText || 'OK')
+    setConfirmLabel(btnText || t('dialog.ok'))
    setIsOpen(true)

    return new Promise<void>((resolve) => {
-      resolveRef.current = resolve
+      alertResolveRef.current = resolve
    })
-  }, [])
+  }, [t])

  const showConfirm = useCallback((
    msg: string,
@@ -46,53 +76,164 @@ export function DialogProvider({ children }: { children: React.ReactNode }) {
    setMessage(msg)
    setTitle(headerTitle || '')
    setType('confirm')
-    setConfirmLabel(btnConfirm || 'Yes')
-    setCancelLabel(btnCancel || 'No')
+    setConfirmLabel(btnConfirm || t('dialog.yes'))
+    setCancelLabel(btnCancel || t('dialog.no'))
    setIsOpen(true)

    return new Promise<boolean>((resolve) => {
-      resolveRef.current = resolve
+      confirmResolveRef.current = resolve
    })
+  }, [t])
+
+  const showConfirmLeave = useCallback((
+    msg: string,
+    headerTitle?: string,
+    btnStay?: string,
+    btnSave?: string,
+    btnDiscard?: string,
+    options?: { showSave?: boolean }
+  ): Promise<ConfirmLeaveChoice> => {
+    setMessage(msg)
+    setTitle(headerTitle || '')
+    setType('confirm-leave')
+    setCancelLabel(btnStay || t('common.unsaved_changes_stay'))
+    setSaveLabel(btnSave || t('common.unsaved_changes_save_leave'))
+    setDiscardLabel(btnDiscard || t('common.unsaved_changes_discard'))
+    setShowSaveOption(options?.showSave !== false)
+    setIsOpen(true)
+
+    return new Promise<ConfirmLeaveChoice>((resolve) => {
+      confirmLeaveResolveRef.current = resolve
+    })
+  }, [t])
+
+  const closeConfirmLeave = useCallback((choice: ConfirmLeaveChoice) => {
+    setIsOpen(false)
+    if (confirmLeaveResolveRef.current) {
+      confirmLeaveResolveRef.current(choice)
+      confirmLeaveResolveRef.current = null
+    }
  }, [])

  const handleConfirm = useCallback(() => {
    setIsOpen(false)
-    if (resolveRef.current) {
-      resolveRef.current(type === 'confirm' ? true : undefined)
-      resolveRef.current = null
+    if (type === 'confirm' && confirmResolveRef.current) {
+      confirmResolveRef.current(true)
+      confirmResolveRef.current = null
+    } else if (alertResolveRef.current) {
+      alertResolveRef.current()
+      alertResolveRef.current = null
    }
  }, [type])

  const handleCancel = useCallback(() => {
-    setIsOpen(false)
-    if (resolveRef.current) {
-      resolveRef.current(false)
-      resolveRef.current = null
+    if (type === 'confirm-leave') {
+      closeConfirmLeave('stay')
+      return
    }
-  }, [])
+    setIsOpen(false)
+    if (confirmResolveRef.current) {
+      confirmResolveRef.current(false)
+      confirmResolveRef.current = null
+    }
+  }, [type, closeConfirmLeave])
+
+  useEffect(() => {
+    if (!isOpen) return
+    confirmRef.current?.focus()
+    const onKeyDown = (e: KeyboardEvent) => {
+      if (e.key === 'Escape') {
+        if (type === 'confirm' || type === 'confirm-leave') handleCancel()
+        else handleConfirm()
+      }
+    }
+    window.addEventListener('keydown', onKeyDown)
+    return () => window.removeEventListener('keydown', onKeyDown)
+  }, [isOpen, type, handleCancel, handleConfirm])

  const contextValue = useMemo(
-    () => ({ showAlert, showConfirm }),
-    [showAlert, showConfirm]
+    () => ({ showAlert, showConfirm, showConfirmLeave }),
+    [showAlert, showConfirm, showConfirmLeave]
  )

  return (
    <DialogContext.Provider value={contextValue}>
      {children}
      {isOpen && (
-        <div className="custom-dialog-overlay" onClick={type === 'alert' ? handleConfirm : undefined}>
-          <div className="custom-dialog-card glass scale-in" onClick={(e) => e.stopPropagation()}>
-            {title && <h3 className="custom-dialog-title">{title}</h3>}
-            <p className="custom-dialog-message">{message}</p>
+        <div
+          className="custom-dialog-overlay"
+          onClick={type === 'confirm' || type === 'confirm-leave' ? handleCancel : handleConfirm}
+        >
+          <div
+            className="custom-dialog-card glass scale-in"
+            role="dialog"
+            aria-modal="true"
+            aria-labelledby={title ? titleId : undefined}
+            aria-describedby={messageId}
+            onClick={(e) => e.stopPropagation()}
+          >
+            {title && (
+              <h3 id={titleId} className="custom-dialog-title">
+                {title}
+              </h3>
+            )}
+            <p id={messageId} className="custom-dialog-message">
+              {message}
+            </p>
            <div className="custom-dialog-actions">
-              {type === 'confirm' && (
-                <button type="button" className="btn secondary" onClick={handleCancel} style={{ width: 'auto', padding: '8px 20px', margin: 0 }}>
-                  {cancelLabel}
-                </button>
+              {type === 'confirm-leave' ? (
+                <>
+                  <button
+                    ref={confirmRef}
+                    type="button"
+                    className="btn secondary"
+                    onClick={handleCancel}
+                    style={{ width: 'auto', padding: '8px 20px', margin: 0 }}
+                  >
+                    {cancelLabel}
+                  </button>
+                  {showSaveOption && (
+                    <button
+                      type="button"
+                      className="btn primary"
+                      onClick={() => closeConfirmLeave('save')}
+                      style={{ width: 'auto', padding: '8px 20px', margin: 0 }}
+                    >
+                      {saveLabel}
+                    </button>
+                  )}
+                  <button
+                    type="button"
+                    className="btn danger"
+                    onClick={() => closeConfirmLeave('discard')}
+                    style={{ width: 'auto', padding: '8px 20px', margin: 0 }}
+                  >
+                    {discardLabel}
+                  </button>
+                </>
+              ) : (
+                <>
+                  {type === 'confirm' && (
+                    <button
+                      type="button"
+                      className="btn secondary"
+                      onClick={handleCancel}
+                      style={{ width: 'auto', padding: '8px 20px', margin: 0 }}
+                    >
+                      {cancelLabel}
+                    </button>
+                  )}
+                  <button
+                    ref={confirmRef}
+                    type="button"
+                    className="btn primary"
+                    onClick={handleConfirm}
+                    style={{ width: 'auto', minWidth: '80px', padding: '8px 20px', margin: 0 }}
+                  >
+                    {confirmLabel}
+                  </button>
+                </>
              )}
-              <button type="button" className="btn primary" onClick={handleConfirm} style={{ width: 'auto', minWidth: '80px', padding: '8px 20px', margin: 0 }}>
-                {confirmLabel}
-              </button>
            </div>
          </div>
        </div>
@@ -0,0 +1,333 @@
+import { useEffect, useMemo, useState } from 'react'
+import { createPortal } from 'react-dom'
+import { useTranslation } from 'react-i18next'
+import { FileText, X } from 'lucide-react'
+import type { LogEventPayload } from '../utils/logEntryPayload.js'
+import { sortLogEventsByTime } from '../utils/logEntryPayload.js'
+import { parseNmeaFile, nmeaPointsToWaypoints } from '../services/nmea/nmeaParse.js'
+import { filterPointsForDate } from '../services/nmea/nmeaTimeSeries.js'
+import { generateNmeaJournalCandidates } from '../services/nmea/nmeaJournalGenerator.js'
+import type { NmeaImportMode, NmeaParseResult } from '../services/nmea/nmeaTypes.js'
+import { saveNmeaArchive, recordNmeaFileImport, type NmeaArchiveRecord } from '../services/nmeaArchive.js'
+import { nmeaFileCrc32 } from '../utils/crc32.js'
+import { PlausibleEvents, trackPlausibleEvent } from '../services/analytics.js'
+import type { TrackWaypoint } from '../services/trackUpload.js'
+
+interface NmeaImportWizardProps {
+  open: boolean
+  onClose: () => void
+  logbookId: string
+  entryId: string
+  entryDate: string
+  nmeaArchive: NmeaArchiveRecord | null
+  onImport: (events: LogEventPayload[], waypoints?: TrackWaypoint[]) => void
+}
+
+type WizardStep = 'config' | 'preview' | 'archive'
+
+export default function NmeaImportWizard({
+  open,
+  onClose,
+  logbookId,
+  entryId,
+  entryDate,
+  nmeaArchive,
+  onImport
+}: NmeaImportWizardProps) {
+  const { t } = useTranslation()
+  const [step, setStep] = useState<WizardStep>('config')
+  const [parseResult, setParseResult] = useState<NmeaParseResult | null>(null)
+  const [mode, setMode] = useState<NmeaImportMode>('both')
+  const [intervalMinutes, setIntervalMinutes] = useState(60)
+  const [importTrack, setImportTrack] = useState(true)
+  const [selectedIds, setSelectedIds] = useState<Set<string>>(new Set())
+  const [error, setError] = useState<string | null>(null)
+  const [pendingRaw, setPendingRaw] = useState<{ filename: string; text: string } | null>(null)
+  const [duplicateFile, setDuplicateFile] = useState(false)
+
+  const filteredPoints = useMemo(() => {
+    if (!parseResult) return []
+    return filterPointsForDate(parseResult.points, entryDate)
+  }, [parseResult, entryDate])
+
+  const candidates = useMemo(() => {
+    if (!parseResult || filteredPoints.length === 0) return []
+    return generateNmeaJournalCandidates({
+      points: filteredPoints,
+      mode,
+      intervalMinutes,
+      t
+    }).candidates
+  }, [parseResult, filteredPoints, mode, intervalMinutes, t])
+
+  const reset = () => {
+    setStep('config')
+    setParseResult(null)
+    setMode('both')
+    setIntervalMinutes(60)
+    setImportTrack(true)
+    setSelectedIds(new Set())
+    setError(null)
+    setDuplicateFile(false)
+    setPendingRaw(null)
+  }
+
+  const handleClose = () => {
+    reset()
+    onClose()
+  }
+
+  const handleFile = (file: File) => {
+    setError(null)
+    setDuplicateFile(false)
+    const reader = new FileReader()
+    reader.onload = () => {
+      try {
+        const text = String(reader.result ?? '')
+        const crc32 = nmeaFileCrc32(text)
+        const alreadyImported = nmeaArchive?.importedFiles.some((item) => item.crc32 === crc32) ?? false
+        setDuplicateFile(alreadyImported)
+        const result = parseNmeaFile(text, file.name)
+        if (result.points.length === 0) {
+          setError(t('logs.nmea_error_no_samples'))
+          return
+        }
+        setParseResult(result)
+        setPendingRaw({ filename: file.name, text })
+        const generated = generateNmeaJournalCandidates({
+          points: filterPointsForDate(result.points, entryDate),
+          mode,
+          intervalMinutes,
+          t
+        }).candidates
+        setSelectedIds(new Set(generated.map((c) => c.id)))
+        trackPlausibleEvent(PlausibleEvents.NMEA_UPLOADED, {
+          duplicate: alreadyImported,
+          lines: result.stats.parsedLines,
+          candidates: generated.length,
+          has_position: !result.warnings.includes('no_position')
+        })
+      } catch (err) {
+        setError(err instanceof Error ? err.message : t('logs.nmea_error_parse'))
+      }
+    }
+    reader.onerror = () => setError(t('logs.nmea_error_read'))
+    reader.readAsText(file)
+  }
+
+  const toggleAll = (checked: boolean) => {
+    setSelectedIds(checked ? new Set(candidates.map((c) => c.id)) : new Set())
+  }
+
+  const toggleOne = (id: string) => {
+    setSelectedIds((prev) => {
+      const next = new Set(prev)
+      if (next.has(id)) next.delete(id)
+      else next.add(id)
+      return next
+    })
+  }
+
+  const goPreview = () => {
+    if (!parseResult) {
+      setError(t('logs.nmea_error_no_file'))
+      return
+    }
+    const generated = generateNmeaJournalCandidates({
+      points: filteredPoints,
+      mode,
+      intervalMinutes,
+      t
+    }).candidates
+    setSelectedIds(new Set(generated.map((c) => c.id)))
+    setStep('preview')
+  }
+
+  const applyImport = async () => {
+    const picked = candidates.filter((c) => selectedIds.has(c.id)).map((c) => c.event)
+    if (picked.length === 0) {
+      setError(t('logs.nmea_error_no_selection'))
+      return
+    }
+    const waypoints = importTrack ? nmeaPointsToWaypoints(filteredPoints) : undefined
+    onImport(sortLogEventsByTime(picked), waypoints)
+    if (pendingRaw) {
+      try {
+        await recordNmeaFileImport(logbookId, entryId, pendingRaw.filename, pendingRaw.text)
+      } catch (err) {
+        console.warn('NMEA import CRC record failed:', err)
+      }
+    }
+    trackPlausibleEvent(PlausibleEvents.NMEA_IMPORTED, {
+      mode,
+      events: picked.length,
+      track: importTrack && (waypoints?.length ?? 0) > 0
+    })
+    setStep('archive')
+  }
+
+  const finishArchive = async (archive: boolean) => {
+    try {
+      if (archive && pendingRaw) {
+        await saveNmeaArchive(logbookId, entryId, pendingRaw.filename, pendingRaw.text)
+      }
+    } catch (err) {
+      console.warn('NMEA archive save failed:', err)
+    }
+    handleClose()
+  }
+
+  useEffect(() => {
+    if (!open) return
+    const onKeyDown = (event: KeyboardEvent) => {
+      if (event.key === 'Escape') handleClose()
+    }
+    window.addEventListener('keydown', onKeyDown)
+    const prevOverflow = document.body.style.overflow
+    document.body.style.overflow = 'hidden'
+    return () => {
+      window.removeEventListener('keydown', onKeyDown)
+      document.body.style.overflow = prevOverflow
+    }
+  }, [open])
+
+  if (!open) return null
+
+  return createPortal(
+    <div className="disclaimer-modal-overlay" onClick={handleClose}>
+      <div className="disclaimer-modal-panel" onClick={(e) => e.stopPropagation()}>
+        <div className="auth-card glass registration-disclaimer registration-disclaimer--modal feedback-modal">
+          <button
+            type="button"
+            className="registration-disclaimer__close feedback-modal__close"
+            onClick={handleClose}
+            aria-label={t('logs.nmea_cancel')}
+          >
+            <X size={18} />
+          </button>
+
+          <div className="auth-header">
+            <FileText className="auth-icon accent" size={40} />
+            <h2>{t('logs.nmea_import_title')}</h2>
+          </div>
+
+          {error && <div className="track-error-msg">{error}</div>}
+
+          {duplicateFile && (
+            <div className="nmea-import-warning" role="status">
+              {t('logs.nmea_warn_duplicate_file')}
+            </div>
+          )}
+
+          {step === 'config' && (
+            <>
+              <p className="registration-disclaimer__intro">{t('logs.nmea_import_intro')}</p>
+              <label className="feedback-form__field">
+                <span>{t('logs.nmea_file_label')}</span>
+                <input
+                  type="file"
+                  accept=".nmea,.log,.txt"
+                  onChange={(e) => {
+                    const file = e.target.files?.[0]
+                    if (file) handleFile(file)
+                  }}
+                />
+              </label>
+
+              {parseResult && (
+                <div className="nmea-import-summary">
+                  <p>{t('logs.nmea_stats', {
+                    lines: parseResult.stats.parsedLines,
+                    types: parseResult.stats.sentenceTypes.join(', ')
+                  })}</p>
+                  {parseResult.warnings.includes('no_position') && (
+                    <p>{t('logs.nmea_warn_no_position')}</p>
+                  )}
+                </div>
+              )}
+
+              <fieldset className="nmea-import-mode">
+                <legend>{t('logs.nmea_mode_label')}</legend>
+                <label><input type="radio" name="nmea-mode" checked={mode === 'interval'} onChange={() => setMode('interval')} /> {t('logs.nmea_mode_interval')}</label>
+                <label><input type="radio" name="nmea-mode" checked={mode === 'change'} onChange={() => setMode('change')} /> {t('logs.nmea_mode_change')}</label>
+                <label><input type="radio" name="nmea-mode" checked={mode === 'both'} onChange={() => setMode('both')} /> {t('logs.nmea_mode_both')}</label>
+              </fieldset>
+
+              {(mode === 'interval' || mode === 'both') && (
+                <label className="feedback-form__field">
+                  <span>{t('logs.nmea_interval_label')}</span>
+                  <select value={intervalMinutes} onChange={(e) => setIntervalMinutes(Number(e.target.value))}>
+                    <option value={30}>30 min</option>
+                    <option value={60}>60 min</option>
+                    <option value={90}>90 min</option>
+                    <option value={120}>120 min</option>
+                  </select>
+                </label>
+              )}
+
+              <label className="nmea-import-checkbox">
+                <input type="checkbox" checked={importTrack} onChange={(e) => setImportTrack(e.target.checked)} />
+                {t('logs.nmea_import_track')}
+              </label>
+
+              <div className="auth-actions feedback-form__actions">
+                <button type="button" className="btn secondary" onClick={handleClose}>{t('logs.nmea_cancel')}</button>
+                <button type="button" className="btn primary" onClick={goPreview} disabled={!parseResult}>
+                  {t('logs.nmea_preview')}
+                </button>
+              </div>
+            </>
+          )}
+
+          {step === 'preview' && (
+            <>
+              <p>{t('logs.nmea_preview_hint', { count: candidates.length })}</p>
+              <div className="nmea-preview-actions">
+                <button type="button" className="btn secondary" onClick={() => toggleAll(true)}>{t('logs.nmea_select_all')}</button>
+                <button type="button" className="btn secondary" onClick={() => toggleAll(false)}>{t('logs.nmea_select_none')}</button>
+              </div>
+              <div className="nmea-preview-list">
+                {candidates.map((c) => (
+                  <label key={c.id} className="nmea-preview-row">
+                    <input
+                      type="checkbox"
+                      className="nmea-preview-row__check"
+                      checked={selectedIds.has(c.id)}
+                      onChange={() => toggleOne(c.id)}
+                    />
+                    <div className="nmea-preview-row__body">
+                      <div className="nmea-preview-row__meta">
+                        <span className="nmea-preview-time">{c.event.time}</span>
+                        <span className="nmea-preview-source">{t(`logs.nmea_source_${c.source}`)}</span>
+                      </div>
+                      <span className="nmea-preview-remarks">{c.event.remarks || c.event.mgk || '—'}</span>
+                    </div>
+                  </label>
+                ))}
+              </div>
+              <div className="auth-actions feedback-form__actions">
+                <button type="button" className="btn secondary" onClick={() => setStep('config')}>{t('logs.nmea_back')}</button>
+                <button type="button" className="btn primary" onClick={applyImport}>{t('logs.nmea_apply')}</button>
+              </div>
+            </>
+          )}
+
+          {step === 'archive' && (
+            <>
+              <p>{t('logs.nmea_archive_question')}</p>
+              <div className="auth-actions feedback-form__actions">
+                <button type="button" className="btn secondary" onClick={() => finishArchive(false)}>
+                  {t('logs.nmea_archive_discard')}
+                </button>
+                <button type="button" className="btn primary" onClick={() => finishArchive(true)}>
+                  {t('logs.nmea_archive_keep')}
+                </button>
+              </div>
+            </>
+          )}
+        </div>
+      </div>
+    </div>,
+    document.body
+  )
+}
@@ -0,0 +1,313 @@
+import React, { useCallback, useEffect, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { Users, User, Plus, Trash2, Edit2, X, Camera, Save } from 'lucide-react'
+import { useDialog } from './ModalDialog.tsx'
+import { resizeImageFile } from '../utils/resizeImageFile.js'
+import type { PersonData, PersonRole } from '../types/person.js'
+import { MAX_POOL_CREW_MEMBERS } from '../types/person.js'
+import {
+  loadPersonPool,
+  savePerson,
+  deletePerson,
+  filterSkippers,
+  filterCrew,
+  type DecryptedPerson
+} from '../services/personPool.js'
+import { PlausibleEvents, trackPlausibleEvent } from '../services/analytics.js'
+
+const emptyPerson = (role: PersonRole): PersonData => ({
+  name: '',
+  address: '',
+  birthDate: '',
+  phone: '',
+  nationality: '',
+  passportNumber: '',
+  bloodType: '',
+  allergies: '',
+  diseases: '',
+  role,
+  photo: null
+})
+
+export default function PersonPoolForm() {
+  const { t } = useTranslation()
+  const { showConfirm } = useDialog()
+  const [people, setPeople] = useState<DecryptedPerson[]>([])
+  const [loading, setLoading] = useState(true)
+  const [error, setError] = useState<string | null>(null)
+  const [showForm, setShowForm] = useState(false)
+  const [editingId, setEditingId] = useState<string | null>(null)
+  const [formRole, setFormRole] = useState<PersonRole>('crew')
+  const [form, setForm] = useState<PersonData>(emptyPerson('crew'))
+  const [saving, setSaving] = useState(false)
+  const [photoError, setPhotoError] = useState<string | null>(null)
+  const fileRef = React.useRef<HTMLInputElement>(null)
+
+  const reload = useCallback(async () => {
+    setLoading(true)
+    setError(null)
+    try {
+      setPeople(await loadPersonPool())
+    } catch (err: unknown) {
+      setError(err instanceof Error ? err.message : 'Failed to load')
+    } finally {
+      setLoading(false)
+    }
+  }, [])
+
+  useEffect(() => {
+    void reload()
+  }, [reload])
+
+  const openAdd = (role: PersonRole) => {
+    setEditingId(null)
+    setFormRole(role)
+    setForm(emptyPerson(role))
+    setPhotoError(null)
+    setShowForm(true)
+  }
+
+  const openEdit = (person: DecryptedPerson) => {
+    setEditingId(person.payloadId)
+    setFormRole(person.data.role)
+    setForm({ ...person.data })
+    setPhotoError(null)
+    setShowForm(true)
+  }
+
+  const handleSave = async (e: React.FormEvent) => {
+    e.preventDefault()
+    if (!form.name.trim()) return
+    setSaving(true)
+    setError(null)
+    try {
+      const id = editingId ?? window.crypto.randomUUID()
+      await savePerson(id, { ...form, role: formRole }, !editingId)
+      setShowForm(false)
+      trackPlausibleEvent(PlausibleEvents.CREW_SAVED, { role: formRole, context: 'person_pool' })
+      await reload()
+    } catch (err: unknown) {
+      if (err instanceof Error && err.message === 'MAX_CREW') {
+        setError(t('crew.max_crew'))
+      } else {
+        setError(err instanceof Error ? err.message : 'Failed to save')
+      }
+    } finally {
+      setSaving(false)
+    }
+  }
+
+  const handleDelete = async (id: string) => {
+    if (
+      !(await showConfirm(
+        t('person_pool.delete_confirm'),
+        t('person_pool.title'),
+        t('logs.confirm_yes'),
+        t('logs.confirm_no')
+      ))
+    ) {
+      return
+    }
+    try {
+      await deletePerson(id)
+      await reload()
+    } catch (err: unknown) {
+      setError(err instanceof Error ? err.message : 'Failed to delete')
+    }
+  }
+
+  const skippers = filterSkippers(people)
+  const crewList = filterCrew(people)
+
+  if (loading) {
+    return (
+      <div className="tab-placeholder">
+        <Users className="header-logo spin" size={48} />
+        <p>{t('person_pool.loading')}</p>
+      </div>
+    )
+  }
+
+  const renderCard = (person: DecryptedPerson) => (
+    <div key={person.payloadId} className="crew-member-card glass">
+      <div className="crew-card-header">
+        <div style={{ display: 'flex', alignItems: 'center', gap: '12px' }}>
+          {person.data.photo ? (
+            <img src={person.data.photo} alt="" className="crew-card-avatar" />
+          ) : (
+            <div className="crew-card-avatar-placeholder">
+              <User size={18} />
+            </div>
+          )}
+          <h4>{person.data.name}</h4>
+        </div>
+        <div className="card-actions">
+          <button type="button" className="btn-icon" onClick={() => openEdit(person)} title="Edit">
+            <Edit2 size={14} />
+          </button>
+          <button
+            type="button"
+            className="btn-icon logout"
+            onClick={() => void handleDelete(person.payloadId)}
+            title="Delete"
+          >
+            <Trash2 size={14} />
+          </button>
+        </div>
+      </div>
+      {person.data.phone && (
+        <p className="help-text">
+          <strong>{t('crew.phone')}:</strong> {person.data.phone}
+        </p>
+      )}
+    </div>
+  )
+
+  return (
+    <section className="form-card" data-tour="profile-crew-pool">
+      <div className="form-header">
+        <Users size={24} className="form-icon" />
+        <h2>{t('person_pool.title')}</h2>
+      </div>
+      <p className="help-text mb-4">{t('person_pool.subtitle')}</p>
+      {error && <div className="auth-error mb-4">{error}</div>}
+
+      <div className="section-title-bar mb-4">
+        <h3>{t('person_pool.skippers_section')}</h3>
+        {!showForm && (
+          <button type="button" className="btn primary" style={{ width: 'auto', padding: '8px 16px' }} onClick={() => openAdd('skipper')}>
+            <Plus size={16} />
+            {t('person_pool.add_skipper')}
+          </button>
+        )}
+      </div>
+      {skippers.length === 0 ? (
+        <p className="help-text mb-4">{t('person_pool.no_skippers')}</p>
+      ) : (
+        <div className="crew-grid mb-6">{skippers.map(renderCard)}</div>
+      )}
+
+      <div className="section-title-bar mb-4">
+        <h3>{t('person_pool.crew_section')}</h3>
+        {!showForm && crewList.length < MAX_POOL_CREW_MEMBERS && (
+          <button type="button" className="btn primary" style={{ width: 'auto', padding: '8px 16px' }} onClick={() => openAdd('crew')}>
+            <Plus size={16} />
+            {t('person_pool.add_crew')}
+          </button>
+        )}
+      </div>
+      {crewList.length === 0 ? (
+        <p className="help-text">{t('person_pool.no_crew')}</p>
+      ) : (
+        <div className="crew-grid">{crewList.map(renderCard)}</div>
+      )}
+
+      {showForm && (
+        <form onSubmit={(e) => void handleSave(e)} className="member-editor-card glass mt-6">
+          <div className="editor-header mb-4">
+            <h3>
+              {editingId
+                ? formRole === 'skipper'
+                  ? t('person_pool.edit_skipper')
+                  : t('crew.edit_crew')
+                : formRole === 'skipper'
+                  ? t('person_pool.add_skipper')
+                  : t('crew.add_crew')}
+            </h3>
+            <button type="button" className="btn-icon" onClick={() => setShowForm(false)}>
+              <X size={16} />
+            </button>
+          </div>
+          <div className="form-grid">
+            <div className="vessel-photo-wrapper">
+              <div className="vessel-photo-preview" onClick={() => fileRef.current?.click()}>
+                {form.photo ? (
+                  <img src={form.photo} alt="" className="vessel-photo" />
+                ) : (
+                  <div className="vessel-photo-placeholder">
+                    <User size={48} />
+                  </div>
+                )}
+                <div className="vessel-photo-overlay">
+                  <Camera size={24} />
+                </div>
+              </div>
+              <input
+                ref={fileRef}
+                type="file"
+                accept="image/*"
+                style={{ display: 'none' }}
+                onChange={(e) => {
+                  const file = e.target.files?.[0]
+                  if (!file) return
+                  void resizeImageFile(file)
+                    .then((photo) => setForm((f) => ({ ...f, photo })))
+                    .catch((err: unknown) => {
+                      setPhotoError(err instanceof Error ? err.message : 'Image error')
+                    })
+                }}
+              />
+              {photoError && <div className="auth-error mt-2">{photoError}</div>}
+            </div>
+            <div className="input-group">
+              <label>{t('crew.name')} *</label>
+              <input
+                className="input-text"
+                value={form.name}
+                onChange={(e) => setForm((f) => ({ ...f, name: e.target.value }))}
+                required
+              />
+            </div>
+            <div className="input-group">
+              <label>{t('crew.address')}</label>
+              <input
+                className="input-text"
+                value={form.address}
+                onChange={(e) => setForm((f) => ({ ...f, address: e.target.value }))}
+              />
+            </div>
+            <div className="input-group">
+              <label>{t('crew.birthdate')}</label>
+              <input
+                type="date"
+                className="input-text"
+                value={form.birthDate}
+                onChange={(e) => setForm((f) => ({ ...f, birthDate: e.target.value }))}
+              />
+            </div>
+            <div className="input-group">
+              <label>{t('crew.phone')}</label>
+              <input
+                className="input-text"
+                value={form.phone}
+                onChange={(e) => setForm((f) => ({ ...f, phone: e.target.value }))}
+              />
+            </div>
+            <div className="input-group">
+              <label>{t('crew.nationality')}</label>
+              <input
+                className="input-text"
+                value={form.nationality}
+                onChange={(e) => setForm((f) => ({ ...f, nationality: e.target.value }))}
+              />
+            </div>
+            <div className="input-group">
+              <label>{t('crew.passport')}</label>
+              <input
+                className="input-text"
+                value={form.passportNumber}
+                onChange={(e) => setForm((f) => ({ ...f, passportNumber: e.target.value }))}
+              />
+            </div>
+          </div>
+          <div className="editor-actions mt-4">
+            <button type="submit" className="btn primary" disabled={saving || !form.name.trim()}>
+              <Save size={18} />
+              {t('crew.save_member')}
+            </button>
+          </div>
+        </form>
+      )}
+    </section>
+  )
+}
@@ -3,9 +3,9 @@ import { useTranslation } from 'react-i18next'
 import { db } from '../services/db.js'
 import { getActiveMasterKey } from '../services/auth.js'
 import { getLogbookKey } from '../services/logbookKeys.js'
-import { encryptJson, decryptJson } from '../services/crypto.js'
-import { syncLogbook } from '../services/sync.js'
-import { PlausibleEvents, trackPlausibleEvent } from '../services/analytics.js'
+import { decryptJson } from '../services/crypto.js'
+import { saveEntryPhoto, deleteEntryPhoto } from '../services/photoAttachments.js'
+import { fileToCompressedJpegDataUrl } from '../utils/imageCompress.js'
 import { useLiveQuery } from 'dexie-react-hooks'
 import { useDialog } from './ModalDialog.tsx'
 import { Camera, Trash2 } from 'lucide-react'
@@ -90,109 +90,30 @@ export default function PhotoCapture({ entryId, logbookId, readOnly = false, pre
    setUploading(true)
    setError(null)

-    const reader = new FileReader()
-    reader.onload = (event) => {
-      const img = new Image()
-      img.onload = async () => {
-        try {
-          const canvas = document.createElement('canvas')
-          const ctx = canvas.getContext('2d')
-          if (!ctx) throw new Error('Could not get canvas context')
-
-          let width = img.width
-          let height = img.height
-          const MAX_WIDTH = 1280
-          const MAX_HEIGHT = 720
-
-          // Calculate resizing conserving aspect ratio
-          if (width > MAX_WIDTH || height > MAX_HEIGHT) {
-            const ratio = Math.min(MAX_WIDTH / width, MAX_HEIGHT / height)
-            width = Math.round(width * ratio)
-            height = Math.round(height * ratio)
-          }
-
-          canvas.width = width
-          canvas.height = height
-          ctx.drawImage(img, 0, 0, width, height)
-
-          // Compress to JPEG, 70% quality
-          const compressedBase64 = canvas.toDataURL('image/jpeg', 0.7)
-
-          // Encrypt
-          const masterKey = await getLogbookKey(logbookId) || getActiveMasterKey()
-          if (!masterKey) throw new Error('Encryption key not found. Please log in.')
-
-          const photoId = window.crypto.randomUUID()
-          const photoPayload = {
-            image: compressedBase64,
-            caption: caption.trim()
-          }
-
-          const encrypted = await encryptJson(photoPayload, masterKey)
-          const now = new Date().toISOString()
-
-          // Store locally
-          await db.photos.put({
-            payloadId: photoId,
-            entryId,
-            logbookId,
-            encryptedData: encrypted.ciphertext,
-            iv: encrypted.iv,
-            tag: encrypted.tag,
-            caption: '', // stored encrypted inside payload
-            updatedAt: now
-          })
-
-          // Queue for background sync
-          await db.syncQueue.put({
-            action: 'create',
-            type: 'photo',
-            payloadId: photoId,
-            logbookId,
-            data: JSON.stringify({
-              encryptedData: encrypted.ciphertext,
-              iv: encrypted.iv,
-              tag: encrypted.tag,
-              entryId
-            }),
-            updatedAt: now
-          })
-
-          setCaption('')
-          if (fileInputRef.current) fileInputRef.current.value = ''
-          trackPlausibleEvent(PlausibleEvents.PHOTO_UPLOADED, { context: 'logbook' })
-
-          syncLogbook(logbookId).catch((err) => console.warn('Background sync failed:', err))
-        } catch (err: any) {
-          console.error('Failed to process image:', err)
-          setError(err.message || 'Failed to process image')
-        } finally {
-          setUploading(false)
-        }
-      }
-      img.src = event.target?.result as string
+    try {
+      const compressedBase64 = await fileToCompressedJpegDataUrl(file)
+      await saveEntryPhoto({
+        logbookId,
+        entryId,
+        imageDataUrl: compressedBase64,
+        caption: caption.trim(),
+        analyticsContext: 'logbook'
+      })
+      setCaption('')
+      if (fileInputRef.current) fileInputRef.current.value = ''
+    } catch (err: unknown) {
+      console.error('Failed to process image:', err)
+      setError(err instanceof Error ? err.message : 'Failed to process image')
+    } finally {
+      setUploading(false)
    }
-    reader.readAsDataURL(file)
  }

  const handleDelete = async (photoId: string) => {
    if (await showConfirm(t('logs.photo_delete_confirm'), t('logs.photos_title'), t('logs.confirm_yes'), t('logs.confirm_no'))) {
      try {
-        const now = new Date().toISOString()
-        
-        await db.photos.delete(photoId)
-        
-        await db.syncQueue.put({
-          action: 'delete',
-          type: 'photo',
-          payloadId: photoId,
-          logbookId,
-          data: '',
-          updatedAt: now
-        })
-
-        syncLogbook(logbookId).catch((err) => console.warn('Background sync failed:', err))
-      } catch (err: any) {
+        await deleteEntryPhoto(logbookId, photoId)
+      } catch (err: unknown) {
        console.error('Failed to delete photo:', err)
      }
    }
@@ -0,0 +1,36 @@
+import { ChevronDown } from 'lucide-react'
+import type { ReactNode } from 'react'
+
+interface ProfileAccordionSectionProps {
+  id: string
+  title: string
+  icon?: ReactNode
+  defaultOpen?: boolean
+  /** When set, forces the section open (e.g. during onboarding tour). */
+  forceOpen?: boolean
+  children: ReactNode
+}
+
+export default function ProfileAccordionSection({
+  id,
+  title,
+  icon,
+  defaultOpen = false,
+  forceOpen,
+  children
+}: ProfileAccordionSectionProps) {
+  const isOpen = forceOpen !== undefined ? forceOpen : defaultOpen
+
+  return (
+    <details className="profile-accordion" open={isOpen || undefined} data-section={id}>
+      <summary className="profile-accordion__summary">
+        <span className="profile-accordion__title">
+          {icon}
+          <span>{title}</span>
+        </span>
+        <ChevronDown size={20} className="profile-accordion__chevron" aria-hidden="true" />
+      </summary>
+      <div className="profile-accordion__body">{children}</div>
+    </details>
+  )
+}
@@ -0,0 +1,25 @@
+import { useTranslation } from 'react-i18next'
+import { User } from 'lucide-react'
+
+interface ProfileHeaderButtonProps {
+  onClick: () => void
+}
+
+export default function ProfileHeaderButton({ onClick }: ProfileHeaderButtonProps) {
+  const { t } = useTranslation()
+  const username = localStorage.getItem('active_username') || 'Skipper'
+
+  return (
+    <button
+      type="button"
+      className="btn-icon skipper-badge"
+      onClick={onClick}
+      title={t('dashboard.open_profile', { name: username })}
+      aria-label={t('dashboard.open_profile', { name: username })}
+      data-tour="nav-profile"
+    >
+      <User size={18} aria-hidden="true" />
+      <span className="skipper-badge__name">{username}</span>
+    </button>
+  )
+}
@@ -6,7 +6,8 @@ import {
  enableCollaboratorChangePush,
  fetchPushPrefs,
  getNotificationPermission,
-  isPushSupported
+  isPushSupported,
+  preloadPushService
 } from '../services/pushNotifications.js'
 import { isIosDevice, isRunningStandalone } from '../hooks/usePwaInstall.js'
 import { PlausibleEvents, trackPlausibleEvent } from '../services/analytics.js'
@@ -28,6 +29,7 @@ export default function PushNotificationSettings() {
      setLoading(false)
      return
    }
+    void preloadPushService()
    try {
      const prefs = await fetchPushPrefs()
      setEnabled(prefs.collaboratorChangesEnabled)
@@ -56,7 +58,8 @@ export default function PushNotificationSettings() {
        trackPlausibleEvent(PlausibleEvents.PUSH_DISABLED)
      }
    } catch (err: unknown) {
-      const message = err instanceof Error ? err.message : t('profile.push_error')
+      console.error('Failed to toggle push notifications:', err)
+      const message = err instanceof Error ? `${err.name}: ${err.message}` : String(err)
      showAlert(message)
      void loadPrefs()
    } finally {
@@ -1,9 +1,16 @@
 import { useState, useEffect } from 'react'
 import { useTranslation } from 'react-i18next'
+import { cycleAppLanguage, getNextLanguage, isGermanLocale } from '../utils/i18nLanguages.js'
 import { decryptJson } from '../services/crypto.js'
 import { PlausibleEvents, trackPlausibleEvent } from '../services/analytics.js'
-import VesselForm from './VesselForm.tsx'
-import CrewForm from './CrewForm.tsx'
+import LogbookVesselPicker from './LogbookVesselPicker.tsx'
+import LogbookCrewPicker from './LogbookCrewPicker.tsx'
+import type { LogbookVesselSelectionData } from '../types/vessel.js'
+import { emptyLogbookVesselSelection } from '../types/vessel.js'
+import type { LogbookCrewSelectionData } from '../types/person.js'
+import { emptyLogbookCrewSelection } from '../types/person.js'
+import { legacyCrewRecordsToLogbookSelection } from '../utils/personSnapshots.js'
+import type { PersonData } from '../types/person.js'
 import LogEntriesList from './LogEntriesList.tsx'
 import { Ship, Users, FileText, Lock, AlertCircle, Globe } from 'lucide-react'

@@ -30,7 +37,13 @@ export default function ReadOnlyViewer({ token, hexKey }: ReadOnlyViewerProps) {
  // Logbook data states
  const [logbookTitle, setLogbookTitle] = useState('Logbook')
  const [yacht, setYacht] = useState<any>(null)
-  const [crews, setCrews] = useState<any[]>([])
+  const [logbookCrewSelection, setLogbookCrewSelection] = useState<LogbookCrewSelectionData>(
+    emptyLogbookCrewSelection()
+  )
+  const [logbookVesselSelection, setLogbookVesselSelection] = useState<LogbookVesselSelectionData>(
+    emptyLogbookVesselSelection()
+  )
+  const [legacyCrews, setLegacyCrews] = useState<any[]>([])
  const [entries, setEntries] = useState<any[]>([])
  const [photos, setPhotos] = useState<any[]>([])
  const [gpsTracks, setGpsTracks] = useState<any[]>([])
@@ -48,9 +61,9 @@ export default function ReadOnlyViewer({ token, hexKey }: ReadOnlyViewerProps) {
      const res = await fetch(`/api/collaboration/share-pull?token=${token}`)
      if (!res.ok) {
        if (res.status === 410) {
-          throw new Error(i18n.language.startsWith('de') ? 'Dieser Freigabelink ist abgelaufen.' : 'This share link has expired.')
+          throw new Error(isGermanLocale(i18n.language) ? 'Dieser Freigabelink ist abgelaufen.' : 'This share link has expired.')
        }
-        throw new Error(i18n.language.startsWith('de') ? 'Fehler beim Laden des freigegebenen Logbuchs.' : 'Failed to fetch shared logbook data.')
+        throw new Error(isGermanLocale(i18n.language) ? 'Fehler beim Laden des freigegebenen Logbuchs.' : 'Failed to fetch shared logbook data.')
      }

      const data = await res.json()
@@ -70,18 +83,67 @@ export default function ReadOnlyViewer({ token, hexKey }: ReadOnlyViewerProps) {
      }
      setYacht(decYacht)

-      // Decrypt Crews
-      const decCrews = []
-      if (data.crews) {
-        for (const c of data.crews) {
-          const dec = await decryptJson(c.encryptedData, c.iv, c.tag, keyBuffer)
-          decCrews.push({
-            payloadId: c.payloadId,
-            data: dec
+      if (data.logbookCrewSelection) {
+        const decSel = await decryptJson(
+          data.logbookCrewSelection.encryptedData,
+          data.logbookCrewSelection.iv,
+          data.logbookCrewSelection.tag,
+          keyBuffer
+        )
+        if (decSel) {
+          setLogbookCrewSelection({
+            activeSkipperId: decSel.activeSkipperId ?? null,
+            activeCrewIds: Array.isArray(decSel.activeCrewIds) ? decSel.activeCrewIds : [],
+            snapshotsById:
+              decSel.snapshotsById && typeof decSel.snapshotsById === 'object'
+                ? decSel.snapshotsById
+                : {}
          })
        }
      }
-      setCrews(decCrews)
+
+      if (data.logbookVesselSelection) {
+        const decVessel = await decryptJson(
+          data.logbookVesselSelection.encryptedData,
+          data.logbookVesselSelection.iv,
+          data.logbookVesselSelection.tag,
+          keyBuffer
+        )
+        if (decVessel) {
+          setLogbookVesselSelection({
+            activeVesselId: decVessel.activeVesselId ?? null,
+            vesselSnapshot: decVessel.vesselSnapshot ?? null
+          })
+        }
+      } else if (decYacht) {
+        const legacy = decYacht as Record<string, unknown>
+        setLogbookVesselSelection({
+          activeVesselId: 'legacy-yacht',
+          vesselSnapshot: {
+            id: 'legacy-yacht',
+            name: typeof legacy.name === 'string' ? legacy.name : '',
+            ...legacy
+          } as import('../types/vessel.js').VesselSnapshot
+        })
+      }
+
+      const decCrews: Array<{ payloadId: string; data: PersonData }> = []
+      if (data.crews) {
+        for (const c of data.crews) {
+          const dec = await decryptJson(c.encryptedData, c.iv, c.tag, keyBuffer)
+          if (dec) {
+            decCrews.push({
+              payloadId: c.payloadId,
+              data: dec as PersonData
+            })
+          }
+        }
+      }
+      setLegacyCrews(decCrews)
+
+      if (!data.logbookCrewSelection && decCrews.length > 0) {
+        setLogbookCrewSelection(legacyCrewRecordsToLogbookSelection(decCrews))
+      }

      // Decrypt Entries
      const decEntries = []
@@ -136,15 +198,14 @@ export default function ReadOnlyViewer({ token, hexKey }: ReadOnlyViewerProps) {
  }

  const toggleLanguage = () => {
-    const nextLang = i18n.language.startsWith('de') ? 'en' : 'de'
-    i18n.changeLanguage(nextLang)
+    cycleAppLanguage(i18n)
  }

  if (loading) {
    return (
      <div className="tab-placeholder" style={{ height: '100vh', display: 'flex', flexDirection: 'column', justifyContent: 'center', alignItems: 'center' }}>
        <Ship className="header-logo spin" size={48} />
-        <p>{i18n.language.startsWith('de') ? 'Lade freigegebenes Logbuch...' : 'Loading shared logbook...'}</p>
+        <p>{isGermanLocale(i18n.language) ? 'Lade freigegebenes Logbuch...' : 'Loading shared logbook...'}</p>
      </div>
    )
  }
@@ -153,10 +214,10 @@ export default function ReadOnlyViewer({ token, hexKey }: ReadOnlyViewerProps) {
    return (
      <div style={{ height: '100vh', display: 'flex', flexDirection: 'column', justifyContent: 'center', alignItems: 'center', padding: '20px', textAlign: 'center' }}>
        <AlertCircle size={48} style={{ color: '#ef4444', marginBottom: '16px' }} />
-        <h2 style={{ color: '#f1f5f9', marginBottom: '8px' }}>{i18n.language.startsWith('de') ? 'Verbindungsfehler' : 'Access Error'}</h2>
+        <h2 style={{ color: '#f1f5f9', marginBottom: '8px' }}>{isGermanLocale(i18n.language) ? 'Verbindungsfehler' : 'Access Error'}</h2>
        <p style={{ color: '#94a3b8', maxWidth: '400px', marginBottom: '24px' }}>{error}</p>
        <button className="btn primary" onClick={loadData} style={{ width: 'auto' }}>
-          {i18n.language.startsWith('de') ? 'Erneut versuchen' : 'Retry'}
+          {isGermanLocale(i18n.language) ? 'Erneut versuchen' : 'Retry'}
        </button>
      </div>
    )
@@ -173,7 +234,7 @@ export default function ReadOnlyViewer({ token, hexKey }: ReadOnlyViewerProps) {
            <h2>{logbookTitle}</h2>
            <p className="app-subtitle" style={{ color: '#10b981', display: 'flex', alignItems: 'center', gap: '4px' }}>
              <Lock size={12} />
-              <span>{i18n.language.startsWith('de') ? 'Schreibgeschützte Ansicht (Ende-zu-Ende verschlüsselt)' : 'Read-Only View (End-to-End Encrypted)'}</span>
+              <span>{isGermanLocale(i18n.language) ? 'Schreibgeschützte Ansicht (Ende-zu-Ende verschlüsselt)' : 'Read-Only View (End-to-End Encrypted)'}</span>
            </p>
          </div>
        </div>
@@ -181,7 +242,7 @@ export default function ReadOnlyViewer({ token, hexKey }: ReadOnlyViewerProps) {
        <div className="header-actions">
          <button className="btn secondary" onClick={toggleLanguage} style={{ width: 'auto', padding: '6px 12px', fontSize: '13px' }}>
            <Globe size={14} style={{ marginRight: '4px' }} />
-            {i18n.language.startsWith('de') ? 'English' : 'Deutsch'}
+            {t(`languages.${getNextLanguage(i18n.language)}`)}
          </button>
        </div>
      </header>
@@ -226,18 +287,21 @@ export default function ReadOnlyViewer({ token, hexKey }: ReadOnlyViewerProps) {
          )}

          {activeTab === 'vessel' && (
-            <VesselForm
+            <LogbookVesselPicker
              logbookId="shared"
              readOnly={true}
-              preloadedData={yacht}
+              selectionOnly={true}
+              preloadedSelection={logbookVesselSelection}
            />
          )}

          {activeTab === 'crew' && (
-            <CrewForm
+            <LogbookCrewPicker
              logbookId="shared"
              readOnly={true}
-              preloadedData={crews}
+              selectionOnly={true}
+              preloadedPool={legacyCrews.length > 0 ? legacyCrews : undefined}
+              preloadedSelection={logbookCrewSelection}
            />
          )}
        </main>
@@ -28,19 +28,19 @@ export default function RegistrationDisclaimer({
      className={`auth-card glass registration-disclaimer${variant === 'view' ? ' registration-disclaimer--modal' : ''}`}
      role="document"
    >
+      {variant === 'view' && (
+        <button
+          type="button"
+          className="registration-disclaimer__close"
+          onClick={onDismiss}
+          aria-label={t('disclaimer.close')}
+        >
+          <X size={18} />
+        </button>
+      )}
      <div className="auth-header">
        <ScrollText className="auth-icon accent" size={48} />
        <h2>{t('disclaimer.title')}</h2>
-        {variant === 'view' && (
-          <button
-            type="button"
-            className="registration-disclaimer__close"
-            onClick={onDismiss}
-            aria-label={t('disclaimer.close')}
-          >
-            <X size={18} />
-          </button>
-        )}
      </div>

      <p className="registration-disclaimer__intro">{t('disclaimer.intro')}</p>
@@ -3,9 +3,17 @@ import { useTranslation } from 'react-i18next'
 import { Settings as SettingsIcon, Check, Users, Trash2, Copy, Link as LinkIcon } from 'lucide-react'
 import { ensureLogbookKey } from '../services/logbookKeys.js'
 import LogbookBackupPanel from './LogbookBackupPanel.tsx'
+import LinkQrCode from './LinkQrCode.tsx'
 import { useDialog } from './ModalDialog.tsx'
 import { PlausibleEvents, trackPlausibleEvent } from '../services/analytics.js'
 import { apiFetch } from '../services/api.js'
+import {
+  enableCollaboratorChangePush,
+  isCollaboratorPushActive,
+  isPushSupported,
+  preloadPushService
+} from '../services/pushNotifications.js'
+import { isIosDevice, isRunningStandalone } from '../hooks/usePwaInstall.js'

 interface SettingsFormProps {
  logbookId?: string | null
@@ -48,6 +56,7 @@ export default function SettingsForm({ logbookId, onLogbookRestored }: SettingsF
      loadCollaborators()
      loadShareLink()
    }
+    void preloadPushService()
  }, [logbookId])

  const loadShareLink = async () => {
@@ -151,6 +160,44 @@ export default function SettingsForm({ logbookId, onLogbookRestored }: SettingsF
    }
  }

+  const promptPushAfterInviteCreated = async () => {
+    if (!isPushSupported()) return
+    if (await isCollaboratorPushActive()) return
+
+    const iosNeedsInstall = isIosDevice() && !isRunningStandalone()
+
+    if (iosNeedsInstall) {
+      await showAlert(
+        t('settings.invite_push_prompt_ios_message'),
+        t('settings.invite_push_prompt_title'),
+        t('settings.invite_push_prompt_later')
+      )
+      return
+    }
+
+    const enable = await showConfirm(
+      t('settings.invite_push_prompt_message'),
+      t('settings.invite_push_prompt_title'),
+      t('settings.invite_push_prompt_enable'),
+      t('settings.invite_push_prompt_later')
+    )
+
+    if (!enable) return
+
+    try {
+      await enableCollaboratorChangePush()
+      await showAlert(
+        t('settings.invite_push_prompt_success'),
+        t('settings.invite_push_prompt_title')
+      )
+      trackPlausibleEvent(PlausibleEvents.PUSH_ENABLED)
+    } catch (err: unknown) {
+      console.error('Failed to enable push after invite:', err)
+      const message = err instanceof Error ? `${err.name}: ${err.message}` : String(err)
+      await showAlert(message)
+    }
+  }
+
  const handleGenerateInvite = async () => {
    if (!logbookId) return
    setGeneratingInvite(true)
@@ -175,6 +222,7 @@ export default function SettingsForm({ logbookId, onLogbookRestored }: SettingsF

      setInviteLink(link)
      trackPlausibleEvent(PlausibleEvents.INVITE_GENERATED)
+      await promptPushAfterInviteCreated()
    } catch (err: unknown) {
      console.error('Failed to generate invite:', err)
      showAlert(err instanceof Error ? err.message : 'Failed to generate invite link.')
@@ -270,23 +318,27 @@ export default function SettingsForm({ logbookId, onLogbookRestored }: SettingsF
          </div>

          {shareEnabled && shareLink && (
-            <div className="input-group mb-4 copy-link-row">
-              <input
-                type="text"
-                readOnly
-                value={shareLink}
-                className="input-text font-mono text-xs"
-                style={{ flex: 1, padding: '10px' }}
-                onClick={(e) => (e.target as HTMLInputElement).select()}
-              />
-              <button
-                type="button"
-                className="btn secondary"
-                onClick={handleCopyShareLink}
-                style={{ width: 'auto', padding: '10px' }}
-              >
-                {shareCopied ? <Check size={16} /> : <Copy size={16} />}
-              </button>
+            <div className="link-with-qr mb-4">
+              <div className="input-group copy-link-row">
+                <input
+                  type="text"
+                  readOnly
+                  value={shareLink}
+                  className="input-text font-mono text-xs"
+                  style={{ flex: 1, padding: '10px' }}
+                  onClick={(e) => (e.target as HTMLInputElement).select()}
+                />
+                <button
+                  type="button"
+                  className="btn secondary"
+                  onClick={handleCopyShareLink}
+                  style={{ width: 'auto', padding: '10px' }}
+                  title={t('settings.share_copy_btn')}
+                >
+                  {shareCopied ? <Check size={16} /> : <Copy size={16} />}
+                </button>
+              </div>
+              <LinkQrCode value={shareLink} />
            </div>
          )}
        </div>
@@ -323,23 +375,27 @@ export default function SettingsForm({ logbookId, onLogbookRestored }: SettingsF
          </div>

          {inviteLink && (
-            <div className="input-group mb-6 copy-link-row">
-              <input
-                type="text"
-                readOnly
-                value={inviteLink}
-                className="input-text font-mono text-xs"
-                style={{ flex: 1, padding: '10px' }}
-                onClick={(e) => (e.target as HTMLInputElement).select()}
-              />
-              <button
-                type="button"
-                className="btn secondary"
-                onClick={handleCopyInvite}
-                style={{ width: 'auto', padding: '10px' }}
-              >
-                {inviteCopied ? <Check size={16} /> : <Copy size={16} />}
-              </button>
+            <div className="link-with-qr mb-6">
+              <div className="input-group copy-link-row">
+                <input
+                  type="text"
+                  readOnly
+                  value={inviteLink}
+                  className="input-text font-mono text-xs"
+                  style={{ flex: 1, padding: '10px' }}
+                  onClick={(e) => (e.target as HTMLInputElement).select()}
+                />
+                <button
+                  type="button"
+                  className="btn secondary"
+                  onClick={handleCopyInvite}
+                  style={{ width: 'auto', padding: '10px' }}
+                  title={t('settings.share_copy_btn')}
+                >
+                  {inviteCopied ? <Check size={16} /> : <Copy size={16} />}
+                </button>
+              </div>
+              <LinkQrCode value={inviteLink} />
            </div>
          )}

@@ -14,6 +14,11 @@ import {
 } from '../services/statsAggregation.js'
 import { compareTravelDaysChronological } from '../utils/logEntryTankLevels.js'
 import { formatFuelPerMotorHour } from '../utils/fuelStats.js'
+import {
+  loadLogbookEventSeries,
+  type EventSeriesPoint,
+  type EventSeriesSummary
+} from '../services/eventSeriesAggregation.js'

 interface StatsDashboardProps {
  logbookId: string
@@ -217,7 +222,62 @@ function PropulsionBreakdown({ totals }: { totals: StatsTotals }) {
  )
 }

-function LogbookScopeView({ summary }: { summary: LogbookStatsSummary }) {
+function EventSeriesList({ title, points, emptyLabel }: { title: string; points: EventSeriesPoint[]; emptyLabel: string }) {
+  if (points.length === 0) {
+    return (
+      <div className="stats-event-series-block">
+        <h4 className="stats-section-subtitle">{title}</h4>
+        <p className="stats-section-sub">{emptyLabel}</p>
+      </div>
+    )
+  }
+
+  return (
+    <div className="stats-event-series-block">
+      <h4 className="stats-section-subtitle">{title}</h4>
+      <ul className="stats-event-series-list">
+        {points.map((point, idx) => (
+          <li key={`${point.entryId}-${point.time}-${idx}`} className="stats-event-series-item">
+            <span className="stats-event-series-when">
+              {new Date(point.date).toLocaleDateString(undefined, { day: '2-digit', month: '2-digit' })}
+              {' · '}
+              {point.time}
+            </span>
+            <span className="stats-event-series-value">{point.summary}</span>
+          </li>
+        ))}
+      </ul>
+    </div>
+  )
+}
+
+function EventSeriesPanel({ series }: { series: EventSeriesSummary }) {
+  const { t } = useTranslation()
+  const motorPoints = series.motor.map((point) => ({
+    ...point,
+    summary: point.summary === 'start'
+      ? t('logs.live_motor_start')
+      : t('logs.live_motor_stop')
+  }))
+
+  return (
+    <div className="member-editor-card glass mt-6">
+      <h3 className="stats-section-title">{t('stats.event_series_title')}</h3>
+      <p className="stats-section-sub">{t('stats.event_series_hint')}</p>
+      <EventSeriesList title={t('stats.event_series_pressure')} points={series.pressure} emptyLabel={t('stats.event_series_empty')} />
+      <EventSeriesList title={t('stats.event_series_wind')} points={series.wind} emptyLabel={t('stats.event_series_empty')} />
+      <EventSeriesList title={t('stats.event_series_motor')} points={motorPoints} emptyLabel={t('stats.event_series_empty')} />
+    </div>
+  )
+}
+
+function LogbookScopeView({
+  summary,
+  eventSeries
+}: {
+  summary: LogbookStatsSummary
+  eventSeries: EventSeriesSummary | null
+}) {
  const { t } = useTranslation()
  const { travelDays, routePorts, trackSegments, totals } = summary

@@ -313,6 +373,8 @@ function LogbookScopeView({ summary }: { summary: LogbookStatsSummary }) {
        <h3 className="stats-section-title">{t('stats.propulsion_title')}</h3>
        <PropulsionBreakdown totals={totals} />
      </div>
+
+      {eventSeries && <EventSeriesPanel series={eventSeries} />}
    </>
  )
 }
@@ -323,18 +385,21 @@ export default function StatsDashboard({ logbookId, logbookTitle }: StatsDashboa
  const [loading, setLoading] = useState(true)
  const [error, setError] = useState<string | null>(null)
  const [logbookStats, setLogbookStats] = useState<LogbookStatsSummary | null>(null)
+  const [eventSeries, setEventSeries] = useState<EventSeriesSummary | null>(null)
  const [accountStats, setAccountStats] = useState<Awaited<ReturnType<typeof loadAccountStats>> | null>(null)

  const loadData = useCallback(async () => {
    setLoading(true)
    setError(null)
    try {
-      const [lb, acc] = await Promise.all([
+      const [lb, acc, series] = await Promise.all([
        loadLogbookStats(logbookId, logbookTitle, true),
-        loadAccountStats(false)
+        loadAccountStats(false),
+        loadLogbookEventSeries(logbookId)
      ])
      setLogbookStats(lb)
      setAccountStats(acc)
+      setEventSeries(series)
    } catch (err: unknown) {
      console.error('Failed to load statistics:', err)
      setError(err instanceof Error ? err.message : 'Failed to load statistics.')
@@ -397,7 +462,7 @@ export default function StatsDashboard({ logbookId, logbookTitle }: StatsDashboa
          <p>{t('stats.loading')}</p>
        </div>
      ) : scope === 'logbook' && logbookStats ? (
-        <LogbookScopeView summary={logbookStats} />
+        <LogbookScopeView summary={logbookStats} eventSeries={eventSeries} />
      ) : scope === 'account' && accountStats ? (
        <>
          <TotalsGrid totals={accountStats.totals} />
@@ -0,0 +1,64 @@
+import { useEffect, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { AlertTriangle } from 'lucide-react'
+import {
+  getSyncConflicts,
+  subscribeSyncConflicts,
+  type SyncConflict
+} from '../services/syncConflicts.js'
+import {
+  resolveSyncConflictKeepLocal,
+  resolveSyncConflictUseServer
+} from '../services/sync.js'
+
+interface SyncConflictBannerProps {
+  logbookId: string | null
+}
+
+export default function SyncConflictBanner({ logbookId }: SyncConflictBannerProps) {
+  const { t } = useTranslation()
+  const [items, setItems] = useState<SyncConflict[]>([])
+
+  useEffect(() => {
+    const refresh = () => {
+      setItems(logbookId ? getSyncConflicts(logbookId) : getSyncConflicts())
+    }
+    refresh()
+    return subscribeSyncConflicts(refresh)
+  }, [logbookId])
+
+  if (items.length === 0) return null
+
+  const first = items[0]
+
+  return (
+    <div className="sync-conflict-banner" role="alert">
+      <AlertTriangle size={20} aria-hidden />
+      <div className="sync-conflict-banner__body">
+        <strong>{t('sync.conflict_title')}</strong>
+        <p>
+          {t('sync.conflict_message', {
+            count: items.length,
+            id: first.payloadId.slice(0, 8)
+          })}
+        </p>
+        <div className="sync-conflict-banner__actions">
+          <button
+            type="button"
+            className="btn secondary"
+            onClick={() => void resolveSyncConflictUseServer(first)}
+          >
+            {t('sync.conflict_use_server')}
+          </button>
+          <button
+            type="button"
+            className="btn primary"
+            onClick={() => void resolveSyncConflictKeepLocal(first)}
+          >
+            {t('sync.conflict_keep_local')}
+          </button>
+        </div>
+      </div>
+    </div>
+  )
+}
@@ -0,0 +1,103 @@
+import React, { useCallback } from 'react'
+import { useTranslation } from 'react-i18next'
+import { clampTankLiters } from '../utils/tankCapacity.js'
+
+interface TankLiterInputProps {
+  id?: string
+  label: string
+  value: string
+  onChange: (value: string) => void
+  maxLiters?: number
+  disabled?: boolean
+  titleTooltip?: string
+}
+
+function parseInputLiters(value: string): number {
+  const trimmed = value.trim().replace(',', '.')
+  if (!trimmed) return 0
+  const parsed = Number(trimmed)
+  return Number.isFinite(parsed) ? parsed : 0
+}
+
+export default function TankLiterInput({
+  id,
+  label,
+  value,
+  onChange,
+  maxLiters,
+  disabled = false,
+  titleTooltip
+}: TankLiterInputProps) {
+  const { t } = useTranslation()
+  const useSlider = maxLiters != null && maxLiters > 0
+
+  const emitValue = useCallback(
+    (liters: number) => {
+      const clamped = clampTankLiters(liters, useSlider ? maxLiters : undefined)
+      const str =
+        Number.isInteger(clamped) ? String(clamped) : String(Number(clamped.toFixed(1)))
+      onChange(str)
+    },
+    [onChange, maxLiters, useSlider]
+  )
+
+  const handleNumberChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    onChange(e.target.value)
+  }
+
+  const handleNumberBlur = () => {
+    if (!useSlider) return
+    emitValue(parseInputLiters(value))
+  }
+
+  const handleSliderChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    emitValue(Number(e.target.value))
+  }
+
+  const numericValue = parseInputLiters(value)
+  const sliderValue = useSlider ? clampTankLiters(numericValue, maxLiters) : 0
+
+  return (
+    <div className="input-group tank-liter-input">
+      <label htmlFor={id} title={titleTooltip}>{label}</label>
+      {useSlider && (
+        <>
+          <input
+            type="range"
+            className="tank-liter-slider"
+            min={0}
+            max={maxLiters}
+            step={1}
+            value={sliderValue}
+            onChange={handleSliderChange}
+            disabled={disabled}
+            title={titleTooltip}
+            aria-valuemin={0}
+            aria-valuemax={maxLiters}
+            aria-valuenow={sliderValue}
+            aria-label={label}
+          />
+          <div className="tank-liter-slider-hint" aria-hidden="true">
+            {t('logs.tank_slider_of_max', {
+              current: sliderValue,
+              max: maxLiters
+            })}
+          </div>
+        </>
+      )}
+      <input
+        id={id}
+        type="number"
+        className="input-text"
+        value={value}
+        onChange={handleNumberChange}
+        onBlur={handleNumberBlur}
+        disabled={disabled}
+        min={0}
+        max={useSlider ? maxLiters : undefined}
+        step="any"
+        title={titleTooltip}
+      />
+    </div>
+  )
+}
@@ -15,6 +15,7 @@ import {
  Anchor,
  Gauge,
  Sailboat,
+  Ship,
  Timer,
  Share2,
  Calendar,
@@ -30,6 +31,10 @@ import {
 } from 'lucide-react'
 import AccountDangerZone from './AccountDangerZone.tsx'
 import UserProfilePreferences from './UserProfilePreferences.tsx'
+import PersonPoolForm from './PersonPoolForm.tsx'
+import VesselPoolForm from './VesselPoolForm.tsx'
+import ProfileAccordionSection from './ProfileAccordionSection.tsx'
+import { useAppTour } from '../context/AppTourContext.tsx'
 import BetaBadge from './BetaBadge.tsx'
 import { useDialog } from './ModalDialog.tsx'
 import {
@@ -136,6 +141,11 @@ export default function UserProfilePage({ onBack, onLogout }: UserProfilePagePro
    connStatusClassName
  } = useSyncIndicator()

+  const { isActive: tourActive, currentStepId: tourStepId } = useAppTour()
+  const fleetSectionTourOpen =
+    tourActive &&
+    (tourStepId === 'profile_vessel_pool' || tourStepId === 'profile_crew_pool')
+
  const sharedLogbookCount = useLiveQuery(
    () => db.logbooks.filter((lb) => lb.isShared === 1).count(),
    []
@@ -443,8 +453,14 @@ export default function UserProfilePage({ onBack, onLogout }: UserProfilePagePro
          </section>
        ) : profile ? (
          <>
+            <ProfileAccordionSection
+              id="account"
+              title={t('profile.sections.account')}
+              icon={<User size={20} aria-hidden="true" />}
+              defaultOpen
+            >
            <div data-tour="profile-preferences">
-            <section className="form-card">
+            <section className="form-card profile-accordion-inner-card">
              <div className="form-header">
                <User size={24} className="form-icon" />
                <h2>{t('profile.identity_title')}</h2>
@@ -486,8 +502,25 @@ export default function UserProfilePage({ onBack, onLogout }: UserProfilePagePro

            <UserProfilePreferences userId={profile.userId} />
            </div>
+            </ProfileAccordionSection>

-            <section className="member-editor-card glass">
+            <ProfileAccordionSection
+              id="fleet"
+              title={t('profile.sections.fleet')}
+              icon={<Ship size={20} aria-hidden="true" />}
+              defaultOpen
+              forceOpen={fleetSectionTourOpen ? true : undefined}
+            >
+            <VesselPoolForm />
+            <PersonPoolForm />
+            </ProfileAccordionSection>
+
+            <ProfileAccordionSection
+              id="security"
+              title={t('profile.sections.security')}
+              icon={<Shield size={20} aria-hidden="true" />}
+            >
+            <section className="member-editor-card glass profile-accordion-inner-card">
              <div className="profile-section-header">
                <Shield size={20} />
                <h3>{t('profile.security_title')}</h3>
@@ -726,7 +759,14 @@ export default function UserProfilePage({ onBack, onLogout }: UserProfilePagePro
              </div>
            </section>

-            <section className="form-card">
+            </ProfileAccordionSection>
+
+            <ProfileAccordionSection
+              id="stats"
+              title={t('profile.sections.stats')}
+              icon={<BarChart2 size={20} aria-hidden="true" />}
+            >
+            <section className="form-card profile-stats-section profile-accordion-inner-card">
              <div className="form-header">
                <BarChart2 size={24} className="form-icon" />
                <div>
@@ -736,7 +776,7 @@ export default function UserProfilePage({ onBack, onLogout }: UserProfilePagePro
              </div>

              {(statsTotals || profile) && (
-                <div className="stats-kpi-grid">
+                <div className="stats-kpi-grid profile-stats-kpi-grid">
                  <KpiCard
                    icon={<BookOpen size={20} />}
                    label={t('profile.stats_logbooks')}
@@ -788,8 +828,14 @@ export default function UserProfilePage({ onBack, onLogout }: UserProfilePagePro
                </div>
              )}
            </section>
+            </ProfileAccordionSection>

-            <AccountDangerZone className="mt-6" />
+            <ProfileAccordionSection
+              id="danger"
+              title={t('profile.sections.danger')}
+            >
+            <AccountDangerZone className="profile-accordion-inner-card" />
+            </ProfileAccordionSection>
          </>
        ) : null}
      </main>
@@ -5,6 +5,7 @@ import ThemedSelect from './ThemedSelect.tsx'
 import PushNotificationSettings from './PushNotificationSettings.tsx'
 import PwaInstallPrompt from './PwaInstallPrompt.tsx'
 import { notifyAppearanceChanged } from '../services/appearance.js'
+import { saveAppearancePrefsToServer } from '../services/appearancePrefs.js'
 import { useAppTour } from '../context/AppTourContext.tsx'
 import {
  getColorSchemePreference,
@@ -32,6 +33,9 @@ export default function UserProfilePreferences({ userId }: UserProfilePreference
    setThemePreference(userId, nextTheme)
    setColorSchemePreference(userId, nextColorScheme)
    notifyAppearanceChanged()
+    void saveAppearancePrefsToServer(nextTheme, nextColorScheme).catch((err) => {
+      console.warn('Failed to save appearance prefs to server:', err)
+    })
  }

  const handleThemeChange = (nextTheme: string) => {
@@ -0,0 +1,328 @@
+import React from 'react'
+import { useTranslation } from 'react-i18next'
+import { Ship, Camera, Trash2, Plus, X } from 'lucide-react'
+import type { VesselFormInputs } from '../utils/vesselFormUtils.js'
+
+export interface VesselDataFieldsProps {
+  inputs: VesselFormInputs
+  onChange: (next: VesselFormInputs) => void
+  readOnly?: boolean
+  saving?: boolean
+  newSailName: string
+  onNewSailNameChange: (value: string) => void
+  onAddSail: () => void
+  onRemoveSail: (index: number) => void
+  photoError?: string | null
+  onPhotoChange: (e: React.ChangeEvent<HTMLInputElement>) => void
+  onRemovePhoto: () => void
+  fileInputRef: React.RefObject<HTMLInputElement | null>
+}
+
+export default function VesselDataFields({
+  inputs,
+  onChange,
+  readOnly = false,
+  saving = false,
+  newSailName,
+  onNewSailNameChange,
+  onAddSail,
+  onRemoveSail,
+  photoError,
+  onPhotoChange,
+  onRemovePhoto,
+  fileInputRef
+}: VesselDataFieldsProps) {
+  const { t } = useTranslation()
+  const set = (patch: Partial<VesselFormInputs>) => onChange({ ...inputs, ...patch })
+
+  const triggerFileInput = () => {
+    if (!readOnly) fileInputRef.current?.click()
+  }
+
+  return (
+    <div className="form-grid">
+      <div className="vessel-photo-wrapper">
+        <div
+          className="vessel-photo-preview"
+          onClick={triggerFileInput}
+          style={{ cursor: readOnly ? 'default' : 'pointer' }}
+        >
+          {inputs.photo ? (
+            <img src={inputs.photo} alt={inputs.name || 'Vessel'} className="vessel-photo" />
+          ) : (
+            <div className="vessel-photo-placeholder">
+              <Ship size={48} className="placeholder-icon" />
+            </div>
+          )}
+          {!readOnly && (
+            <div className="vessel-photo-overlay">
+              <Camera size={24} />
+              <span>{inputs.photo ? t('vessel.photo_change') : t('vessel.photo_add')}</span>
+            </div>
+          )}
+        </div>
+        {!readOnly && (
+          <div className="vessel-photo-actions">
+            <button type="button" className="btn secondary btn-sm" onClick={triggerFileInput} disabled={saving}>
+              <Camera size={16} />
+              {inputs.photo ? t('vessel.photo_change') : t('vessel.photo_add')}
+            </button>
+            {inputs.photo && (
+              <button type="button" className="btn danger btn-sm" onClick={onRemovePhoto} disabled={saving}>
+                <Trash2 size={16} />
+                {t('vessel.photo_delete')}
+              </button>
+            )}
+          </div>
+        )}
+        <input
+          type="file"
+          ref={fileInputRef}
+          onChange={onPhotoChange}
+          accept="image/*"
+          style={{ display: 'none' }}
+        />
+        {photoError && <div className="auth-error mt-2">{photoError}</div>}
+      </div>
+
+      <div className="input-group">
+        <label>{t('vessel.name')}</label>
+        <input
+          type="text"
+          className="input-text"
+          value={inputs.name}
+          onChange={(e) => set({ name: e.target.value })}
+          disabled={saving || readOnly}
+          required
+        />
+      </div>
+
+      <div className="input-group">
+        <label>{t('vessel.type')}</label>
+        <select
+          className="input-text"
+          value={inputs.vesselType}
+          onChange={(e) => set({ vesselType: e.target.value })}
+          disabled={saving || readOnly}
+        >
+          <option value="">{t('vessel.type_unset')}</option>
+          <option value="sailing">{t('vessel.type_sailing')}</option>
+          <option value="motor">{t('vessel.type_motor')}</option>
+        </select>
+      </div>
+
+      <div className="input-group">
+        <label>{t('vessel.length_m')}</label>
+        <input
+          type="text"
+          inputMode="decimal"
+          className="input-text"
+          value={inputs.lengthM}
+          onChange={(e) => set({ lengthM: e.target.value })}
+          disabled={saving || readOnly}
+          placeholder="0.00"
+        />
+      </div>
+
+      <div className="input-group">
+        <label>{t('vessel.draft_m')}</label>
+        <input
+          type="text"
+          inputMode="decimal"
+          className="input-text"
+          value={inputs.draftM}
+          onChange={(e) => set({ draftM: e.target.value })}
+          disabled={saving || readOnly}
+          placeholder="0.00"
+        />
+      </div>
+
+      <div className="input-group">
+        <label>{t('vessel.air_draft_m')}</label>
+        <input
+          type="text"
+          inputMode="decimal"
+          className="input-text"
+          value={inputs.airDraftM}
+          onChange={(e) => set({ airDraftM: e.target.value })}
+          disabled={saving || readOnly}
+          placeholder="0.00"
+        />
+      </div>
+
+      <div className="input-group">
+        <label>{t('vessel.port')}</label>
+        <input
+          type="text"
+          className="input-text"
+          value={inputs.homePort}
+          onChange={(e) => set({ homePort: e.target.value })}
+          disabled={saving || readOnly}
+        />
+      </div>
+
+      <div className="input-group">
+        <label>{t('vessel.owner')}</label>
+        <input
+          type="text"
+          className="input-text"
+          value={inputs.owner}
+          onChange={(e) => set({ owner: e.target.value })}
+          disabled={saving || readOnly}
+        />
+      </div>
+
+      <div className="input-group">
+        <label>{t('vessel.charter')}</label>
+        <input
+          type="text"
+          className="input-text"
+          value={inputs.charterCompany}
+          onChange={(e) => set({ charterCompany: e.target.value })}
+          disabled={saving || readOnly}
+        />
+      </div>
+
+      <div className="input-group">
+        <label>{t('vessel.registration')}</label>
+        <input
+          type="text"
+          className="input-text"
+          value={inputs.registrationNumber}
+          onChange={(e) => set({ registrationNumber: e.target.value })}
+          disabled={saving || readOnly}
+        />
+      </div>
+
+      <div className="input-group">
+        <label>{t('vessel.callsign')}</label>
+        <input
+          type="text"
+          className="input-text"
+          value={inputs.callSign}
+          onChange={(e) => set({ callSign: e.target.value })}
+          disabled={saving || readOnly}
+        />
+      </div>
+
+      <div className="input-group">
+        <label>{t('vessel.atis')}</label>
+        <input
+          type="text"
+          className="input-text"
+          value={inputs.atis}
+          onChange={(e) => set({ atis: e.target.value })}
+          disabled={saving || readOnly}
+        />
+      </div>
+
+      <div className="input-group">
+        <label>{t('vessel.mmsi')}</label>
+        <input
+          type="text"
+          className="input-text"
+          value={inputs.mmsi}
+          onChange={(e) => set({ mmsi: e.target.value })}
+          disabled={saving || readOnly}
+        />
+      </div>
+
+      <div className="vessel-tanks-section">
+        <h3>{t('vessel.tanks_section')}</h3>
+        <p className="vessel-tanks-help">{t('vessel.tanks_help')}</p>
+        <div className="vessel-tanks-grid">
+          <div className="input-group">
+            <label>{t('vessel.freshwater_capacity_l')}</label>
+            <input
+              type="text"
+              inputMode="decimal"
+              className="input-text"
+              value={inputs.freshwaterCapacityL}
+              onChange={(e) => set({ freshwaterCapacityL: e.target.value })}
+              disabled={saving || readOnly}
+              placeholder="0"
+            />
+          </div>
+          <div className="input-group">
+            <label>{t('vessel.fuel_capacity_l')}</label>
+            <input
+              type="text"
+              inputMode="decimal"
+              className="input-text"
+              value={inputs.fuelCapacityL}
+              onChange={(e) => set({ fuelCapacityL: e.target.value })}
+              disabled={saving || readOnly}
+              placeholder="0"
+            />
+          </div>
+          <div className="input-group">
+            <label>{t('vessel.greywater_capacity_l')}</label>
+            <input
+              type="text"
+              inputMode="decimal"
+              className="input-text"
+              value={inputs.greywaterCapacityL}
+              onChange={(e) => set({ greywaterCapacityL: e.target.value })}
+              disabled={saving || readOnly}
+              placeholder="0"
+            />
+          </div>
+        </div>
+      </div>
+
+      <div className="sails-section">
+        <h3>{t('vessel.sails_list')}</h3>
+        <p className="help-text">{t('vessel.sails_help')}</p>
+        <div className="sails-badges-grid">
+          {inputs.sails.length === 0 ? (
+            <span className="no-sails-msg">{t('vessel.no_sails')}</span>
+          ) : (
+            inputs.sails.map((sail, idx) => (
+              <span key={idx} className="sail-badge">
+                {sail}
+                {!readOnly && (
+                  <button
+                    type="button"
+                    className="remove-btn"
+                    onClick={() => onRemoveSail(idx)}
+                    disabled={saving}
+                  >
+                    <X size={14} />
+                  </button>
+                )}
+              </span>
+            ))
+          )}
+        </div>
+        {!readOnly && (
+          <div className="add-sail-form">
+            <input
+              type="text"
+              className="input-text"
+              placeholder={t('vessel.sail_name_placeholder')}
+              value={newSailName}
+              onChange={(e) => onNewSailNameChange(e.target.value)}
+              disabled={saving}
+              onKeyDown={(e) => {
+                if (e.key === 'Enter') {
+                  e.preventDefault()
+                  onAddSail()
+                }
+              }}
+            />
+            <button
+              type="button"
+              className="btn secondary"
+              onClick={onAddSail}
+              disabled={saving || !newSailName.trim()}
+              style={{ width: 'auto' }}
+            >
+              <Plus size={16} />
+              {t('vessel.add_sail')}
+            </button>
+          </div>
+        )}
+      </div>
+    </div>
+  )
+}
@@ -7,6 +7,7 @@ import { encryptJson, decryptJson } from '../services/crypto.js'
 import { syncLogbook } from '../services/sync.js'
 import { PlausibleEvents, trackPlausibleEvent } from '../services/analytics.js'
 import { Ship, Save, Check, Plus, X, Camera, Trash2 } from 'lucide-react'
+import { parseOptionalTankLiters, tankCapacityInputFromStored } from '../utils/tankCapacity.js'

 interface VesselFormProps {
  logbookId: string
@@ -47,6 +48,9 @@ export default function VesselForm({ logbookId, readOnly = false, preloadedData
  const [mmsi, setMmsi] = useState('')
  const [sails, setSails] = useState<string[]>([])
  const [newSailName, setNewSailName] = useState('')
+  const [freshwaterCapacityL, setFreshwaterCapacityL] = useState('')
+  const [fuelCapacityL, setFuelCapacityL] = useState('')
+  const [greywaterCapacityL, setGreywaterCapacityL] = useState('')

  const fileInputRef = React.useRef<HTMLInputElement>(null)
  const [photo, setPhoto] = useState<string | null>(null)
@@ -78,6 +82,9 @@ export default function VesselForm({ logbookId, readOnly = false, preloadedData
          setMmsi(preloadedData.mmsi || '')
          setSails(preloadedData.sails || [])
          setPhoto(preloadedData.photo || null)
+          setFreshwaterCapacityL(tankCapacityInputFromStored(preloadedData.freshwaterCapacityL))
+          setFuelCapacityL(tankCapacityInputFromStored(preloadedData.fuelCapacityL))
+          setGreywaterCapacityL(tankCapacityInputFromStored(preloadedData.greywaterCapacityL))
          return
        }

@@ -103,6 +110,9 @@ export default function VesselForm({ logbookId, readOnly = false, preloadedData
            setMmsi(decrypted.mmsi || '')
            setSails(decrypted.sails || [])
            setPhoto(decrypted.photo || null)
+            setFreshwaterCapacityL(tankCapacityInputFromStored(decrypted.freshwaterCapacityL))
+            setFuelCapacityL(tankCapacityInputFromStored(decrypted.fuelCapacityL))
+            setGreywaterCapacityL(tankCapacityInputFromStored(decrypted.greywaterCapacityL))
          }
        }
      } catch (err: any) {
@@ -201,12 +211,19 @@ export default function VesselForm({ logbookId, readOnly = false, preloadedData
      let parsedLengthM: number | undefined
      let parsedDraftM: number | undefined
      let parsedAirDraftM: number | undefined
+      let parsedFreshwaterCapacityL: number | undefined
+      let parsedFuelCapacityL: number | undefined
+      let parsedGreywaterCapacityL: number | undefined
      try {
        parsedLengthM = parseOptionalMetricMeters(lengthM)
        parsedDraftM = parseOptionalMetricMeters(draftM)
        parsedAirDraftM = parseOptionalMetricMeters(airDraftM)
-      } catch {
-        setError(t('vessel.invalid_metric'))
+        parsedFreshwaterCapacityL = parseOptionalTankLiters(freshwaterCapacityL)
+        parsedFuelCapacityL = parseOptionalTankLiters(fuelCapacityL)
+        parsedGreywaterCapacityL = parseOptionalTankLiters(greywaterCapacityL)
+      } catch (err: unknown) {
+        const msg = err instanceof Error ? err.message : ''
+        setError(msg === 'invalid_tank_liters' ? t('vessel.invalid_tank_liters') : t('vessel.invalid_metric'))
        setSaving(false)
        return
      }
@@ -217,6 +234,9 @@ export default function VesselForm({ logbookId, readOnly = false, preloadedData
        lengthM: parsedLengthM,
        draftM: parsedDraftM,
        airDraftM: parsedAirDraftM,
+        freshwaterCapacityL: parsedFreshwaterCapacityL,
+        fuelCapacityL: parsedFuelCapacityL,
+        greywaterCapacityL: parsedGreywaterCapacityL,
        homePort: homePort.trim(),
        charterCompany: charterCompany.trim(),
        owner: owner.trim(),
@@ -480,6 +500,49 @@ export default function VesselForm({ logbookId, readOnly = false, preloadedData
            />
          </div>

+          <div className="vessel-tanks-section">
+            <h3>{t('vessel.tanks_section')}</h3>
+            <p className="vessel-tanks-help">{t('vessel.tanks_help')}</p>
+            <div className="vessel-tanks-grid">
+              <div className="input-group">
+                <label>{t('vessel.freshwater_capacity_l')}</label>
+                <input
+                  type="text"
+                  inputMode="decimal"
+                  className="input-text"
+                  value={freshwaterCapacityL}
+                  onChange={(e) => setFreshwaterCapacityL(e.target.value)}
+                  disabled={saving || readOnly}
+                  placeholder="0"
+                />
+              </div>
+              <div className="input-group">
+                <label>{t('vessel.fuel_capacity_l')}</label>
+                <input
+                  type="text"
+                  inputMode="decimal"
+                  className="input-text"
+                  value={fuelCapacityL}
+                  onChange={(e) => setFuelCapacityL(e.target.value)}
+                  disabled={saving || readOnly}
+                  placeholder="0"
+                />
+              </div>
+              <div className="input-group">
+                <label>{t('vessel.greywater_capacity_l')}</label>
+                <input
+                  type="text"
+                  inputMode="decimal"
+                  className="input-text"
+                  value={greywaterCapacityL}
+                  onChange={(e) => setGreywaterCapacityL(e.target.value)}
+                  disabled={saving || readOnly}
+                  placeholder="0"
+                />
+              </div>
+            </div>
+          </div>
+
          <div className="sails-section">
            <h3>{t('vessel.sails_list')}</h3>
            <p className="help-text">{t('vessel.sails_help')}</p>
@@ -0,0 +1,244 @@
+import React, { useCallback, useEffect, useRef, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { Ship, Plus, Trash2, Edit2, X, Save } from 'lucide-react'
+import { useDialog } from './ModalDialog.tsx'
+import VesselDataFields from './VesselDataFields.tsx'
+import type { VesselFormInputs } from '../utils/vesselFormUtils.js'
+import { parseVesselFormInputs, vesselDataToFormInputs } from '../utils/vesselFormUtils.js'
+import { emptyVesselData } from '../types/vessel.js'
+import { loadVesselPool, saveVessel, deleteVessel, type DecryptedVessel } from '../services/vesselPool.js'
+import { PlausibleEvents, trackPlausibleEvent } from '../services/analytics.js'
+
+export default function VesselPoolForm() {
+  const { t } = useTranslation()
+  const { showConfirm } = useDialog()
+  const [vessels, setVessels] = useState<DecryptedVessel[]>([])
+  const [loading, setLoading] = useState(true)
+  const [error, setError] = useState<string | null>(null)
+  const [showForm, setShowForm] = useState(false)
+  const [editingId, setEditingId] = useState<string | null>(null)
+  const [inputs, setInputs] = useState<VesselFormInputs>(vesselDataToFormInputs(emptyVesselData()))
+  const [newSailName, setNewSailName] = useState('')
+  const [saving, setSaving] = useState(false)
+  const [photoError, setPhotoError] = useState<string | null>(null)
+  const fileRef = useRef<HTMLInputElement>(null)
+
+  const reload = useCallback(async () => {
+    setLoading(true)
+    setError(null)
+    try {
+      setVessels(await loadVesselPool())
+    } catch (err: unknown) {
+      setError(err instanceof Error ? err.message : 'Failed to load')
+    } finally {
+      setLoading(false)
+    }
+  }, [])
+
+  useEffect(() => {
+    void reload()
+  }, [reload])
+
+  const openAdd = () => {
+    setEditingId(null)
+    setInputs(vesselDataToFormInputs(emptyVesselData()))
+    setNewSailName('')
+    setPhotoError(null)
+    setShowForm(true)
+  }
+
+  const openEdit = (vessel: DecryptedVessel) => {
+    setEditingId(vessel.payloadId)
+    setInputs(vesselDataToFormInputs(vessel.data))
+    setNewSailName('')
+    setPhotoError(null)
+    setShowForm(true)
+  }
+
+  const handleAddSail = () => {
+    const trimmed = newSailName.trim()
+    if (trimmed && !inputs.sails.includes(trimmed)) {
+      setInputs((prev) => ({ ...prev, sails: [...prev.sails, trimmed] }))
+    }
+    setNewSailName('')
+  }
+
+  const handlePhotoChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    const file = e.target.files?.[0]
+    if (!file) return
+    setPhotoError(null)
+    const reader = new FileReader()
+    reader.onload = (event) => {
+      const img = new Image()
+      img.onload = () => {
+        try {
+          const canvas = document.createElement('canvas')
+          const ctx = canvas.getContext('2d')
+          if (!ctx) throw new Error('Could not get canvas context')
+          let width = img.width
+          let height = img.height
+          const MAX_WIDTH = 800
+          const MAX_HEIGHT = 600
+          if (width > MAX_WIDTH || height > MAX_HEIGHT) {
+            const ratio = Math.min(MAX_WIDTH / width, MAX_HEIGHT / height)
+            width = Math.round(width * ratio)
+            height = Math.round(height * ratio)
+          }
+          canvas.width = width
+          canvas.height = height
+          ctx.drawImage(img, 0, 0, width, height)
+          setInputs((prev) => ({ ...prev, photo: canvas.toDataURL('image/jpeg', 0.7) }))
+        } catch (err: unknown) {
+          setPhotoError(err instanceof Error ? err.message : 'Failed to process image')
+        }
+      }
+      img.onerror = () => setPhotoError('Invalid image file')
+      img.src = event.target?.result as string
+    }
+    reader.readAsDataURL(file)
+  }
+
+  const handleSave = async (e: React.FormEvent) => {
+    e.preventDefault()
+    if (!inputs.name.trim()) return
+    setSaving(true)
+    setError(null)
+    try {
+      const data = parseVesselFormInputs(inputs)
+      const id = editingId ?? window.crypto.randomUUID()
+      await saveVessel(id, data, !editingId)
+      setShowForm(false)
+      trackPlausibleEvent(PlausibleEvents.VESSEL_SAVED, { context: 'vessel_pool' })
+      await reload()
+    } catch (err: unknown) {
+      if (err instanceof Error && err.message === 'MAX_VESSELS') {
+        setError(t('vessel_pool.max_vessels'))
+      } else if (err instanceof Error && err.message === 'invalid_metric') {
+        setError(t('vessel.invalid_metric'))
+      } else if (err instanceof Error && err.message === 'invalid_tank_liters') {
+        setError(t('vessel.invalid_tank_liters'))
+      } else {
+        setError(err instanceof Error ? err.message : 'Failed to save')
+      }
+    } finally {
+      setSaving(false)
+    }
+  }
+
+  const handleDelete = async (id: string) => {
+    if (
+      !(await showConfirm(
+        t('vessel_pool.delete_confirm'),
+        t('vessel_pool.title'),
+        t('logs.confirm_yes'),
+        t('logs.confirm_no')
+      ))
+    ) {
+      return
+    }
+    try {
+      await deleteVessel(id)
+      await reload()
+    } catch (err: unknown) {
+      setError(err instanceof Error ? err.message : 'Failed to delete')
+    }
+  }
+
+  if (loading) {
+    return (
+      <div className="tab-placeholder">
+        <Ship className="header-logo spin" size={48} />
+        <p>{t('vessel_pool.loading')}</p>
+      </div>
+    )
+  }
+
+  return (
+    <div data-tour="profile-vessel-pool">
+      <div className="section-title-bar mb-4">
+        <h3>{t('vessel_pool.section_title')}</h3>
+        {!showForm && (
+          <button type="button" className="btn primary" style={{ width: 'auto', padding: '8px 16px' }} onClick={openAdd}>
+            <Plus size={16} />
+            {t('vessel_pool.add_vessel')}
+          </button>
+        )}
+      </div>
+      <p className="help-text mb-4">{t('vessel_pool.subtitle')}</p>
+      {error && <div className="auth-error mb-4">{error}</div>}
+
+      {vessels.length === 0 ? (
+        <p className="help-text mb-4">{t('vessel_pool.no_vessels')}</p>
+      ) : (
+        <div className="crew-grid mb-6">
+          {vessels.map((v) => (
+            <div key={v.payloadId} className="crew-member-card glass">
+              <div className="crew-card-header">
+                <div style={{ display: 'flex', alignItems: 'center', gap: '12px' }}>
+                  {v.data.photo ? (
+                    <img src={v.data.photo} alt="" className="crew-card-avatar" />
+                  ) : (
+                    <div className="crew-card-avatar-placeholder">
+                      <Ship size={18} />
+                    </div>
+                  )}
+                  <div>
+                    <h4>{v.data.name}</h4>
+                    {v.data.homePort && <p className="help-text">{v.data.homePort}</p>}
+                  </div>
+                </div>
+                <div className="card-actions">
+                  <button type="button" className="btn-icon" onClick={() => openEdit(v)}>
+                    <Edit2 size={14} />
+                  </button>
+                  <button
+                    type="button"
+                    className="btn-icon logout"
+                    onClick={() => void handleDelete(v.payloadId)}
+                  >
+                    <Trash2 size={14} />
+                  </button>
+                </div>
+              </div>
+            </div>
+          ))}
+        </div>
+      )}
+
+      {showForm && (
+        <form onSubmit={(e) => void handleSave(e)} className="member-editor-card glass">
+          <div className="editor-header mb-4">
+            <h3>{editingId ? t('vessel_pool.edit_vessel') : t('vessel_pool.add_vessel')}</h3>
+            <button type="button" className="btn-icon" onClick={() => setShowForm(false)}>
+              <X size={16} />
+            </button>
+          </div>
+          <VesselDataFields
+            inputs={inputs}
+            onChange={setInputs}
+            saving={saving}
+            newSailName={newSailName}
+            onNewSailNameChange={setNewSailName}
+            onAddSail={handleAddSail}
+            onRemoveSail={(idx) =>
+              setInputs((prev) => ({ ...prev, sails: prev.sails.filter((_, i) => i !== idx) }))
+            }
+            photoError={photoError}
+            onPhotoChange={handlePhotoChange}
+            onRemovePhoto={() => {
+              setInputs((prev) => ({ ...prev, photo: null }))
+              if (fileRef.current) fileRef.current.value = ''
+            }}
+            fileInputRef={fileRef}
+          />
+          <div className="form-actions mt-4">
+            <button type="submit" className="btn primary" disabled={saving || !inputs.name.trim()}>
+              <Save size={18} />
+              {saving ? t('vessel.saving') : t('vessel.save')}
+            </button>
+          </div>
+        </form>
+      )}
+    </div>
+  )
+}
@@ -17,7 +17,13 @@ describe('AppTourContext step order', () => {
    expect(profileIndex).toBeGreaterThan(FULL_STEP_ORDER.indexOf('nav_feedback'))
    expect(prefsIndex).toBe(profileIndex + 1)
    expect(finishIndex).toBe(prefsIndex + 1)
-    expect(FULL_STEP_ORDER).toHaveLength(12)
+    expect(FULL_STEP_ORDER).toContain('profile_vessel_pool')
+    expect(FULL_STEP_ORDER).toContain('profile_crew_pool')
+    expect(FULL_STEP_ORDER).toContain('nav_logbook_crew')
+    expect(FULL_STEP_ORDER.indexOf('profile_vessel_pool')).toBeLessThan(
+      FULL_STEP_ORDER.indexOf('profile_crew_pool')
+    )
+    expect(FULL_STEP_ORDER).toHaveLength(14)
  })

  it('excludes profile, stats and feedback from demo tour', () => {
@@ -26,7 +26,9 @@ export type TourStepId =
  | 'entry_open'
  | 'entry_track'
  | 'nav_vessel'
-  | 'nav_crew'
+  | 'profile_vessel_pool'
+  | 'profile_crew_pool'
+  | 'nav_logbook_crew'
  | 'nav_stats'
  | 'nav_feedback'
  | 'nav_profile'
@@ -71,7 +73,9 @@ export const FULL_STEP_ORDER: TourStepId[] = [
  'entry_open',
  'entry_track',
  'nav_vessel',
-  'nav_crew',
+  'profile_vessel_pool',
+  'profile_crew_pool',
+  'nav_logbook_crew',
  'nav_stats',
  'nav_feedback',
  'nav_profile',
@@ -81,6 +85,7 @@ export const FULL_STEP_ORDER: TourStepId[] = [

 /** Public demo has no stats/feedback/profile UI — skip those steps. */
 export const DEMO_EXCLUDED_STEPS: TourStepId[] = [
+  'profile_crew_pool',
  'nav_stats',
  'nav_feedback',
  'nav_profile',
@@ -97,7 +102,7 @@ const LOGBOOK_TOUR_STEPS = new Set<TourStepId>([
  'entry_open',
  'entry_track',
  'nav_vessel',
-  'nav_crew',
+  'nav_logbook_crew',
  'nav_stats',
  'nav_feedback'
 ])
@@ -112,7 +117,9 @@ const TARGET_BY_STEP: Partial<Record<TourStepId, string>> = {
  entry_open: '[data-tour="entry-first"]',
  entry_track: '[data-tour="entry-track"]',
  nav_vessel: '[data-tour="nav-vessel"]',
-  nav_crew: '[data-tour="nav-crew"]',
+  profile_vessel_pool: '[data-tour="profile-vessel-pool"]',
+  profile_crew_pool: '[data-tour="profile-crew-pool"]',
+  nav_logbook_crew: '[data-tour="nav-logbook-crew"]',
  nav_stats: '[data-tour="stats-dashboard"]',
  nav_feedback: '[data-tour="feedback-form"]',
  nav_profile: '[data-tour="nav-profile"]',
@@ -127,7 +134,14 @@ export function tourStepOpensEntry(stepId: TourStepId): boolean {
 export function getTourTargetDelay(stepId: TourStepId): number {
  if (stepId === 'entry_track') return 400
  if (stepId === 'nav_feedback') return 180
-  if (stepId === 'nav_profile' || stepId === 'profile_preferences') return 250
+  if (
+    stepId === 'nav_profile' ||
+    stepId === 'profile_preferences' ||
+    stepId === 'profile_vessel_pool' ||
+    stepId === 'profile_crew_pool'
+  ) {
+    return 250
+  }
  return 0
 }

@@ -183,8 +197,15 @@ export function AppTourProvider({ children }: { children: ReactNode }) {
      nav.setSelectedEntryId(null)
      nav.setActiveTab('vessel')
    }
-    if (stepId === 'nav_crew') {
+    if (stepId === 'profile_vessel_pool' || stepId === 'profile_crew_pool') {
      nav.setSelectedEntryId(null)
+      nav.setLogbookActive(false)
+      nav.setProfileOpen(true)
+    }
+    if (stepId === 'nav_logbook_crew') {
+      nav.setSelectedEntryId(null)
+      nav.setProfileOpen(false)
+      nav.setLogbookActive(true)
      nav.setActiveTab('crew')
    }
    if (stepId === 'nav_stats') {
@@ -12,6 +12,7 @@ import { useDialog } from '../components/ModalDialog.tsx'

 interface UnsavedChangesContextValue {
  setDirty: (source: string, dirty: boolean) => void
+  registerSaveHandler: (source: string, handler: (() => Promise<void>) | null) => void
  confirmLeave: () => Promise<boolean>
 }

@@ -19,23 +20,51 @@ const UnsavedChangesContext = createContext<UnsavedChangesContextValue | null>(n

 export function UnsavedChangesProvider({ children }: { children: ReactNode }) {
  const { t } = useTranslation()
-  const { showConfirm } = useDialog()
+  const { showConfirmLeave, showAlert } = useDialog()
  const dirtySources = useRef(new Set<string>())
+  const saveHandlers = useRef(new Map<string, () => Promise<void>>())

  const setDirty = useCallback((source: string, dirty: boolean) => {
    if (dirty) dirtySources.current.add(source)
    else dirtySources.current.delete(source)
  }, [])

+  const registerSaveHandler = useCallback((source: string, handler: (() => Promise<void>) | null) => {
+    if (handler) saveHandlers.current.set(source, handler)
+    else saveHandlers.current.delete(source)
+  }, [])
+
  const confirmLeave = useCallback(async (): Promise<boolean> => {
    if (dirtySources.current.size === 0) return true
-    return showConfirm(
+
+    const canSave = [...dirtySources.current].some((source) => saveHandlers.current.has(source))
+    const choice = await showConfirmLeave(
      t('common.unsaved_changes_message'),
      t('common.unsaved_changes_title'),
-      t('common.unsaved_changes_leave'),
-      t('common.unsaved_changes_stay')
+      t('common.unsaved_changes_stay'),
+      t('common.unsaved_changes_save_leave'),
+      t('common.unsaved_changes_discard'),
+      { showSave: canSave }
    )
-  }, [showConfirm, t])
+
+    if (choice === 'stay') return false
+    if (choice === 'discard') return true
+
+    const handlers = [...dirtySources.current]
+      .map((source) => saveHandlers.current.get(source))
+      .filter((handler): handler is () => Promise<void> => handler != null)
+
+    try {
+      for (const handler of handlers) {
+        await handler()
+      }
+      return true
+    } catch (err) {
+      console.error('Failed to save before leaving:', err)
+      await showAlert(t('errors.save_failed'))
+      return false
+    }
+  }, [showConfirmLeave, showAlert, t])

  useEffect(() => {
    const handler = (e: BeforeUnloadEvent) => {
@@ -47,7 +76,10 @@ export function UnsavedChangesProvider({ children }: { children: ReactNode }) {
    return () => window.removeEventListener('beforeunload', handler)
  }, [])

-  const value = useMemo(() => ({ setDirty, confirmLeave }), [setDirty, confirmLeave])
+  const value = useMemo(
+    () => ({ setDirty, registerSaveHandler, confirmLeave }),
+    [setDirty, registerSaveHandler, confirmLeave]
+  )

  return (
    <UnsavedChangesContext.Provider value={value}>
@@ -65,13 +97,26 @@ export function useUnsavedChangesContext(): UnsavedChangesContextValue {
 }

 /** Register a form/view as having unsaved changes (cleared automatically on unmount). */
-export function useRegisterUnsavedChanges(source: string, isDirty: boolean) {
-  const { setDirty, confirmLeave } = useUnsavedChangesContext()
+export function useRegisterUnsavedChanges(
+  source: string,
+  isDirty: boolean,
+  onSave?: () => Promise<void>
+) {
+  const { setDirty, registerSaveHandler, confirmLeave } = useUnsavedChangesContext()

  useEffect(() => {
    setDirty(source, isDirty)
    return () => setDirty(source, false)
  }, [source, isDirty, setDirty])

+  useEffect(() => {
+    if (!onSave) {
+      registerSaveHandler(source, null)
+      return
+    }
+    registerSaveHandler(source, onSave)
+    return () => registerSaveHandler(source, null)
+  }, [source, onSave, registerSaveHandler])
+
  return { confirmLeave }
 }
@@ -1,13 +1,19 @@
 import { useEffect, useRef } from 'react'
 import { useRegisterSW } from 'virtual:pwa-register/react'
+import {
+  forcePwaRecovery,
+  markReloadAttempt,
+  recentlyAttemptedReload,
+  triggerServiceWorkerUpdate
+} from '../services/pwaStartup.js'
+import { isDeployedVersionNewer } from '../services/pwaVersion.js'

-const UPDATE_CHECK_INTERVAL_MS = 60 * 60 * 1000
+const UPDATE_CHECK_INTERVAL_MS = 15 * 60 * 1000
 const UPDATE_SUPPRESS_KEY = 'pwa_update_suppress_until'
 const UPDATE_SUPPRESS_MS = 30_000
-const UPDATE_DISMISS_SUPPRESS_MS = 60 * 60 * 1000
-const UPDATE_RELOAD_FALLBACK_MS = 2000
-/** Prevent Android PWA cold-start reload loops from onNeedReload. */
-const PWA_INITIAL_RELOAD_KEY = 'pwa_sw_initial_reload_done'
+const UPDATE_DISMISS_SUPPRESS_MS = 15 * 60 * 1000
+const UPDATE_RELOAD_FALLBACK_MS = 2_000
+const UPDATE_HARD_RECOVERY_MS = 5_000

 function isUpdateSuppressed(): boolean {
  const suppressUntil = Number(sessionStorage.getItem(UPDATE_SUPPRESS_KEY) || '0')
@@ -22,29 +28,64 @@ function clearUpdateSuppression(): void {
  sessionStorage.removeItem(UPDATE_SUPPRESS_KEY)
 }

-function scheduleUpdateChecks(registration: ServiceWorkerRegistration): () => void {
+function scheduleUpdateChecks(
+  registration: ServiceWorkerRegistration,
+  onOutdated: () => void
+): () => void {
  const checkForUpdate = () => {
    if (isUpdateSuppressed()) return
    registration.update().catch(() => {})
+    void isDeployedVersionNewer().then((outdated) => {
+      if (outdated) onOutdated()
+    })
  }

  const onVisibilityChange = () => {
    if (document.visibilityState === 'visible') {
-      checkForUpdate()
+      // Delay check on wake-up to allow the mobile network stack to stabilize
+      setTimeout(checkForUpdate, 2000)
    }
  }

+  const onOnline = () => {
+    // Small delay to ensure connection is fully established
+    setTimeout(checkForUpdate, 500)
+  }
+
  document.addEventListener('visibilitychange', onVisibilityChange)
-  const intervalId = window.setInterval(checkForUpdate, UPDATE_CHECK_INTERVAL_MS)
+  window.addEventListener('online', onOnline)
+  const updateIntervalId = window.setInterval(checkForUpdate, UPDATE_CHECK_INTERVAL_MS)
+
+  checkForUpdate()

  return () => {
    document.removeEventListener('visibilitychange', onVisibilityChange)
-    window.clearInterval(intervalId)
+    window.removeEventListener('online', onOnline)
+    window.clearInterval(updateIntervalId)
  }
 }

+function reloadForServiceWorkerTakeover(): void {
+  if (recentlyAttemptedReload()) return
+  markReloadAttempt()
+  clearUpdateSuppression()
+  window.location.reload()
+}
+
 export function usePwaUpdate() {
  const cleanupRef = useRef<(() => void) | null>(null)
+  const reloadFallbackTimerRef = useRef<number | null>(null)
+  const forceRecoveryTimerRef = useRef<number | null>(null)
+  const setNeedRefreshRef = useRef<((value: boolean) => void) | null>(null)
+  const pendingNeedRefreshRef = useRef<boolean | null>(null)
+
+  const applyNeedRefresh = (value: boolean) => {
+    if (setNeedRefreshRef.current) {
+      setNeedRefreshRef.current(value)
+      return
+    }
+    pendingNeedRefreshRef.current = value
+  }

  const {
    needRefresh: [needRefresh, setNeedRefresh],
@@ -52,39 +93,56 @@ export function usePwaUpdate() {
  } = useRegisterSW({
    immediate: !import.meta.env.DEV,
    onNeedReload() {
-      // First SW takeover requires one reload; guard against repeated reloads on Android PWA resume.
-      if (sessionStorage.getItem(PWA_INITIAL_RELOAD_KEY)) {
-        return
-      }
-      sessionStorage.setItem(PWA_INITIAL_RELOAD_KEY, '1')
-      clearUpdateSuppression()
-      setNeedRefresh(false)
-      window.location.reload()
+      if (isUpdateSuppressed()) return
+      applyNeedRefresh(true)
    },
    onNeedRefresh() {
      if (isUpdateSuppressed()) return
-      setNeedRefresh(true)
+      applyNeedRefresh(true)
    },
    onRegisteredSW(_swUrl: string, registration: ServiceWorkerRegistration | undefined) {
      if (!registration) return

      if (isUpdateSuppressed() || !registration.waiting) {
-        setNeedRefresh(false)
+        applyNeedRefresh(false)
      }

      cleanupRef.current?.()
-      cleanupRef.current = scheduleUpdateChecks(registration)
+      cleanupRef.current = scheduleUpdateChecks(registration, () => {
+        if (isUpdateSuppressed()) return
+        applyNeedRefresh(true)
+      })
    }
  })

+  setNeedRefreshRef.current = setNeedRefresh
+
  useEffect(() => {
    if (isUpdateSuppressed()) {
      setNeedRefresh(false)
+    } else if (pendingNeedRefreshRef.current !== null) {
+      const pending = pendingNeedRefreshRef.current
+      pendingNeedRefreshRef.current = null
+      setNeedRefresh(pending)
    }

+    void isDeployedVersionNewer().then((outdated) => {
+      if (outdated) {
+        setNeedRefresh(true)
+      }
+    })
+
    return () => {
      cleanupRef.current?.()
      cleanupRef.current = null
+      if (reloadFallbackTimerRef.current !== null) {
+        window.clearTimeout(reloadFallbackTimerRef.current)
+        reloadFallbackTimerRef.current = null
+      }
+      if (forceRecoveryTimerRef.current !== null) {
+        window.clearTimeout(forceRecoveryTimerRef.current)
+        forceRecoveryTimerRef.current = null
+      }
    }
  }, [setNeedRefresh])

@@ -93,11 +151,24 @@ export function usePwaUpdate() {
    suppressUpdatePrompt()

    await updateServiceWorker(true)
+    await triggerServiceWorkerUpdate()

-    // vite-plugin-pwa reloads via the "controlling" event; fallback if that does not fire.
-    window.setTimeout(() => {
-      window.location.reload()
+    if (reloadFallbackTimerRef.current !== null) {
+      window.clearTimeout(reloadFallbackTimerRef.current)
+    }
+    if (forceRecoveryTimerRef.current !== null) {
+      window.clearTimeout(forceRecoveryTimerRef.current)
+    }
+
+    reloadFallbackTimerRef.current = window.setTimeout(() => {
+      reloadFallbackTimerRef.current = null
+      reloadForServiceWorkerTakeover()
    }, UPDATE_RELOAD_FALLBACK_MS)
+
+    forceRecoveryTimerRef.current = window.setTimeout(() => {
+      forceRecoveryTimerRef.current = null
+      void forcePwaRecovery()
+    }, UPDATE_HARD_RECOVERY_MS)
  }

  const dismissUpdate = () => {
@@ -3,12 +3,19 @@ import { initReactI18next } from 'react-i18next'
 import LanguageDetector from 'i18next-browser-languagedetector'
 import enJson from './locales/en.json'
 import deJson from './locales/de.json'
+import daJson from './locales/da.json'
+import svJson from './locales/sv.json'
+import nbJson from './locales/nb.json'
 import { initSeo } from '../utils/seo.js'
+import { SUPPORTED_LANGUAGES } from '../utils/i18nLanguages.js'

 /** JSON files wrap strings in `translation` — register that namespace explicitly. */
 const resources = {
  en: { translation: enJson.translation },
-  de: { translation: deJson.translation }
+  de: { translation: deJson.translation },
+  da: { translation: daJson.translation },
+  sv: { translation: svJson.translation },
+  nb: { translation: nbJson.translation }
 }

 i18n
@@ -18,7 +25,7 @@ i18n
    resources,
    defaultNS: 'translation',
    fallbackLng: 'en',
-    supportedLngs: ['de', 'en'],
+    supportedLngs: [...SUPPORTED_LANGUAGES],
    nonExplicitSupportedLngs: true,
    load: 'languageOnly',
    interpolation: {
@@ -0,0 +1,39 @@
+import { describe, expect, it } from 'vitest'
+import deJson from '../i18n/locales/de.json'
+import enJson from '../i18n/locales/en.json'
+import daJson from '../i18n/locales/da.json'
+import svJson from '../i18n/locales/sv.json'
+import nbJson from '../i18n/locales/nb.json'
+
+function collectKeys(obj: Record<string, unknown>, prefix = ''): string[] {
+  const keys: string[] = []
+  for (const [key, value] of Object.entries(obj)) {
+    const path = prefix ? `${prefix}.${key}` : key
+    if (value && typeof value === 'object' && !Array.isArray(value)) {
+      keys.push(...collectKeys(value as Record<string, unknown>, path))
+    } else {
+      keys.push(path)
+    }
+  }
+  return keys.sort()
+}
+
+const bundles = {
+  de: deJson.translation,
+  en: enJson.translation,
+  da: daJson.translation,
+  sv: svJson.translation,
+  nb: nbJson.translation
+} as const
+
+describe('i18n locale key parity', () => {
+  const masterKeys = collectKeys(bundles.de)
+
+  it.each(Object.keys(bundles).filter((lang) => lang !== 'de'))(
+    '%s has the same keys as de',
+    (lang) => {
+      const keys = collectKeys(bundles[lang as keyof typeof bundles])
+      expect(keys).toEqual(masterKeys)
+    }
+  )
+})
@@ -6,16 +6,36 @@
      "beta": "Beta",
      "beta_hint": "Beta-Version — Funktionen können sich noch ändern"
    },
+    "languages": {
+      "de": "Deutsch",
+      "en": "English",
+      "da": "Dansk",
+      "sv": "Svenska",
+      "nb": "Norsk"
+    },
+    "dialog": {
+      "ok": "OK",
+      "yes": "Ja",
+      "no": "Nein"
+    },
+    "errors": {
+      "load_failed": "Daten konnten nicht geladen werden.",
+      "save_failed": "Änderungen konnten nicht gespeichert werden.",
+      "delete_failed": "Löschen fehlgeschlagen.",
+      "export_failed": "Export fehlgeschlagen."
+    },
    "common": {
      "unsaved_changes_title": "Ungespeicherte Änderungen",
      "unsaved_changes_message": "Du hast ungespeicherte Änderungen. Möchtest du die Seite wirklich verlassen? Deine Änderungen gehen verloren.",
-      "unsaved_changes_leave": "Verlassen",
-      "unsaved_changes_stay": "Bleiben"
+      "unsaved_changes_stay": "Bleiben",
+      "unsaved_changes_save_leave": "Speichern & verlassen",
+      "unsaved_changes_discard": "Verwerfen",
+      "unsaved_changes_leave": "Verlassen"
    },
    "nav": {
      "dashboard": "Dashboard",
      "vessel": "Schiffsdaten",
-      "crew": "Crew-Liste",
+      "crew": "Crew",
      "deviation": "Ablenkungstabelle",
      "logs": "Logbucheinträge",
      "stats": "Statistik",
@@ -61,7 +81,12 @@
      "enter_pin_placeholder": "Gib deine PIN ein...",
      "decrypt_with_pin": "Entschlüsseln",
      "use_recovery_instead": "Stattdessen Wiederherstellungsschlüssel verwenden",
-      "error_incorrect_pin": "Falsche PIN. Entschlüsselung fehlgeschlagen."
+      "error_incorrect_pin": "Falsche PIN. Entschlüsselung fehlgeschlagen.",
+      "error_invalid_host": "Passkeys funktionieren nicht über 127.0.0.1. Bitte die App über localhost öffnen.",
+      "use_localhost_link": "Zu localhost wechseln",
+      "error_passkey_cancelled": "Passkey-Anmeldung abgebrochen oder abgelaufen. Bitte erneut versuchen.",
+      "error_invalid_rp_id": "Passkey-Domain passt nicht (RP ID). Lokal nur http://localhost:5173 mit RP_ID=localhost in .env verwenden.",
+      "error_session_incomplete": "Anmeldung unvollständig. Bitte erneut mit Passkey anmelden."
    },
    "pwa": {
      "title": "App installieren",
@@ -80,13 +105,18 @@
      "update_title": "Update verfügbar",
      "update_desc": "Eine neue Version von Kapteins Daagbok ist bereit. Bitte aktualisieren, um die neuesten Änderungen zu erhalten.",
      "update_now": "Jetzt aktualisieren",
-      "update_reloading": "Wird geladen…"
+      "update_reloading": "Wird geladen…",
+      "storage_persist_hint": "Der Browser kann Offline-Daten löschen. Erlaube dauerhafte Speicherung, damit dein Logbuch geschützt bleibt (in den Browser-Einstellungen oder beim nächsten Hinweis)."
    },
    "sync": {
      "status_synced": "Synchronisiert",
      "status_syncing": "Synchronisiere…",
      "status_offline": "Offline-Cache",
-      "status_unsynced": "Unsynchronisierte Änderungen"
+      "status_unsynced": "Unsynchronisierte Änderungen",
+      "conflict_title": "Synchronisationskonflikt",
+      "conflict_message": "{{count}} Änderung(en) konnten nicht synchronisiert werden (Eintrag {{id}}…). Bitte wähle, welche Version gelten soll.",
+      "conflict_use_server": "Server-Version übernehmen",
+      "conflict_keep_local": "Meine Version behalten"
    },
    "vessel": {
      "title": "Schiffs-Stammdaten",
@@ -117,7 +147,13 @@
      "no_sails": "Keine Segel hinterlegt.",
      "photo_add": "Foto hinzufügen",
      "photo_change": "Foto ändern",
-      "photo_delete": "Foto löschen"
+      "photo_delete": "Foto löschen",
+      "tanks_section": "Tanks (Fassungsvermögen)",
+      "tanks_help": "Optional in Liter — ermöglicht Slider im Journal bei bekannten Tankgrößen.",
+      "freshwater_capacity_l": "Trinkwasser (Liter)",
+      "fuel_capacity_l": "Treibstoff (Liter)",
+      "greywater_capacity_l": "Grauwasser (Liter)",
+      "invalid_tank_liters": "Ungültiger Zahlenwert — bitte Liter als Zahl eingeben (z. B. 200)."
    },
    "logs": {
      "title": "Logbuch-Journal",
@@ -132,12 +168,17 @@
      "sign_cleared_skipper_re_sign_title": "Skipper-Unterschrift entfernt",
      "sign_cleared_skipper_re_sign": "Das Ereignisprotokoll wurde geändert. Die Skipper-Unterschrift wurde entfernt. Bitte erneut freigeben.",
      "date": "Datum",
-      "day_of_travel": "Tag der Reise / Reisetag",
+      "day_of_travel": "Reisetag",
+      "travel_day_number": "Reisetag {{number}}",
      "departure": "Start-Hafen (Reise von)",
      "destination": "Ziel-Hafen (nach)",
      "route": "Reise von/nach",
      "freshwater": "Frischwasser (Liter)",
      "fuel": "Treibstoff / Fuel (Liter)",
+      "greywater": "Grauwasser (Liter)",
+      "greywater_level": "Füllstand",
+      "tank_slider_of_max": "{{current}} / {{max}} L",
+      "tank_capacity_tooltip": "Wenn in den Schiffsdaten die Tank-Fassungsvermögen (Liter) hinterlegt sind, kannst du Füllstände hier per Slider eingeben.",
      "morning": "Stand morgens",
      "refilled": "Nachgefüllt",
      "evening": "Stand abends",
@@ -180,10 +221,102 @@
      "saving": "Wird gespeichert...",
      "saved": "Logbuchseite erfolgreich gespeichert!",
      "loading": "Journal wird geladen...",
+      "view_mode_label": "Ansicht",
+      "view_list": "Liste",
+      "live_mode": "Live",
+      "live_title": "Live-Journal",
+      "live_loading": "Live-Journal wird geladen...",
+      "live_retry": "Erneut versuchen",
+      "live_load_error": "Live-Journal konnte nicht geladen werden.",
+      "live_action_error": "Eintrag konnte nicht gespeichert werden.",
+      "live_open_editor": "Vollständiger Editor",
+      "live_actions_label": "Schnellaktionen",
+      "live_stream_label": "Ereignisprotokoll",
+      "live_stream_title": "Journal",
+      "live_no_events": "Noch keine Einträge — tippe auf eine Aktion.",
+      "live_motor_start": "Motor Start",
+      "live_motor_stop": "Motor Stop",
+      "live_cast_off": "Ablegen",
+      "live_moor": "Anlegen",
+      "live_sails_btn": "Segel",
+      "live_sails_pick": "Segel auswählen",
+      "live_sails_pick_hint": "Mehrere Segel antippen (erneut antippen zum Abwählen), dann Eintragen.",
+      "live_sails_selected": "Auswahl: {{sails}}",
+      "live_sails_confirm": "Eintragen",
+      "live_sails_confirm_count": "Eintragen ({{count}})",
+      "live_sails": "Segel: {{sails}}",
+      "live_fix": "Fix",
+      "live_fix_coords": "Fix {{lat}}, {{lng}}",
+      "live_fix_manual_hint": "GPS nicht verfügbar. Breiten- und Längengrad manuell eingeben oder erneut per GPS-Knopf versuchen.",
+      "live_fix_gps_loading": "GPS-Position wird ermittelt…",
+      "live_fix_invalid": "Bitte gültige Koordinaten eingeben (Breite −90…90, Länge −180…180).",
+      "live_fix_lat_placeholder": "Breite (Lat)",
+      "live_fix_lng_placeholder": "Länge (Lng)",
+      "live_photo_btn": "Foto (Kamera)",
+      "live_photo_capture_btn": "Aufnehmen",
+      "live_photo_save_btn": "Speichern",
+      "live_photo_retake_btn": "Neu aufnehmen",
+      "live_photo_capture_failed": "Aufnahme fehlgeschlagen. Bitte erneut versuchen.",
+      "live_photo_open_camera_btn": "Kamera öffnen",
+      "live_photo_native_hint": "Foto mit der Gerätekamera aufnehmen und anschließend hier speichern.",
+      "live_photo_camera_starting": "Kamera wird gestartet…",
+      "live_photo_camera_denied": "Kamerazugriff verweigert oder nicht verfügbar.",
+      "live_photo_camera_unavailable": "Kamera wird von diesem Browser nicht unterstützt.",
+      "live_photo_error": "Foto konnte nicht gespeichert werden.",
+      "live_photo_entry": "Foto: {{caption}}",
+      "live_photo_entry_plain": "Foto aufgenommen",
+      "live_undo_photo_hint": "Foto gespeichert",
+      "live_comment_btn": "Kommentar",
+      "live_comment_placeholder": "Freitext eingeben…",
+      "live_comment_confirm": "Eintragen",
+      "live_gps_error": "GPS-Position konnte nicht ermittelt werden.",
+      "live_gps_start_hint": "Beginne deine Tagesreise immer mit einem Standort.",
+      "live_event_generic": "Ereignis",
+      "live_weather_btn": "Wetter",
+      "live_weather_owm_btn": "OpenWeatherMap Wetter abrufen",
+      "live_weather_owm_loading": "Wetter wird geladen…",
+      "live_weather_fix_required": "Für Wetter von OpenWeatherMap zuerst einen GPS-Fix eintragen (Schaltfläche „Fix“). Die Position darf höchstens 6 Stunden alt sein.",
+      "live_weather_fix_stale": "Der letzte GPS-Fix ist älter als 6 Stunden. Bitte erneut einen Fix loggen, bevor du Wetter abrufst.",
+      "live_wind_btn": "Wind",
+      "live_temp_btn": "T °C",
+      "live_pressure_btn": "Luftdruck",
+      "live_precip_btn": "Niederschlag",
+      "live_sea_state_btn": "Seegang",
+      "live_visibility_btn": "Sichtweite",
+      "live_course_btn": "Kurs",
+      "live_fuel_btn": "Diesel",
+      "live_water_btn": "Wasser",
+      "live_wind_entry": "Wind {{value}}",
+      "live_temp_entry": "Temperatur {{temp}} °C",
+      "live_pressure_entry": "Luftdruck {{value}} hPa",
+      "live_precip_entry": "Niederschlag {{value}}",
+      "live_sea_state_entry": "Seegang {{value}}",
+      "live_visibility_entry": "Sichtweite {{value}}",
+      "live_course_entry": "Kurs {{course}}",
+      "live_fuel_entry": "Diesel +{{liters}} L",
+      "live_water_entry": "Wasser +{{liters}} L",
+      "live_auto_position": "Auto-Position",
+      "live_undo_hint": "Eintrag gespeichert",
+      "live_undo_btn": "Rückgängig",
+      "live_pressure_placeholder": "z. B. 1013",
+      "live_temp_placeholder": "z. B. 18",
+      "live_precip_placeholder": "z. B. leichter Regen",
+      "live_sea_state_placeholder": "z. B. 3",
+      "live_visibility_placeholder": "z. B. 10 km",
+      "live_course_placeholder": "z. B. 245",
+      "live_fuel_placeholder": "Nachgefüllte Liter",
+      "live_water_placeholder": "Nachgefüllte Liter",
+      "live_sog_btn": "SOG",
+      "live_stw_btn": "STW",
+      "live_sog_entry": "SOG {{speed}} kn",
+      "live_stw_entry": "STW {{speed}} kn",
+      "live_sog_placeholder": "z. B. 5,2",
+      "live_stw_placeholder": "z. B. 4,8",
+      "live_sog_hint": "Fahrt über Grund (kn) — GPS-Wert wird vorgefüllt, wenn verfügbar.",
      "delete_entry": "Tag löschen",
      "delete_confirm": "Bist du sicher, dass du diesen Reisetag unwiderruflich löschen möchtest?",
      "carry_over_tanks_title": "Daten vom Vortag übernehmen?",
-      "carry_over_tanks_confirm": "Start-Hafen, Frischwasser- und Kraftstoff-Morgenstände vom letzten Reisetag übernehmen?\n\nStart-Hafen: {{departure}}\nFrischwasser: {{fw}} L\nKraftstoff: {{fuel}} L",
+      "carry_over_tanks_confirm": "Start-Hafen, Frischwasser-, Kraftstoff- und Grauwasser-Startstände vom letzten Reisetag übernehmen?\n\nStart-Hafen: {{departure}}\nFrischwasser: {{fw}} L\nKraftstoff: {{fuel}} L\nGrauwasser: {{greywater}} L",
      "carry_over_tanks_yes": "Übernehmen",
      "carry_over_tanks_no": "Mit 0 starten",
      "event_title": "Chronologisches Ereignisprotokoll",
@@ -211,6 +344,12 @@
      "event_wind_direction": "Wind-Richtung",
      "event_wind_strength": "Windstärke",
      "event_sea_state": "Seegang",
+      "event_visibility": "Sichtweite",
+      "event_visibility_placeholder": "z. B. 10 km",
+      "weather_slider_unset": "—",
+      "weather_slider_pressure": "{{value}} hPa",
+      "weather_slider_sea_state": "Stufe {{value}}",
+      "weather_slider_heel": "{{value}}°",
      "event_weather": "Wetter",
      "event_log": "Logge (sm)",
      "event_gps": "GPS-Position",
@@ -219,6 +358,7 @@
      "event_remarks": "Bemerkungen / Vorkommnisse",
      "gps_btn": "GPS-Koordinaten abrufen",
      "weather_btn": "OpenWeatherMap Wetter abrufen",
+      "weather_offline": "OpenWeatherMap erfordert eine Internetverbindung. Du bist derzeit offline.",
      "event_wind_pressure": "Luftdruck (hPa)",
      "event_heel": "Krängung (°)",
      "event_sails": "Segelführung / Motor",
@@ -232,6 +372,17 @@
      "share_csv": "CSV teilen",
      "export_pdf": "PDF herunterladen",
      "exporting_pdf": "PDF wird generiert...",
+      "ai_summary_title": "KI-Zusammenfassung",
+      "ai_summary_empty": "Noch keine Zusammenfassung vorhanden.",
+      "ai_summary_generate": "Zusammenfassung generieren",
+      "ai_summary_regenerate": "Neu generieren",
+      "ai_summary_generating": "Wird generiert…",
+      "ai_summary_attempts_remaining": "Noch {{remaining}} von {{max}} Versuchen",
+      "ai_summary_error": "KI-Zusammenfassung fehlgeschlagen. Bitte später erneut versuchen.",
+      "ai_summary_error_no_key": "Kein OpenRouter API-Schlüssel auf dem Server konfiguriert.",
+      "ai_summary_error_rate_limited": "Maximale Anzahl an Generierungen für diesen Reisetag erreicht.",
+      "ai_summary_error_forbidden": "Nur der Skipper darf KI-Zusammenfassungen generieren.",
+      "ai_summary_offline": "Die KI-Zusammenfassung erfordert eine Internetverbindung. Du bist derzeit offline.",
      "photos_title": "Foto-Anhänge (E2E-verschlüsselt)",
      "photo_caption_label": "Foto-Beschreibung / Label (Optional)",
      "photo_caption_placeholder": "z.B. Segel setzen nahe Hafeneinfahrt",
@@ -256,6 +407,56 @@
      "track_map_end": "Ziel",
      "track_map_speed_slow": "langsam",
      "track_map_speed_fast": "schnell",
+      "nmea_import_title": "NMEA-Protokoll importieren",
+      "nmea_import_intro": "Lade eine .nmea-Datei vom Bord-Logger. Die App schlägt Journal-Einträge vor — du entscheidest, was übernommen wird.",
+      "nmea_import_btn": "NMEA importieren",
+      "nmea_file_label": "NMEA-Datei",
+      "nmea_stats": "{{lines}} Sätze erkannt · Typen: {{types}}",
+      "nmea_warn_no_position": "Keine Positions-Sätze gefunden — Track und GPS-Felder können leer bleiben.",
+      "nmea_warn_duplicate_file": "Diese NMEA-Datei wurde bereits importiert. Ein erneuter Import derselben Datei fügt doppelte Journal-Einträge hinzu.",
+      "nmea_mode_label": "Journal-Einträge erzeugen",
+      "nmea_mode_interval": "Nach Zeitintervall",
+      "nmea_mode_change": "Bei signifikanter Änderung",
+      "nmea_mode_both": "Beides (zusammenführen)",
+      "nmea_interval_label": "Intervall (Minuten)",
+      "nmea_import_track": "GPS-Track aus NMEA übernehmen",
+      "nmea_preview": "Vorschau",
+      "nmea_preview_hint": "{{count}} vorgeschlagene Journal-Einträge",
+      "nmea_select_all": "Alle auswählen",
+      "nmea_select_none": "Keine auswählen",
+      "nmea_source_interval": "Intervall",
+      "nmea_source_change": "Ereignis",
+      "nmea_apply": "In Journal übernehmen",
+      "nmea_back": "Zurück",
+      "nmea_cancel": "Abbrechen",
+      "nmea_archive_question": "Rohprotokoll lokal archivieren? (Nur auf diesem Gerät, nicht synchronisiert.)",
+      "nmea_archive_keep": "Archivieren",
+      "nmea_archive_discard": "Verwerfen",
+      "nmea_archive_stored": "NMEA archiviert: {{name}}",
+      "nmea_archive_delete_confirm": "Archiviertes NMEA-Protokoll von diesem Gerät löschen?",
+      "nmea_error_no_samples": "Keine verwertbaren NMEA-Sätze in der Datei.",
+      "nmea_error_parse": "NMEA-Datei konnte nicht gelesen werden.",
+      "nmea_error_read": "Datei konnte nicht gelesen werden.",
+      "nmea_error_no_file": "Bitte zuerst eine NMEA-Datei wählen.",
+      "nmea_error_no_selection": "Bitte mindestens einen Journal-Eintrag auswählen.",
+      "nmea_remark_interval": "NMEA Intervall",
+      "nmea_remark_uncertain": "unsicher",
+      "nmea_remark_depth": "Tiefe {{depth}} m",
+      "nmea_change_course": "Kursänderung {{from}}° → {{to}}°",
+      "nmea_change_wind": "Wind {{from}}° → {{to}}°",
+      "nmea_change_wind_speed": "Wind {{from}} → {{to}} kn",
+      "nmea_change_pressure": "Luftdruck {{from}} → {{to}} hPa",
+      "nmea_change_depth": "Tiefe {{from}} → {{to}} m",
+      "nmea_change_engine_start": "Motor an ({{rpm}} U/min)",
+      "nmea_change_engine_stop": "Motor aus",
+      "nmea_change_autopilot_on": "Autopilot ein",
+      "nmea_change_autopilot_off": "Autopilot aus",
+      "nmea_change_gps_lost": "GPS-Fix verloren",
+      "nmea_change_gps_regained": "GPS-Fix wiederhergestellt",
+      "nmea_change_water_temp": "Wassertemp. {{from}} → {{to}} °C",
+      "nmea_change_departure": "Abfahrt / Fahrtbeginn",
+      "nmea_change_anchor": "Ankern / Stop",
+      "nmea_change_speed": "Geschw. {{from}} → {{to}} kn",
      "track_map_error": "Karte konnte nicht geladen werden.",
      "exporting": "Exportiere...",
      "share_unsupported": "Teilen wird auf diesem Gerät nicht unterstützt. Datei wurde stattdessen heruntergeladen.",
@@ -291,10 +492,27 @@
      "role_read": "Nur Lesen",
      "role_read_hint": "Geteiltes Logbuch — nur Ansicht, keine Bearbeitung",
      "open_profile": "Profil von {{name}} öffnen",
+      "open_logbook": "Logbuch „{{title}}“ öffnen",
      "edit_title": "Logbuch umbenennen",
      "edit_placeholder": "Neuer Name des Logbuchs",
      "edit_success": "Logbuch erfolgreich umbenannt",
-      "edit_btn": "Umbenennen"
+      "edit_btn": "Umbenennen",
+      "filter_label": "Logbücher filtern",
+      "filter_placeholder": "Name, Jahr, Datum, Crew oder Schiff …",
+      "filter_clear": "Filter zurücksetzen",
+      "filter_results": "{{count}} Treffer",
+      "filter_no_results": "Keine Logbücher passen zu deiner Suche. Probiere einen anderen Namen oder ein anderes Jahr.",
+      "sort_label": "Sortieren",
+      "sort_by_label": "Sortieren nach",
+      "sort_by_name": "Name",
+      "sort_by_date": "Datum",
+      "sort_dir_label": "Reihenfolge",
+      "sort_asc": "Aufsteigend",
+      "sort_desc": "Absteigend",
+      "sort_name_asc": "Name A bis Z",
+      "sort_name_desc": "Name Z bis A",
+      "sort_date_asc": "Älteste zuerst",
+      "sort_date_desc": "Neueste zuerst"
    },
    "profile": {
      "title": "Benutzerprofil",
@@ -411,7 +629,72 @@
      "push_unsupported": "Push-Benachrichtigungen werden in diesem Browser nicht unterstützt.",
      "push_denied_hint": "Benachrichtigungen sind blockiert. Erlaube sie in den Browser- oder Geräteeinstellungen.",
      "push_ios_install_hint": "Auf dem iPhone/iPad: App zum Home-Bildschirm hinzufügen (iOS 16.4+), um Push zu nutzen.",
-      "push_error": "Push-Benachrichtigungen konnten nicht aktiviert werden."
+      "push_error": "Push-Benachrichtigungen konnten nicht aktiviert werden.",
+      "sections": {
+        "account": "Konto & Einstellungen",
+        "fleet": "Flotte & Crew",
+        "security": "Sicherheit & Gerät",
+        "stats": "Statistik",
+        "danger": "Gefahrenzone"
+      }
+    },
+    "vessel_pool": {
+      "title": "Schiffsflotte",
+      "section_title": "Deine Schiffe",
+      "subtitle": "Pflege hier alle Schiffe für deine Logbücher. Pro Logbuch wählst du das aktive Schiff aus dieser Liste.",
+      "loading": "Schiffsflotte wird geladen…",
+      "add_vessel": "Schiff hinzufügen",
+      "edit_vessel": "Schiff bearbeiten",
+      "no_vessels": "Noch keine Schiffe im Pool.",
+      "delete_confirm": "Dieses Schiff wirklich aus der Flotte entfernen?",
+      "max_vessels": "Maximale Anzahl von 20 Schiffen im Pool erreicht."
+    },
+    "logbook_vessel": {
+      "title": "Schiff für dieses Logbuch",
+      "subtitle": "Wähle das Schiff für dieses Logbuch. Reisetage nutzen Segel- und Tankdaten des gewählten Schiffs.",
+      "active_vessel": "Schiff für dieses Logbuch",
+      "no_vessels_in_pool": "Kein Schiff in der Flotte – zuerst im Benutzerprofil anlegen.",
+      "no_vessel": "Kein Schiff gewählt",
+      "unnamed": "Unbenannt",
+      "save": "Schiff speichern",
+      "saved": "Schiff für das Logbuch gespeichert.",
+      "selection_only_hint": "Du siehst das vom Eigner gewählte Schiff (geteiltes Logbuch).",
+      "manage_in_profile": "Schiffe im Benutzerprofil verwalten"
+    },
+    "person_pool": {
+      "title": "Stammcrew & Skipper",
+      "subtitle": "Lege hier deinen Personen-Pool an – Skipper und Crew für alle Logbücher. Aus diesem Pool wählst du pro Logbuch und Reisetag die aktive Crew.",
+      "loading": "Personen-Pool wird geladen…",
+      "skippers_section": "Stammskipper",
+      "crew_section": "Stammcrew",
+      "add_skipper": "Skipper hinzufügen",
+      "add_crew": "Crew-Mitglied hinzufügen",
+      "edit_skipper": "Skipper bearbeiten",
+      "no_skippers": "Noch kein Skipper im Pool.",
+      "no_crew": "Noch keine Crew-Mitglieder im Pool.",
+      "delete_confirm": "Diese Person wirklich aus dem Pool entfernen?"
+    },
+    "logbook_crew": {
+      "title": "Crew für dieses Logbuch",
+      "subtitle": "Wähle Skipper und Crew für dieses Logbuch. Neue Reisetage übernehmen diese Auswahl standardmäßig.",
+      "loading": "Crew wird geladen…",
+      "active_skipper": "Skipper für dieses Logbuch",
+      "active_crew": "Crew für dieses Logbuch",
+      "no_skippers_in_pool": "Kein Skipper im Pool – zuerst im Benutzerprofil anlegen.",
+      "no_crew_in_pool": "Keine Crew im Pool – zuerst im Benutzerprofil anlegen.",
+      "no_skipper": "Kein Skipper gewählt",
+      "unnamed": "Unbenannt",
+      "save": "Crew speichern",
+      "saved": "Crew für das Logbuch gespeichert.",
+      "selection_only_hint": "Du siehst die vom Eigner festgelegte Crew (geteiltes Logbuch)."
+    },
+    "entry_crew": {
+      "title": "Crew an diesem Reisetag",
+      "subtitle": "Kann vom Logbuch-Standard abweichen. Folge-Reisetage übernehmen den Vortag.",
+      "day_skipper": "Skipper an diesem Tag",
+      "day_crew": "Crew an diesem Tag",
+      "no_skipper": "Kein Skipper gewählt",
+      "no_crew": "Keine Crew gewählt"
    },
    "crew": {
      "title": "Skipper- & Crew-Profile",
@@ -421,7 +704,7 @@
      "add_crew": "Crew-Mitglied hinzufügen",
      "edit_crew": "Crew-Mitglied bearbeiten",
      "no_crew": "Noch keine Crew-Mitglieder hinzugefügt.",
-      "max_crew": "Maximale Anzahl von 5 Crew-Mitgliedern erreicht.",
+      "max_crew": "Maximale Anzahl von 12 Crew-Mitgliedern im Pool erreicht.",
      "name": "Name",
      "address": "Anschrift",
      "birthdate": "Geburtstag",
@@ -462,6 +745,8 @@
      "share_enable": "Öffentlichen Link aktivieren",
      "share_copied": "Link kopiert!",
      "share_copy_btn": "Link kopieren",
+      "link_qr_hint": "QR-Code zum Scannen mit dem Smartphone",
+      "link_qr_alt": "QR-Code für den Link",
      "danger_zone_title": "Gefahrenzone",
      "danger_zone_desc": "Durch das Löschen deines Kontos werden alle deine Passkeys, Logbücher, Schiffsdaten, Crew-Profile, Reiseeinträge und E2E-Schlüssel unwiderruflich gelöscht. Diese Aktion kann nicht rückgängig gemacht werden.",
      "delete_account_btn": "Konto unwiderruflich löschen",
@@ -472,6 +757,12 @@
      "delete_account_failed": "Konto konnte nicht gelöscht werden. Bitte versuche es erneut.",
      "delete_backup_hint": "Tipp: Erstelle vor dem Löschen Backups deiner Logbücher (.daagbok.json) in den Einstellungen jedes Logbuchs.",
      "deleting_account": "Konto wird gelöscht…",
+      "invite_push_prompt_title": "Push-Benachrichtigungen aktivieren?",
+      "invite_push_prompt_message": "Sobald eingeladene Crewmitglieder Änderungen synchronisieren, kannst du per Push informiert werden. Es werden keine Logbuch-Inhalte im Klartext gesendet.",
+      "invite_push_prompt_ios_message": "Sobald Crewmitglieder Änderungen synchronisieren, kannst du per Push informiert werden. Auf dem iPhone/iPad: App zum Home-Bildschirm hinzufügen (iOS 16.4+), dann Push im Benutzerprofil aktivieren.",
+      "invite_push_prompt_enable": "Jetzt aktivieren",
+      "invite_push_prompt_later": "Später",
+      "invite_push_prompt_success": "Push-Benachrichtigungen sind auf diesem Gerät aktiv.",
      "backup_title": "Backup & Wiederherstellung",
      "backup_desc": "Vollständiges verschlüsseltes Backup dieses Logbuchs (Einträge, Fotos, GPS-Tracks, Crew, Schiff). Mit Backup-Passphrase geschützt — für Restore auf diesem oder einem neuen Account.",
      "backup_export_title": "Backup erstellen",
@@ -535,6 +826,7 @@
      "category_general": "Allgemein",
      "category_bug": "Fehler melden",
      "category_feature": "Feature-Wunsch",
+      "category_translation": "Übersetzungsfehler",
      "contact_label": "E-Mail (optional)",
      "contact_placeholder": "deine@email.beispiel",
      "message_label": "Nachricht",
@@ -623,7 +915,13 @@
      "unit_l": "L",
      "day_label": "Tag {{day}}",
      "account_logbooks": "Logbücher im Überblick",
-      "col_logbook": "Logbuch"
+      "col_logbook": "Logbuch",
+      "event_series_title": "Ereignis-Verläufe",
+      "event_series_hint": "Chronologische Werte aus dem Ereignisprotokoll.",
+      "event_series_pressure": "Luftdruck",
+      "event_series_wind": "Wind",
+      "event_series_motor": "Motor",
+      "event_series_empty": "Keine Einträge vorhanden."
    },
    "tour": {
      "skip": "Tour überspringen",
@@ -638,7 +936,7 @@
        },
        "welcome_public": {
          "title": "Willkommen an Bord!",
-          "body": "Erkunde unser Demo-Logbuch mit drei Reisetagen in der Kieler Förde – ganz ohne Account. Diese kurze Tour zeigt dir Schiffsdaten, Crew und Logbucheinträge."
+          "body": "Erkunde unser Demo-Logbuch mit drei Reisetagen in der Kieler Förde – ganz ohne Account. Die Tour zeigt dir Logbucheinträge, die Schiff- und Crew-Auswahl für dieses Logbuch. Flotte und Stammcrew pflegst du später im Benutzerprofil."
        },
        "nav_logs": {
          "title": "Logbucheinträge",
@@ -657,12 +955,20 @@
          "body": "Lade GPX-Dateien hoch oder sieh bereits gespeicherte Routen auf der Karte – inklusive Distanz und Geschwindigkeit."
        },
        "nav_vessel": {
-          "title": "Schiffsdaten",
-          "body": "Hinterlege Name, Maße und technische Daten deiner Yacht – einmal ausfüllen, für alle Reisetage verfügbar."
+          "title": "Schiff fürs Logbuch",
+          "body": "Wähle aus deiner Schiffsflotte das Schiff für dieses Logbuch. Schiffe pflegst du im Benutzerprofil unter Flotte & Crew."
        },
-        "nav_crew": {
-          "title": "Crew-Liste",
-          "body": "Verwalte Besatzungsmitglieder und weise sie später Reisetagen zu."
+        "profile_vessel_pool": {
+          "title": "Schiffsflotte",
+          "body": "Im Benutzerprofil legst du alle deine Schiffe an – Charteryachten, eigenes Boot usw. Pro Logbuch wählst du dann das passende Schiff."
+        },
+        "profile_crew_pool": {
+          "title": "Stammcrew & Skipper",
+          "body": "Im Benutzerprofil pflegst du deinen Personen-Pool – mehrere Skipper (z. B. Charter) und Crew-Mitglieder für alle Logbücher."
+        },
+        "nav_logbook_crew": {
+          "title": "Crew pro Logbuch",
+          "body": "Wähle aus dem Pool, wer auf diesem Logbuch als Skipper und Crew gilt. Reisetage übernehmen diese Auswahl standardmäßig."
        },
        "nav_stats": {
          "title": "Statistik-Dashboard",
@@ -6,16 +6,36 @@
      "beta": "Beta",
      "beta_hint": "Beta release — features may still change"
    },
+    "languages": {
+      "de": "Deutsch",
+      "en": "English",
+      "da": "Dansk",
+      "sv": "Svenska",
+      "nb": "Norsk"
+    },
+    "dialog": {
+      "ok": "OK",
+      "yes": "Yes",
+      "no": "No"
+    },
+    "errors": {
+      "load_failed": "Could not load data.",
+      "save_failed": "Could not save changes.",
+      "delete_failed": "Could not delete.",
+      "export_failed": "Export failed."
+    },
    "common": {
      "unsaved_changes_title": "Unsaved changes",
      "unsaved_changes_message": "You have unsaved changes. Leave this page anyway? Your changes will be lost.",
-      "unsaved_changes_leave": "Leave",
-      "unsaved_changes_stay": "Stay"
+      "unsaved_changes_stay": "Stay",
+      "unsaved_changes_save_leave": "Save & leave",
+      "unsaved_changes_discard": "Discard",
+      "unsaved_changes_leave": "Leave"
    },
    "nav": {
      "dashboard": "Dashboard",
      "vessel": "Vessel Profile",
-      "crew": "Crew List",
+      "crew": "Crew",
      "deviation": "Deviation Table",
      "logs": "Logbook Entries",
      "stats": "Statistics",
@@ -61,7 +81,12 @@
      "enter_pin_placeholder": "Enter your PIN...",
      "decrypt_with_pin": "Decrypt",
      "use_recovery_instead": "Use recovery phrase instead",
-      "error_incorrect_pin": "Incorrect PIN. Decryption failed."
+      "error_incorrect_pin": "Incorrect PIN. Decryption failed.",
+      "error_invalid_host": "Passkeys do not work on 127.0.0.1. Please open the app via localhost.",
+      "use_localhost_link": "Switch to localhost",
+      "error_passkey_cancelled": "Passkey sign-in was cancelled or timed out. Please try again.",
+      "error_invalid_rp_id": "Passkey domain mismatch (RP ID). For local dev use http://localhost:5173 with RP_ID=localhost in .env.",
+      "error_session_incomplete": "Sign-in incomplete. Please sign in with your passkey again."
    },
    "pwa": {
      "title": "Install app",
@@ -80,13 +105,18 @@
      "update_title": "Update available",
      "update_desc": "A new version of Kapteins Daagbok is ready. Reload to get the latest changes.",
      "update_now": "Reload now",
-      "update_reloading": "Reloading…"
+      "update_reloading": "Reloading…",
+      "storage_persist_hint": "Your browser may delete offline data. Allow persistent storage to keep your logbook safe (browser settings or when prompted)."
    },
    "sync": {
      "status_synced": "Synced",
      "status_syncing": "Syncing…",
      "status_offline": "Offline Cache",
-      "status_unsynced": "Unsynced changes"
+      "status_unsynced": "Unsynced changes",
+      "conflict_title": "Sync conflict",
+      "conflict_message": "{{count}} change(s) could not be synced (entry {{id}}…). Choose which version to keep.",
+      "conflict_use_server": "Use server version",
+      "conflict_keep_local": "Keep my version"
    },
    "vessel": {
      "title": "Vessel Master Data",
@@ -117,7 +147,13 @@
      "no_sails": "No sails defined.",
      "photo_add": "Add Photo",
      "photo_change": "Change Photo",
-      "photo_delete": "Delete Photo"
+      "photo_delete": "Delete Photo",
+      "tanks_section": "Tanks (capacity)",
+      "tanks_help": "Optional, in liters — enables sliders in the journal when tank sizes are known.",
+      "freshwater_capacity_l": "Freshwater (liters)",
+      "fuel_capacity_l": "Fuel (liters)",
+      "greywater_capacity_l": "Greywater (liters)",
+      "invalid_tank_liters": "Invalid number — please enter capacity in liters (e.g. 200)."
    },
    "logs": {
      "title": "Logbook Journal",
@@ -132,12 +168,17 @@
      "sign_cleared_skipper_re_sign_title": "Skipper signature removed",
      "sign_cleared_skipper_re_sign": "The event log was changed. The skipper signature was removed. Please sign again.",
      "date": "Date",
-      "day_of_travel": "Day of Travel",
+      "day_of_travel": "Travel day",
+      "travel_day_number": "Travel day {{number}}",
      "departure": "Departure Port (von)",
      "destination": "Destination Port (nach)",
      "route": "Route / Journey",
      "freshwater": "Freshwater (Liters)",
      "fuel": "Fuel (Liters)",
+      "greywater": "Greywater (Liters)",
+      "greywater_level": "Fill level",
+      "tank_slider_of_max": "{{current}} / {{max}} L",
+      "tank_capacity_tooltip": "If tank capacities (liters) are set in vessel master data, you can enter fill levels here using sliders.",
      "morning": "Morning Level",
      "refilled": "Refilled",
      "evening": "Evening Level",
@@ -180,10 +221,102 @@
      "saving": "Saving...",
      "saved": "Logbook page saved successfully!",
      "loading": "Loading journal...",
+      "view_mode_label": "View",
+      "view_list": "List",
+      "live_mode": "Live",
+      "live_title": "Live Journal",
+      "live_loading": "Loading live journal...",
+      "live_retry": "Try again",
+      "live_load_error": "Could not load live journal.",
+      "live_action_error": "Could not save entry.",
+      "live_open_editor": "Full editor",
+      "live_actions_label": "Quick actions",
+      "live_stream_label": "Event log",
+      "live_stream_title": "Journal",
+      "live_no_events": "No entries yet — tap an action.",
+      "live_motor_start": "Engine Start",
+      "live_motor_stop": "Engine Stop",
+      "live_cast_off": "Cast off",
+      "live_moor": "Moor",
+      "live_sails_btn": "Sails",
+      "live_sails_pick": "Select sails",
+      "live_sails_pick_hint": "Tap multiple sails (tap again to deselect), then log.",
+      "live_sails_selected": "Selected: {{sails}}",
+      "live_sails_confirm": "Log entry",
+      "live_sails_confirm_count": "Log entry ({{count}})",
+      "live_sails": "Sails: {{sails}}",
+      "live_fix": "Fix",
+      "live_fix_coords": "Fix {{lat}}, {{lng}}",
+      "live_fix_manual_hint": "GPS unavailable. Enter latitude and longitude manually, or try again with the GPS button.",
+      "live_fix_gps_loading": "Getting GPS position…",
+      "live_fix_invalid": "Please enter valid coordinates (latitude −90…90, longitude −180…180).",
+      "live_fix_lat_placeholder": "Latitude (Lat)",
+      "live_fix_lng_placeholder": "Longitude (Lng)",
+      "live_photo_btn": "Photo (camera)",
+      "live_photo_capture_btn": "Capture",
+      "live_photo_save_btn": "Save",
+      "live_photo_retake_btn": "Retake",
+      "live_photo_capture_failed": "Capture failed. Please try again.",
+      "live_photo_open_camera_btn": "Open camera",
+      "live_photo_native_hint": "Take a photo with your device camera, then save it here.",
+      "live_photo_camera_starting": "Starting camera…",
+      "live_photo_camera_denied": "Camera access denied or unavailable.",
+      "live_photo_camera_unavailable": "Camera is not supported in this browser.",
+      "live_photo_error": "Could not save photo.",
+      "live_photo_entry": "Photo: {{caption}}",
+      "live_photo_entry_plain": "Photo captured",
+      "live_undo_photo_hint": "Photo saved",
+      "live_comment_btn": "Comment",
+      "live_comment_placeholder": "Enter text…",
+      "live_comment_confirm": "Log entry",
+      "live_gps_error": "Could not determine GPS position.",
+      "live_gps_start_hint": "Always start your day's voyage with a position fix.",
+      "live_event_generic": "Event",
+      "live_weather_btn": "Weather",
+      "live_weather_owm_btn": "Fetch OpenWeatherMap weather",
+      "live_weather_owm_loading": "Loading weather…",
+      "live_weather_fix_required": "Log a GPS fix first (Fix button) to fetch OpenWeatherMap weather. The position must be at most 6 hours old.",
+      "live_weather_fix_stale": "The last GPS fix is older than 6 hours. Log a new fix before fetching weather.",
+      "live_wind_btn": "Wind",
+      "live_temp_btn": "Temp °C",
+      "live_pressure_btn": "Pressure",
+      "live_precip_btn": "Precipitation",
+      "live_sea_state_btn": "Sea state",
+      "live_visibility_btn": "Visibility",
+      "live_course_btn": "Course",
+      "live_fuel_btn": "Fuel",
+      "live_water_btn": "Water",
+      "live_wind_entry": "Wind {{value}}",
+      "live_temp_entry": "Temperature {{temp}} °C",
+      "live_pressure_entry": "Pressure {{value}} hPa",
+      "live_precip_entry": "Precipitation {{value}}",
+      "live_sea_state_entry": "Sea state {{value}}",
+      "live_visibility_entry": "Visibility {{value}}",
+      "live_course_entry": "Course {{course}}",
+      "live_fuel_entry": "Fuel +{{liters}} L",
+      "live_water_entry": "Water +{{liters}} L",
+      "live_auto_position": "Auto position",
+      "live_undo_hint": "Entry saved",
+      "live_undo_btn": "Undo",
+      "live_pressure_placeholder": "e.g. 1013",
+      "live_temp_placeholder": "e.g. 18",
+      "live_precip_placeholder": "e.g. light rain",
+      "live_sea_state_placeholder": "e.g. 3",
+      "live_visibility_placeholder": "e.g. 10 km",
+      "live_course_placeholder": "e.g. 245",
+      "live_fuel_placeholder": "Liters refilled",
+      "live_water_placeholder": "Liters refilled",
+      "live_sog_btn": "SOG",
+      "live_stw_btn": "STW",
+      "live_sog_entry": "SOG {{speed}} kn",
+      "live_stw_entry": "STW {{speed}} kn",
+      "live_sog_placeholder": "e.g. 5.2",
+      "live_stw_placeholder": "e.g. 4.8",
+      "live_sog_hint": "Speed over ground (kn) — prefilled from GPS when available.",
      "delete_entry": "Delete Day",
      "delete_confirm": "Are you sure you want to permanently delete this travel day?",
      "carry_over_tanks_title": "Carry over from previous day?",
-      "carry_over_tanks_confirm": "Use the previous travel day's destination as departure port and closing tank levels as morning levels?\n\nDeparture port: {{departure}}\nFreshwater: {{fw}} L\nFuel: {{fuel}} L",
+      "carry_over_tanks_confirm": "Use the previous travel day's destination as departure port and closing tank levels as morning levels?\n\nDeparture port: {{departure}}\nFreshwater: {{fw}} L\nFuel: {{fuel}} L\nGreywater: {{greywater}} L",
      "carry_over_tanks_yes": "Carry over",
      "carry_over_tanks_no": "Start at 0",
      "event_title": "Chronological Event Logbook",
@@ -211,6 +344,12 @@
      "event_wind_direction": "Wind Dir",
      "event_wind_strength": "Wind Str",
      "event_sea_state": "Sea State",
+      "event_visibility": "Visibility",
+      "event_visibility_placeholder": "e.g. 10 km",
+      "weather_slider_unset": "—",
+      "weather_slider_pressure": "{{value}} hPa",
+      "weather_slider_sea_state": "State {{value}}",
+      "weather_slider_heel": "{{value}}°",
      "event_weather": "Weather",
      "event_log": "Log (nm)",
      "event_gps": "GPS Position",
@@ -219,6 +358,7 @@
      "event_remarks": "Remarks / Events",
      "gps_btn": "Get GPS Location",
      "weather_btn": "Fetch OpenWeatherMap Weather",
+      "weather_offline": "OpenWeatherMap requires an internet connection. You are currently offline.",
      "event_wind_pressure": "Barometer (hPa)",
      "event_heel": "Heel Angle (°)",
      "event_sails": "Sails / Motor Status",
@@ -232,6 +372,17 @@
      "share_csv": "Share CSV",
      "export_pdf": "Download PDF",
      "exporting_pdf": "Generating PDF...",
+      "ai_summary_title": "AI Summary",
+      "ai_summary_empty": "No summary yet.",
+      "ai_summary_generate": "Generate summary",
+      "ai_summary_regenerate": "Regenerate",
+      "ai_summary_generating": "Generating…",
+      "ai_summary_attempts_remaining": "{{remaining}} of {{max}} attempts remaining",
+      "ai_summary_error": "AI summary failed. Please try again later.",
+      "ai_summary_error_no_key": "No OpenRouter API key configured on the server.",
+      "ai_summary_error_rate_limited": "Maximum number of generations reached for this travel day.",
+      "ai_summary_error_forbidden": "Only the skipper may generate AI summaries.",
+      "ai_summary_offline": "AI summary generation requires an internet connection. You are currently offline.",
      "photos_title": "Photo Attachments (E2E Encrypted)",
      "photo_caption_label": "Photo Caption / Label (Optional)",
      "photo_caption_placeholder": "e.g. Setting sails near harbor entrance",
@@ -256,6 +407,56 @@
      "track_map_end": "End",
      "track_map_speed_slow": "slow",
      "track_map_speed_fast": "fast",
+      "nmea_import_title": "Import NMEA log",
+      "nmea_import_intro": "Upload a .nmea file from your onboard logger. The app suggests journal entries — you choose what to import.",
+      "nmea_import_btn": "Import NMEA",
+      "nmea_file_label": "NMEA file",
+      "nmea_stats": "{{lines}} sentences parsed · types: {{types}}",
+      "nmea_warn_no_position": "No position sentences found — track and GPS fields may stay empty.",
+      "nmea_warn_duplicate_file": "This NMEA file has already been imported. Importing the same file again will add duplicate journal entries.",
+      "nmea_mode_label": "Generate journal entries",
+      "nmea_mode_interval": "By time interval",
+      "nmea_mode_change": "On significant change",
+      "nmea_mode_both": "Both (merge)",
+      "nmea_interval_label": "Interval (minutes)",
+      "nmea_import_track": "Import GPS track from NMEA",
+      "nmea_preview": "Preview",
+      "nmea_preview_hint": "{{count}} suggested journal entries",
+      "nmea_select_all": "Select all",
+      "nmea_select_none": "Select none",
+      "nmea_source_interval": "Interval",
+      "nmea_source_change": "Event",
+      "nmea_apply": "Apply to journal",
+      "nmea_back": "Back",
+      "nmea_cancel": "Cancel",
+      "nmea_archive_question": "Archive raw log locally? (This device only, not synced.)",
+      "nmea_archive_keep": "Archive",
+      "nmea_archive_discard": "Discard",
+      "nmea_archive_stored": "NMEA archived: {{name}}",
+      "nmea_archive_delete_confirm": "Delete archived NMEA log from this device?",
+      "nmea_error_no_samples": "No usable NMEA sentences in the file.",
+      "nmea_error_parse": "Could not read NMEA file.",
+      "nmea_error_read": "Could not read file.",
+      "nmea_error_no_file": "Please choose an NMEA file first.",
+      "nmea_error_no_selection": "Please select at least one journal entry.",
+      "nmea_remark_interval": "NMEA interval",
+      "nmea_remark_uncertain": "uncertain",
+      "nmea_remark_depth": "Depth {{depth}} m",
+      "nmea_change_course": "Course change {{from}}° → {{to}}°",
+      "nmea_change_wind": "Wind {{from}}° → {{to}}°",
+      "nmea_change_wind_speed": "Wind {{from}} → {{to}} kn",
+      "nmea_change_pressure": "Pressure {{from}} → {{to}} hPa",
+      "nmea_change_depth": "Depth {{from}} → {{to}} m",
+      "nmea_change_engine_start": "Engine on ({{rpm}} rpm)",
+      "nmea_change_engine_stop": "Engine off",
+      "nmea_change_autopilot_on": "Autopilot on",
+      "nmea_change_autopilot_off": "Autopilot off",
+      "nmea_change_gps_lost": "GPS fix lost",
+      "nmea_change_gps_regained": "GPS fix restored",
+      "nmea_change_water_temp": "Water temp. {{from}} → {{to}} °C",
+      "nmea_change_departure": "Departure / underway",
+      "nmea_change_anchor": "Anchored / stop",
+      "nmea_change_speed": "Speed {{from}} → {{to}} kn",
      "track_map_error": "Could not load map.",
      "exporting": "Exporting...",
      "share_unsupported": "Web sharing is not supported on this device. File downloaded instead.",
@@ -291,10 +492,27 @@
      "role_read": "Read only",
      "role_read_hint": "Shared logbook — view only, no editing",
      "open_profile": "Open profile for {{name}}",
+      "open_logbook": "Open logbook “{{title}}”",
      "edit_title": "Rename Logbook",
      "edit_placeholder": "New name of the logbook",
      "edit_success": "Logbook renamed successfully",
-      "edit_btn": "Rename"
+      "edit_btn": "Rename",
+      "filter_label": "Filter logbooks",
+      "filter_placeholder": "Name, year, date, crew or vessel …",
+      "filter_clear": "Clear filter",
+      "filter_results": "{{count}} matches",
+      "filter_no_results": "No logbooks match your search. Try a different name or year.",
+      "sort_label": "Sort",
+      "sort_by_label": "Sort by",
+      "sort_by_name": "Name",
+      "sort_by_date": "Date",
+      "sort_dir_label": "Order",
+      "sort_asc": "Ascending",
+      "sort_desc": "Descending",
+      "sort_name_asc": "Name A to Z",
+      "sort_name_desc": "Name Z to A",
+      "sort_date_asc": "Oldest first",
+      "sort_date_desc": "Newest first"
    },
    "profile": {
      "title": "User profile",
@@ -411,7 +629,72 @@
      "push_unsupported": "Push notifications are not supported in this browser.",
      "push_denied_hint": "Notifications are blocked. Allow them in your browser or device settings.",
      "push_ios_install_hint": "On iPhone/iPad: add the app to your Home Screen (iOS 16.4+) to use push notifications.",
-      "push_error": "Could not enable push notifications."
+      "push_error": "Could not enable push notifications.",
+      "sections": {
+        "account": "Account & settings",
+        "fleet": "Fleet & crew",
+        "security": "Security & device",
+        "stats": "Statistics",
+        "danger": "Danger zone"
+      }
+    },
+    "vessel_pool": {
+      "title": "Vessel fleet",
+      "section_title": "Your vessels",
+      "subtitle": "Maintain all vessels for your logbooks here. Select the active vessel per logbook from this list.",
+      "loading": "Loading vessel fleet…",
+      "add_vessel": "Add vessel",
+      "edit_vessel": "Edit vessel",
+      "no_vessels": "No vessels in the pool yet.",
+      "delete_confirm": "Remove this vessel from the fleet?",
+      "max_vessels": "Maximum of 20 vessels in the pool reached."
+    },
+    "logbook_vessel": {
+      "title": "Vessel for this logbook",
+      "subtitle": "Choose the vessel for this logbook. Travel days use sails and tank data from the selected vessel.",
+      "active_vessel": "Vessel for this logbook",
+      "no_vessels_in_pool": "No vessel in the fleet — add one in your user profile first.",
+      "no_vessel": "No vessel selected",
+      "unnamed": "Unnamed",
+      "save": "Save vessel",
+      "saved": "Logbook vessel saved.",
+      "selection_only_hint": "You see the vessel chosen by the owner (shared logbook).",
+      "manage_in_profile": "Manage vessels in user profile"
+    },
+    "person_pool": {
+      "title": "Core Crew & skippers",
+      "subtitle": "Maintain your person pool here — skippers and crew for all logbooks. Select active crew per logbook and travel day from this pool.",
+      "loading": "Loading person pool…",
+      "skippers_section": "Skippers",
+      "crew_section": "Core Crew",
+      "add_skipper": "Add skipper",
+      "add_crew": "Add crew member",
+      "edit_skipper": "Edit skipper",
+      "no_skippers": "No skippers in the pool yet.",
+      "no_crew": "No crew members in the pool yet.",
+      "delete_confirm": "Remove this person from the pool?"
+    },
+    "logbook_crew": {
+      "title": "Crew for this logbook",
+      "subtitle": "Choose skipper and crew for this logbook. New travel days inherit this selection by default.",
+      "loading": "Loading crew…",
+      "active_skipper": "Skipper for this logbook",
+      "active_crew": "Crew for this logbook",
+      "no_skippers_in_pool": "No skipper in the pool — add one in your user profile first.",
+      "no_crew_in_pool": "No crew in the pool — add members in your user profile first.",
+      "no_skipper": "No skipper selected",
+      "unnamed": "Unnamed",
+      "save": "Save crew",
+      "saved": "Logbook crew saved.",
+      "selection_only_hint": "You see the crew set by the owner (shared logbook)."
+    },
+    "entry_crew": {
+      "title": "Crew on this travel day",
+      "subtitle": "May differ from the logbook default. Following days inherit from the previous day.",
+      "day_skipper": "Skipper on this day",
+      "day_crew": "Crew on this day",
+      "no_skipper": "No skipper selected",
+      "no_crew": "No crew selected"
    },
    "crew": {
      "title": "Skipper & Crew Profiles",
@@ -421,7 +704,7 @@
      "add_crew": "Add Crew Member",
      "edit_crew": "Edit Crew Member",
      "no_crew": "No crew members added yet.",
-      "max_crew": "Maximum of 5 crew members reached.",
+      "max_crew": "Maximum of 12 crew members in the pool reached.",
      "name": "Full Name",
      "address": "Address",
      "birthdate": "Date of Birth",
@@ -462,6 +745,8 @@
      "share_enable": "Enable Public Link",
      "share_copied": "Link copied!",
      "share_copy_btn": "Copy Link",
+      "link_qr_hint": "Scan this QR code with your phone",
+      "link_qr_alt": "QR code for the link",
      "danger_zone_title": "Danger Zone",
      "danger_zone_desc": "Deleting your account will permanently delete all your passkeys, logbooks, vessel data, crew profiles, travel logs, and E2E keys. This action cannot be undone.",
      "delete_account_btn": "Permanently Delete Account",
@@ -472,6 +757,12 @@
      "delete_account_failed": "Failed to delete account. Please try again.",
      "delete_backup_hint": "Tip: Before deleting, create backups of your logbooks (.daagbok.json) in each logbook's settings.",
      "deleting_account": "Deleting account…",
+      "invite_push_prompt_title": "Enable push notifications?",
+      "invite_push_prompt_message": "When invited crew members sync changes, you can be notified via push. No logbook content is sent in plain text.",
+      "invite_push_prompt_ios_message": "When crew members sync changes, you can get push notifications. On iPhone/iPad: add the app to your Home Screen (iOS 16.4+), then enable push in your user profile.",
+      "invite_push_prompt_enable": "Enable now",
+      "invite_push_prompt_later": "Later",
+      "invite_push_prompt_success": "Push notifications are active on this device.",
      "backup_title": "Backup & restore",
      "backup_desc": "Full encrypted backup of this logbook (entries, photos, GPS tracks, crew, vessel). Protected with a backup passphrase — restore on this or a new account.",
      "backup_export_title": "Create backup",
@@ -535,6 +826,7 @@
      "category_general": "General",
      "category_bug": "Bug report",
      "category_feature": "Feature request",
+      "category_translation": "Translation error",
      "contact_label": "Email (optional)",
      "contact_placeholder": "your@email.example",
      "message_label": "Message",
@@ -623,7 +915,13 @@
      "unit_l": "L",
      "day_label": "Day {{day}}",
      "account_logbooks": "Logbooks overview",
-      "col_logbook": "Logbook"
+      "col_logbook": "Logbook",
+      "event_series_title": "Event series",
+      "event_series_hint": "Chronological values from the event log.",
+      "event_series_pressure": "Barometric pressure",
+      "event_series_wind": "Wind",
+      "event_series_motor": "Engine",
+      "event_series_empty": "No entries yet."
    },
    "tour": {
      "skip": "Skip tour",
@@ -638,7 +936,7 @@
        },
        "welcome_public": {
          "title": "Welcome aboard!",
-          "body": "Explore our demo logbook with three travel days in Kiel Bay — no account required. This short tour shows vessel data, crew, and log entries."
+          "body": "Explore our demo logbook with three travel days in Kiel Bay — no account required. The tour covers log entries and vessel and crew selection for this logbook. Manage your fleet and core crew later in your user profile."
        },
        "nav_logs": {
          "title": "Log entries",
@@ -657,12 +955,20 @@
          "body": "Upload GPX files or view saved routes on the map – including distance and speed stats."
        },
        "nav_vessel": {
-          "title": "Vessel data",
-          "body": "Enter your yacht's name, dimensions, and technical details – fill once, use on every travel day."
+          "title": "Vessel for logbook",
+          "body": "Choose a vessel from your fleet for this logbook. Manage vessels in your user profile under Fleet & crew."
        },
-        "nav_crew": {
-          "title": "Crew list",
-          "body": "Manage crew members and assign them to travel days later."
+        "profile_vessel_pool": {
+          "title": "Vessel fleet",
+          "body": "In your user profile you add all your vessels — charter yachts, your own boat, etc. Then pick the right vessel per logbook."
+        },
+        "profile_crew_pool": {
+          "title": "Core Crew & skippers",
+          "body": "In your user profile you maintain a person pool — multiple skippers (e.g. charter) and crew for all logbooks."
+        },
+        "nav_logbook_crew": {
+          "title": "Crew per logbook",
+          "body": "Pick skipper and crew from the pool for this logbook. Travel days inherit this selection by default."
        },
        "nav_stats": {
          "title": "Statistics dashboard",
@@ -1,64 +1,8 @@
-:root {
-  --text: #6b6375;
-  --text-h: #08060d;
-  --bg: #fff;
-  --border: #e5e4e7;
-  --code-bg: #f4f3ec;
-  --accent: #aa3bff;
-  --accent-bg: rgba(170, 59, 255, 0.1);
-  --accent-border: rgba(170, 59, 255, 0.5);
-  --social-bg: rgba(244, 243, 236, 0.5);
-  --shadow:
-    rgba(0, 0, 0, 0.1) 0 10px 15px -3px, rgba(0, 0, 0, 0.05) 0 4px 6px -2px;
+/* Minimal app shell — component styles live in App.css / themes.css */

-  --sans: system-ui, 'Segoe UI', Roboto, sans-serif;
-  --heading: system-ui, 'Segoe UI', Roboto, sans-serif;
-  --mono: ui-monospace, Consolas, monospace;
-
-  font: 18px/145% var(--sans);
-  letter-spacing: 0.18px;
-  color-scheme: light dark;
-  color: var(--text);
-  background: var(--bg);
-  font-synthesis: none;
-  text-rendering: optimizeLegibility;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-
-  @media (max-width: 1024px) {
-    font-size: 16px;
-  }
-}
-
-@media (prefers-color-scheme: dark) {
-  :root {
-    --text: #9ca3af;
-    --text-h: #f3f4f6;
-    --bg: #16171d;
-    --border: #2e303a;
-    --code-bg: #1f2028;
-    --accent: #c084fc;
-    --accent-bg: rgba(192, 132, 252, 0.15);
-    --accent-border: rgba(192, 132, 252, 0.5);
-    --social-bg: rgba(47, 48, 58, 0.5);
-    --shadow:
-      rgba(0, 0, 0, 0.4) 0 10px 15px -3px, rgba(0, 0, 0, 0.25) 0 4px 6px -2px;
-  }
-
-  #social .button-icon {
-    filter: invert(1) brightness(2);
-  }
-}
-
-#root {
-  width: 1126px;
-  max-width: 100%;
-  margin: 0 auto;
-  text-align: center;
-  border-inline: 1px solid var(--border);
-  min-height: 100svh;
-  display: flex;
-  flex-direction: column;
+*,
+*::before,
+*::after {
  box-sizing: border-box;
 }

@@ -66,44 +10,70 @@ body {
  margin: 0;
 }

-h1,
-h2 {
-  font-family: var(--heading);
-  font-weight: 500;
-  color: var(--text-h);
+#root {
+  width: 100%;
+  max-width: 100%;
+  min-height: 100svh;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
 }

-h1 {
-  font-size: 56px;
-  letter-spacing: -1.68px;
-  margin: 32px 0;
-  @media (max-width: 1024px) {
-    font-size: 36px;
-    margin: 20px 0;
+/* Scrollbars — auf Touch-Geräten breiter und besser sichtbar */
+:root {
+  --app-scrollbar-size: 10px;
+}
+
+@media (hover: none), (pointer: coarse), (max-width: 768px) {
+  :root {
+    --app-scrollbar-size: 14px;
  }
 }
-h2 {
-  font-size: 24px;
-  line-height: 118%;
-  letter-spacing: -0.24px;
-  margin: 0 0 8px;
-  @media (max-width: 1024px) {
-    font-size: 20px;
+
+html {
+  scrollbar-width: auto;
+  scrollbar-color: var(--app-accent-light) var(--app-surface-inset);
+  -webkit-overflow-scrolling: touch;
+}
+
+html::-webkit-scrollbar,
+body::-webkit-scrollbar,
+*::-webkit-scrollbar {
+  width: var(--app-scrollbar-size);
+  height: var(--app-scrollbar-size);
+}
+
+html::-webkit-scrollbar-track,
+body::-webkit-scrollbar-track,
+*::-webkit-scrollbar-track {
+  background: var(--app-surface-inset);
+  border-radius: calc(var(--app-scrollbar-size) / 2);
+}
+
+html::-webkit-scrollbar-thumb,
+body::-webkit-scrollbar-thumb,
+*::-webkit-scrollbar-thumb {
+  background: color-mix(in srgb, var(--app-accent-light) 55%, transparent);
+  border-radius: calc(var(--app-scrollbar-size) / 2);
+  min-height: 48px;
+}
+
+html::-webkit-scrollbar-thumb:hover,
+body::-webkit-scrollbar-thumb:hover,
+*::-webkit-scrollbar-thumb:hover {
+  background: color-mix(in srgb, var(--app-accent-light) 80%, transparent);
+}
+
+@media (hover: none), (pointer: coarse), (max-width: 768px) {
+  html::-webkit-scrollbar-thumb,
+  body::-webkit-scrollbar-thumb,
+  *::-webkit-scrollbar-thumb {
+    background: color-mix(in srgb, var(--app-accent-light) 70%, transparent);
+  }
+
+  html::-webkit-scrollbar-thumb:active,
+  body::-webkit-scrollbar-thumb:active,
+  *::-webkit-scrollbar-thumb:active {
+    background: var(--app-accent-light);
  }
 }
-p {
-  margin: 0;
-}
-
-code,
-.counter {
-  font-family: var(--mono);
-  display: inline-flex;
-  border-radius: 4px;
-}
-
-code {
-  font-size: 15px;
-  line-height: 135%;
-  padding: 4px 8px;
-}
@@ -3,9 +3,26 @@ import { createRoot } from 'react-dom/client'
 import 'leaflet/dist/leaflet.css'
 import './themes.css'
 import './index.css'
+import './App.css'
 import './i18n'
 import App from './App.tsx'
 import { applyAppearanceToDocument } from './services/appearance.ts'
+import { flushPendingPwaBootEvents } from './services/analytics.ts'
+import {
+  installStaleAssetRecovery,
+  markReloadAttempt,
+  reconcileVersionOnStartup
+} from './services/pwaStartup.ts'
+import { redirectToPasskeyCompatibleHostIfNeeded } from './utils/passkeyHost.ts'
+
+declare global {
+  interface Window {
+    __KDB_MAIN_MODULE_LOADED?: boolean
+    __KDB_APP_BOOTSTRAPPED?: boolean
+  }
+}
+
+window.__KDB_MAIN_MODULE_LOADED = true

 /** Stale PWA precache on localhost can shadow Vite dev modules. */
 async function clearDevServiceWorkerCaches(): Promise<void> {
@@ -34,9 +51,39 @@ function renderBootstrapError(message: string): void {
 }

 async function bootstrap(): Promise<void> {
+  if (redirectToPasskeyCompatibleHostIfNeeded()) {
+    return
+  }
+
  applyAppearanceToDocument()
+  installStaleAssetRecovery()
+  flushPendingPwaBootEvents()
+  window.addEventListener('load', () => {
+    flushPendingPwaBootEvents()
+  }, { once: true })
  await clearDevServiceWorkerCaches()

+  const startupResult = await reconcileVersionOnStartup()
+  if (startupResult === 'reload') {
+    markReloadAttempt()
+    window.location.reload()
+    return
+  }
+  if (startupResult === 'recovered') {
+    return
+  }
+
+  if ('serviceWorker' in navigator && !import.meta.env.DEV) {
+    navigator.serviceWorker
+      .register('/sw.js', { scope: '/' })
+      .then((reg) => {
+        console.log('Service Worker registered successfully with scope:', reg.scope)
+      })
+      .catch((err) => {
+        console.error('Service Worker registration failed:', err)
+      })
+  }
+
  const rootEl = document.getElementById('root')
  if (!rootEl) {
    throw new Error('Missing #root element')
@@ -47,6 +94,7 @@ async function bootstrap(): Promise<void> {
      <App />
    </StrictMode>,
  )
+  window.__KDB_APP_BOOTSTRAPPED = true
 }

 void bootstrap().catch((err) => {
@@ -54,4 +102,5 @@ void bootstrap().catch((err) => {
  renderBootstrapError(
    'Die App konnte nicht gestartet werden. Bitte neu laden oder die App vollständig beenden und erneut öffnen.',
  )
+  window.__KDB_APP_BOOTSTRAPPED = false
 })
@@ -0,0 +1,61 @@
+import { describe, it, expect, vi } from 'vitest'
+import { buildTravelDayContext } from './aiSummary.js'
+import type { LogEventPayload } from '../utils/logEntryPayload.js'
+
+const t = ((key: string, opts?: Record<string, unknown>) => {
+  if (key === 'logs.live_motor_start') return 'Motor started'
+  if (key === 'logs.live_event_generic') return 'Event'
+  if (opts && 'course' in opts) return `Course ${opts.course}`
+  return key
+}) as any
+
+describe('buildTravelDayContext', () => {
+  it('includes route metadata and formatted events', () => {
+    const events: LogEventPayload[] = [
+      {
+        time: '09:00',
+        mgk: '180',
+        rwk: '',
+        windPressure: '',
+        windDirection: '',
+        windStrength: '',
+        seaState: '',
+        visibility: '',
+        weatherIcon: '',
+        current: '',
+        heel: '',
+        sailsOrMotor: 'Genua',
+        logReading: '',
+        distance: '',
+        gpsLat: '',
+        gpsLng: '',
+        remarks: '__live:motor_start'
+      }
+    ]
+
+    const context = buildTravelDayContext(
+      {
+        date: '2026-06-03',
+        dayOfTravel: '5',
+        departure: 'Kiel',
+        destination: 'Copenhagen',
+        freshwater: { morning: 100, refilled: 0, evening: 80, consumption: 20 },
+        fuel: { morning: 50, refilled: 10, evening: 40, consumption: 20 },
+        greywaterLevel: 0,
+        trackDistanceNm: 42.5,
+        motorHours: 3.5,
+        events
+      },
+      t
+    )
+
+    expect(context.departure).toBe('Kiel')
+    expect(context.destination).toBe('Copenhagen')
+    expect(context.trackDistanceNm).toBe(42.5)
+    expect(context.motorHours).toBe(3.5)
+    expect(context.events).toHaveLength(1)
+    expect(context.events[0].summary).toBe('Motor started')
+    expect(context.events[0].sailsOrMotor).toBe('Genua')
+    expect(context.greywater).toBeUndefined()
+  })
+})
@@ -0,0 +1,178 @@
+import type { TFunction } from 'i18next'
+import { apiFetch } from './api.js'
+import { formatEventSummary } from '../utils/formatEventSummary.js'
+import { sortLogEventsByTime, type LogEventPayload } from '../utils/logEntryPayload.js'
+import { PlausibleEvents, trackPlausibleEvent } from './analytics.js'
+
+export class TravelDaySummaryApiError extends Error {
+  code: 'NO_KEY' | 'FORBIDDEN' | 'RATE_LIMITED' | 'OFFLINE' | 'REQUEST_FAILED'
+
+  constructor(
+    message: string,
+    code: 'NO_KEY' | 'FORBIDDEN' | 'RATE_LIMITED' | 'OFFLINE' | 'REQUEST_FAILED' = 'REQUEST_FAILED'
+  ) {
+    super(message)
+    this.name = 'TravelDaySummaryApiError'
+    this.code = code
+  }
+}
+
+export interface TravelDaySummaryContext {
+  date: string
+  dayOfTravel: string
+  departure: string
+  destination: string
+  trackDistanceNm?: number
+  trackSpeedMaxKn?: number
+  trackSpeedAvgKn?: number
+  motorHours?: number
+  freshwater?: {
+    morning: number
+    refilled: number
+    evening: number
+    consumption: number
+  }
+  fuel?: {
+    morning: number
+    refilled: number
+    evening: number
+    consumption: number
+  }
+  greywater?: { level: number }
+  events: Array<{
+    time: string
+    summary: string
+    sailsOrMotor?: string
+    mgk?: string
+    windDirection?: string
+    windStrength?: string
+    windPressure?: string
+    seaState?: string
+    visibility?: string
+    distance?: string
+  }>
+}
+
+export interface TravelDaySummaryInput {
+  date: string
+  dayOfTravel: string
+  departure: string
+  destination: string
+  trackDistanceNm?: number
+  trackSpeedMaxKn?: number
+  trackSpeedAvgKn?: number
+  motorHours?: number
+  freshwater: { morning: number; refilled: number; evening: number; consumption: number }
+  fuel: { morning: number; refilled: number; evening: number; consumption: number }
+  greywaterLevel?: number
+  events: LogEventPayload[]
+}
+
+const SUMMARY_FETCH_TIMEOUT_MS = 90_000
+
+export function buildTravelDayContext(
+  input: TravelDaySummaryInput,
+  t: TFunction
+): TravelDaySummaryContext {
+  const context: TravelDaySummaryContext = {
+    date: input.date,
+    dayOfTravel: input.dayOfTravel,
+    departure: input.departure,
+    destination: input.destination,
+    freshwater: input.freshwater,
+    fuel: input.fuel,
+    events: sortLogEventsByTime(input.events).map((event) => ({
+      time: event.time,
+      summary: formatEventSummary(event, t),
+      ...(event.sailsOrMotor ? { sailsOrMotor: event.sailsOrMotor } : {}),
+      ...(event.mgk ? { mgk: event.mgk } : {}),
+      ...(event.windDirection ? { windDirection: event.windDirection } : {}),
+      ...(event.windStrength ? { windStrength: event.windStrength } : {}),
+      ...(event.windPressure ? { windPressure: event.windPressure } : {}),
+      ...(event.seaState ? { seaState: event.seaState } : {}),
+      ...(event.visibility ? { visibility: event.visibility } : {}),
+      ...(event.distance ? { distance: event.distance } : {})
+    }))
+  }
+
+  if (input.trackDistanceNm !== undefined) context.trackDistanceNm = input.trackDistanceNm
+  if (input.trackSpeedMaxKn !== undefined) context.trackSpeedMaxKn = input.trackSpeedMaxKn
+  if (input.trackSpeedAvgKn !== undefined) context.trackSpeedAvgKn = input.trackSpeedAvgKn
+  if (input.motorHours !== undefined && input.motorHours > 0) context.motorHours = input.motorHours
+  if (input.greywaterLevel !== undefined && input.greywaterLevel > 0) {
+    context.greywater = { level: input.greywaterLevel }
+  }
+
+  return context
+}
+
+function mapApiError(status: number, data: unknown): TravelDaySummaryApiError {
+  const code =
+    typeof data === 'object' && data !== null && 'code' in data
+      ? String((data as { code?: string }).code)
+      : ''
+
+  if (status === 503 || code === 'NO_KEY') {
+    return new TravelDaySummaryApiError('No OpenRouter API key configured', 'NO_KEY')
+  }
+  if (status === 403) {
+    return new TravelDaySummaryApiError('Forbidden', 'FORBIDDEN')
+  }
+  if (status === 429 || code === 'RATE_LIMITED') {
+    return new TravelDaySummaryApiError('Rate limit exceeded', 'RATE_LIMITED')
+  }
+
+  const message =
+    typeof data === 'object' && data !== null && 'error' in data && typeof (data as { error: unknown }).error === 'string'
+      ? (data as { error: string }).error
+      : 'Request failed'
+  return new TravelDaySummaryApiError(message, 'REQUEST_FAILED')
+}
+
+export async function fetchTravelDaySummaryUsage(
+  logbookId: string,
+  entryId: string
+): Promise<{ remainingAttempts: number; maxAttempts: number }> {
+  const params = new URLSearchParams({ logbookId, entryId })
+  const res = await apiFetch(`/api/ai/usage?${params.toString()}`)
+  const data = await res.json().catch(() => ({}))
+  if (!res.ok) throw mapApiError(res.status, data)
+  return data as { remainingAttempts: number; maxAttempts: number }
+}
+
+export async function generateTravelDaySummary(params: {
+  logbookId: string
+  entryId: string
+  language: string
+  context: TravelDaySummaryContext
+}): Promise<{ summary: string; remainingAttempts: number; maxAttempts: number }> {
+  if (!navigator.onLine) {
+    throw new TravelDaySummaryApiError('Offline', 'OFFLINE')
+  }
+
+  const controller = new AbortController()
+  const timeoutId = window.setTimeout(() => controller.abort(), SUMMARY_FETCH_TIMEOUT_MS)
+
+  let res: Response
+  try {
+    res = await apiFetch('/api/ai/summary', {
+      method: 'POST',
+      body: JSON.stringify(params),
+      signal: controller.signal
+    })
+  } catch (err) {
+    if (err instanceof DOMException && err.name === 'AbortError') {
+      throw new TravelDaySummaryApiError('AI summary request timed out')
+    }
+    throw err
+  } finally {
+    window.clearTimeout(timeoutId)
+  }
+
+  const data = await res.json().catch(() => ({}))
+  if (!res.ok) throw mapApiError(res.status, data)
+
+  trackPlausibleEvent(PlausibleEvents.AI_SUMMARY_GENERATED)
+
+  return data as { summary: string; remainingAttempts: number; maxAttempts: number }
+}
@@ -34,12 +34,34 @@ export const PlausibleEvents = {
  LOCAL_PIN_SET: 'Local PIN Set',
  LOCAL_PIN_REMOVED: 'Local PIN Removed',
  DEVICE_FORGOTTEN: 'Device Forgotten',
-  RECOVERY_ROTATED: 'Recovery Rotated'
+  RECOVERY_ROTATED: 'Recovery Rotated',
+  LANGUAGE_CHANGED: 'Language Changed',
+  NMEA_IMPORTED: 'NMEA Imported',
+  NMEA_UPLOADED: 'NMEA Uploaded',
+  LIVE_LOG_OPENED: 'Live Log Opened',
+  LIVE_LOG_EVENT_LOGGED: 'Live Log Event Logged',
+  LIVE_LOG_PHOTO_UPLOADED: 'Live Log Photo Uploaded',
+  OWM_WEATHER_FETCHED: 'OWM Weather Fetched',
+  AI_SUMMARY_GENERATED: 'AI Summary Generated',
+  PWA_BOOT_WATCHDOG_SOFT: 'PWA Boot Watchdog Soft',
+  PWA_BOOT_WATCHDOG_HARD: 'PWA Boot Watchdog Hard',
+  PWA_BOOT_WATCHDOG_FALLBACK: 'PWA Boot Watchdog Fallback',
+  PWA_BOOT_WATCHDOG_MANUAL_REPAIR: 'PWA Boot Watchdog Manual Repair'
 } as const

+/** Where a successful OpenWeatherMap API call originated (no coordinates or place names). */
+export type OwmAnalyticsSource = 'live_log' | 'entry_editor' | 'entry_editor_gps_lookup'
+
 export type PlausibleEventName = (typeof PlausibleEvents)[keyof typeof PlausibleEvents]

 export type PlausibleEventProps = Record<string, string | number | boolean>
+type PendingPwaBootEvent = {
+  name: PlausibleEventName
+  props?: PlausibleEventProps
+  ts?: number
+}
+
+const PWA_BOOT_PENDING_EVENTS_KEY = 'pwa_boot_pending_events'

 export function trackPlausibleEvent(name: PlausibleEventName, props?: PlausibleEventProps): void {
  if (typeof window.plausible !== 'function') return
@@ -49,3 +71,52 @@ export function trackPlausibleEvent(name: PlausibleEventName, props?: PlausibleE
  }
  window.plausible(name)
 }
+
+export function flushPendingPwaBootEvents(): number {
+  if (typeof window.plausible !== 'function') return 0
+
+  let raw: string | null = null
+  try {
+    raw = sessionStorage.getItem(PWA_BOOT_PENDING_EVENTS_KEY)
+  } catch {
+    return 0
+  }
+  if (!raw) return 0
+
+  let pending: PendingPwaBootEvent[]
+  try {
+    pending = JSON.parse(raw) as PendingPwaBootEvent[]
+  } catch {
+    try {
+      sessionStorage.removeItem(PWA_BOOT_PENDING_EVENTS_KEY)
+    } catch {
+      /* ignore storage errors */
+    }
+    return 0
+  }
+
+  if (!Array.isArray(pending) || pending.length === 0) {
+    try {
+      sessionStorage.removeItem(PWA_BOOT_PENDING_EVENTS_KEY)
+    } catch {
+      /* ignore storage errors */
+    }
+    return 0
+  }
+
+  for (const event of pending) {
+    if (!event || typeof event.name !== 'string') continue
+    if (event.props && Object.keys(event.props).length > 0) {
+      window.plausible(event.name, { props: event.props })
+    } else {
+      window.plausible(event.name)
+    }
+  }
+
+  try {
+    sessionStorage.removeItem(PWA_BOOT_PENDING_EVENTS_KEY)
+  } catch {
+    /* ignore storage errors */
+  }
+  return pending.length
+}
@@ -10,22 +10,43 @@ export class ApiError extends Error {

 export async function apiFetch(
  input: string,
-  init: RequestInit = {}
+  init: RequestInit = {},
+  timeoutMs = 15000
 ): Promise<Response> {
  const headers = new Headers(init.headers)
  if (init.body !== undefined && !headers.has('Content-Type')) {
    headers.set('Content-Type', 'application/json')
  }

-  return fetch(input, {
-    ...init,
-    headers,
-    credentials: 'include'
-  })
+  const controller = new AbortController()
+  const timeoutId = setTimeout(() => controller.abort(), timeoutMs)
+
+  if (init.signal) {
+    if (init.signal.aborted) {
+      controller.abort()
+    } else {
+      init.signal.addEventListener('abort', () => controller.abort())
+    }
+  }
+
+  try {
+    return await fetch(input, {
+      ...init,
+      headers,
+      credentials: 'include',
+      signal: controller.signal
+    })
+  } finally {
+    clearTimeout(timeoutId)
+  }
 }

-export async function apiJson<T>(input: string, init: RequestInit = {}): Promise<T> {
-  const res = await apiFetch(input, init)
+export async function apiJson<T>(
+  input: string,
+  init: RequestInit = {},
+  timeoutMs = 15000
+): Promise<T> {
+  const res = await apiFetch(input, init, timeoutMs)
  const data = await res.json().catch(() => ({}))
  if (!res.ok) {
    const message =
@@ -0,0 +1,96 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import {
+  fetchAppearancePrefs,
+  saveAppearancePrefsToServer,
+  syncAppearancePrefs
+} from './appearancePrefs.js'
+import { setThemePreference } from './userPreferences.js'
+
+const USER_ID = 'appearance-sync-user'
+
+vi.mock('./api.js', () => ({
+  apiJson: vi.fn()
+}))
+
+import { apiJson } from './api.js'
+
+const mockedApiJson = vi.mocked(apiJson)
+
+describe('appearancePrefs', () => {
+  beforeEach(() => {
+    localStorage.clear()
+    vi.clearAllMocks()
+  })
+
+  it('fetchAppearancePrefs returns defaults when not authenticated', async () => {
+    await expect(fetchAppearancePrefs()).resolves.toEqual({
+      theme: 'auto',
+      colorScheme: 'auto',
+      persisted: false
+    })
+    expect(mockedApiJson).not.toHaveBeenCalled()
+  })
+
+  it('syncAppearancePrefs applies server prefs after cache wipe', async () => {
+    localStorage.setItem('active_userid', USER_ID)
+    mockedApiJson.mockResolvedValueOnce({
+      theme: 'ocean',
+      colorScheme: 'dark',
+      persisted: true
+    })
+
+    const changed = vi.fn()
+    window.addEventListener('appearance-changed', changed)
+
+    await syncAppearancePrefs(USER_ID)
+
+    expect(localStorage.getItem(`user_pref_theme_${USER_ID}`)).toBe('ocean')
+    expect(localStorage.getItem(`user_pref_color_scheme_${USER_ID}`)).toBe('dark')
+    expect(changed).toHaveBeenCalledTimes(1)
+  })
+
+  it('syncAppearancePrefs uploads local prefs when server has none', async () => {
+    localStorage.setItem('active_userid', USER_ID)
+    setThemePreference(USER_ID, 'material')
+    mockedApiJson
+      .mockResolvedValueOnce({ theme: 'auto', colorScheme: 'auto', persisted: false })
+      .mockResolvedValueOnce({ theme: 'material', colorScheme: 'auto', persisted: true })
+
+    await syncAppearancePrefs(USER_ID)
+
+    expect(mockedApiJson).toHaveBeenCalledTimes(2)
+    expect(mockedApiJson).toHaveBeenLastCalledWith('/api/auth/appearance-prefs', {
+      method: 'PUT',
+      body: JSON.stringify({ theme: 'material', colorScheme: 'auto' })
+    })
+  })
+
+  it('saveAppearancePrefsToServer skips when not authenticated', async () => {
+    await saveAppearancePrefsToServer('ocean', 'light')
+    expect(mockedApiJson).not.toHaveBeenCalled()
+  })
+
+  it('syncAppearancePrefs skips server sync when userId does not match active session', async () => {
+    localStorage.setItem('active_userid', 'session-user')
+    setThemePreference('other-user', 'ocean')
+    mockedApiJson.mockResolvedValue({
+      theme: 'material',
+      colorScheme: 'dark',
+      persisted: true
+    })
+
+    await syncAppearancePrefs('other-user')
+
+    expect(mockedApiJson).not.toHaveBeenCalled()
+    expect(localStorage.getItem('user_pref_theme_other-user')).toBe('ocean')
+  })
+
+  it('syncAppearancePrefs skips server sync when active session is missing', async () => {
+    setThemePreference(USER_ID, 'ocean')
+
+    await syncAppearancePrefs(USER_ID)
+
+    expect(mockedApiJson).not.toHaveBeenCalled()
+    expect(localStorage.getItem(`user_pref_theme_${USER_ID}`)).toBe('ocean')
+  })
+})
@@ -0,0 +1,76 @@
+import { apiJson } from './api.js'
+import { notifyAppearanceChanged } from './appearance.js'
+import {
+  getActiveUserId,
+  getColorSchemePreference,
+  getThemePreference,
+  setColorSchemePreference,
+  setThemePreference
+} from './userPreferences.js'
+
+const API_BASE = '/api/auth/appearance-prefs'
+
+export interface AppearancePrefs {
+  theme: string
+  colorScheme: string
+  persisted: boolean
+}
+
+function hasLocalAppearancePrefs(userId: string): boolean {
+  return (
+    localStorage.getItem(`user_pref_theme_${userId}`) != null ||
+    localStorage.getItem(`user_pref_color_scheme_${userId}`) != null
+  )
+}
+
+function resolveSyncedUserId(userId?: string | null): string | null {
+  const id = userId?.trim() || getActiveUserId()?.trim() || null
+  if (!id) return null
+
+  const activeId = getActiveUserId()?.trim() || null
+  if (!activeId || activeId !== id) return null
+
+  return id
+}
+
+export async function fetchAppearancePrefs(userId?: string | null): Promise<AppearancePrefs> {
+  if (!resolveSyncedUserId(userId)) {
+    return { theme: 'auto', colorScheme: 'auto', persisted: false }
+  }
+
+  return apiJson<AppearancePrefs>(API_BASE)
+}
+
+export async function saveAppearancePrefsToServer(
+  theme: string,
+  colorScheme: string,
+  userId?: string | null
+): Promise<void> {
+  if (!resolveSyncedUserId(userId)) return
+
+  await apiJson<AppearancePrefs>(API_BASE, {
+    method: 'PUT',
+    body: JSON.stringify({ theme, colorScheme })
+  })
+}
+
+/** Merge server-stored appearance with local cache (server wins after cache wipe). */
+export async function syncAppearancePrefs(userId?: string | null): Promise<void> {
+  const id = resolveSyncedUserId(userId)
+  if (!id) return
+
+  try {
+    const server = await fetchAppearancePrefs(id)
+
+    if (server.persisted) {
+      setThemePreference(id, server.theme)
+      setColorSchemePreference(id, server.colorScheme)
+    } else if (hasLocalAppearancePrefs(id)) {
+      await saveAppearancePrefsToServer(getThemePreference(id), getColorSchemePreference(id), id)
+    }
+  } catch (err) {
+    console.warn('Failed to sync appearance preferences:', err)
+  }
+
+  notifyAppearanceChanged()
+}
@@ -12,6 +12,7 @@ import { clearLogbookKeysCache } from './logbookKeys.js'
 import { PlausibleEvents, trackPlausibleEvent } from './analytics.js'
 import { db } from './db.js'
 import { apiFetch, apiJson } from './api.js'
+import { isWebAuthnUserAbortError } from '../utils/passkeyHost.js'

 const API_BASE = '/api/auth'

@@ -361,7 +362,11 @@ export async function loginUser(username?: string): Promise<LoginResult> {
  const prfRequested = !!options.extensions?.prf
  try {
    credentialResponse = await startAuthentication({ optionsJSON: options })
-  } catch (err: any) {
+  } catch (err: unknown) {
+    // User cancelled or timed out — never open a second platform prompt.
+    if (isWebAuthnUserAbortError(err)) {
+      throw err
+    }
    if (prfRequested) {
      console.warn('Passkey authentication with PRF extension failed, retrying without PRF:', err)
      if (options.extensions) {
@@ -553,7 +558,12 @@ export async function deleteAccount(): Promise<boolean> {
        db.photos.clear(),
        db.gpsTracks.clear(),
        db.syncQueue.clear(),
-        db.logbookKeys.clear()
+        db.logbookKeys.clear(),
+        db.personPool.clear(),
+        db.vesselPool.clear(),
+        db.logbookCrewSelections.clear(),
+        db.logbookVesselSelections.clear(),
+        db.userSyncQueue.clear()
      ])

      // Wipe localStorage and session variables
@@ -0,0 +1,125 @@
+import { db } from './db.js'
+import { getActiveMasterKey } from './auth.js'
+import { decryptJson, encryptJson } from './crypto.js'
+import { getLogbookKey } from './logbookKeys.js'
+import type { PersonData } from '../types/person.js'
+import { buildLogbookCrewSelection, pickActiveSkipperId } from '../utils/personSnapshots.js'
+import { entryCrewFromLogbookSelection } from '../utils/personSnapshots.js'
+import { saveLogbookCrewSelection } from './logbookCrewSelection.js'
+const MIGRATION_FLAG = 'crew_pool_migration_v1_done'
+
+export async function migrateLegacyCrewToPoolIfNeeded(): Promise<void> {
+  const userId = localStorage.getItem('active_userid')
+  if (!userId || localStorage.getItem(MIGRATION_FLAG) === userId) return
+
+  const masterKey = getActiveMasterKey()
+  if (!masterKey) return
+
+  try {
+    const ownedLogbooks = await db.logbooks.filter((lb) => lb.isShared !== 1).toArray()
+    const poolByLegacyKey = new Map<string, string>()
+    const poolData = new Map<string, PersonData>()
+
+    for (const logbook of ownedLogbooks) {
+      const logbookKey = (await getLogbookKey(logbook.id)) || masterKey
+      const legacyCrews = await db.crews.where({ logbookId: logbook.id }).toArray()
+
+      const legacyIds: { skipperIds: string[]; crewIds: string[] } = {
+        skipperIds: [],
+        crewIds: []
+      }
+
+      for (const record of legacyCrews) {
+        const data = (await decryptJson(record.encryptedData, record.iv, record.tag, logbookKey)) as
+          | PersonData
+          | null
+        if (!data) continue
+
+        const role = record.payloadId === 'skipper' ? 'skipper' : 'crew'
+        const personData: PersonData = { ...data, role }
+        const dedupeKey = `${role}:${personData.name}:${personData.passportNumber}`
+
+        let poolId = poolByLegacyKey.get(dedupeKey)
+        if (!poolId) {
+          poolId = record.payloadId === 'skipper' ? 'skipper' : record.payloadId
+          const existing = await db.personPool.get(poolId)
+          if (!existing) {
+            const encrypted = await encryptJson(personData, masterKey)
+            const now = new Date().toISOString()
+            await db.personPool.put({
+              payloadId: poolId,
+              encryptedData: encrypted.ciphertext,
+              iv: encrypted.iv,
+              tag: encrypted.tag,
+              updatedAt: now
+            })
+            await db.userSyncQueue.put({
+              action: 'create',
+              type: 'person',
+              payloadId: poolId,
+              data: JSON.stringify(encrypted),
+              updatedAt: now
+            })
+          }
+          poolByLegacyKey.set(dedupeKey, poolId)
+          poolData.set(poolId, personData)
+        }
+
+        if (role === 'skipper') {
+          if (!legacyIds.skipperIds.includes(poolId)) legacyIds.skipperIds.push(poolId)
+        } else {
+          legacyIds.crewIds.push(poolId)
+        }
+      }
+
+      const activeSkipperId = pickActiveSkipperId(legacyIds.skipperIds)
+      const existingSelection = await db.logbookCrewSelections.get(logbook.id)
+      if (!existingSelection && (activeSkipperId || legacyIds.crewIds.length > 0)) {
+        const selection = buildLogbookCrewSelection(
+          activeSkipperId,
+          legacyIds.crewIds,
+          poolData
+        )
+        await saveLogbookCrewSelection(logbook.id, selection)
+
+        const entryCrew = entryCrewFromLogbookSelection(selection)
+        const entries = await db.entries.where({ logbookId: logbook.id }).toArray()
+        for (const entry of entries) {
+          const dec = (await decryptJson(entry.encryptedData, entry.iv, entry.tag, logbookKey)) as Record<
+            string,
+            unknown
+          > | null
+          if (!dec) continue
+          if (dec.selectedSkipperId != null || (Array.isArray(dec.selectedCrewIds) && dec.selectedCrewIds.length > 0)) {
+            continue
+          }
+          const updated = {
+            ...dec,
+            ...entryCrew
+          }
+          const encrypted = await encryptJson(updated, logbookKey)
+          const now = new Date().toISOString()
+          await db.entries.put({
+            ...entry,
+            encryptedData: encrypted.ciphertext,
+            iv: encrypted.iv,
+            tag: encrypted.tag,
+            updatedAt: now
+          })
+          await db.syncQueue.put({
+            action: 'update',
+            type: 'entry',
+            payloadId: entry.payloadId,
+            logbookId: logbook.id,
+            data: JSON.stringify(encrypted),
+            updatedAt: now
+          })
+        }
+      }
+    }
+
+    localStorage.setItem(MIGRATION_FLAG, userId)
+  } catch (err) {
+    console.warn('Crew pool migration failed:', err)
+  }
+}
@@ -37,22 +37,17 @@ export async function exportLogbookToCsv(logbookId: string, preloadedData?: { ya
      throw new Error('Encryption key not found. User must log in.')
    }

-    // 1. Fetch Yacht details
-    const yachtRecord = await db.yachts.get(logbookId);
-    if (yachtRecord) {
-      try {
-        const yacht = await decryptJson(yachtRecord.encryptedData, yachtRecord.iv, yachtRecord.tag, masterKey);
-        yachtName = yacht.name || '';
-        homePort = yacht.port || '';
-        owner = yacht.owner || '';
-        charter = yacht.charter || '';
-        registration = yacht.registration || '';
-        callsign = yacht.callsign || '';
-        atis = yacht.atis || '';
-        mmsi = yacht.mmsi || '';
-      } catch (e) {
-        console.error('Failed to decrypt yacht details for CSV:', e);
-      }
+    const { resolveVesselForLogbook } = await import('./resolveVessel.js')
+    const yacht = await resolveVesselForLogbook(logbookId)
+    if (yacht) {
+      yachtName = yacht.name || ''
+      homePort = yacht.homePort || ''
+      owner = yacht.owner || ''
+      charter = yacht.charterCompany || ''
+      registration = yacht.registrationNumber || ''
+      callsign = yacht.callSign || ''
+      atis = yacht.atis || ''
+      mmsi = yacht.mmsi || ''
    }

    // 2. Fetch logbook entries
@@ -79,15 +74,16 @@ export async function exportLogbookToCsv(logbookId: string, preloadedData?: { ya

  // Headers matching the requested event fields & metadata
  const headers = [
-    'Date', 'Day of Travel', 'Departure Port', 'Destination Port',
+    'Date', 'Day of Travel', 'Departure Port', 'Destination Port', 'AI Summary',
    'Skipper Signature', 'Crew Signature',
    'Track Distance (nm)', 'Track Max Speed (kn)', 'Track Avg Speed (kn)', 'Motor Hours (h)',
    'Event Time', 'MgK Course', 'RwK Course',
-    'Wind Dir', 'Wind Str', 'Barometer (hPa)', 'Sea State',
+    'Wind Dir', 'Wind Str', 'Barometer (hPa)', 'Sea State', 'Visibility',
    'Current', 'Heel Angle', 'Sails/Motor', 'Log (nm)', 'Distance (nm)',
    'Latitude', 'Longitude', 'Remarks',
    'Freshwater Morning (L)', 'Freshwater Refilled (L)', 'Freshwater Evening (L)', 'Freshwater Consumption (L)',
    'Fuel Morning (L)', 'Fuel Refilled (L)', 'Fuel Evening (L)', 'Fuel Consumption (L)',
+    'Greywater Level (L)',
    'Yacht Name', 'Home Port', 'Owner', 'Charter Company', 'Registration', 'Callsign', 'ATIS', 'MMSI'
  ];

@@ -123,20 +119,23 @@ export async function exportLogbookToCsv(logbookId: string, preloadedData?: { ya
    const fuelR = entry.fuel?.refilled ?? '';
    const fuelE = entry.fuel?.evening ?? '';
    const fuelCons = entry.fuel?.consumption ?? '';
+    const greywaterLevel = entry.greywater?.level ?? '';
+    const aiSummary = entry.aiSummary ?? '';

    const eventsList = entry.events || [];
    if (eventsList.length === 0) {
      // Create one row even if there are no events for the day
      rows.push([
-        dateVal, travelDay, dep, dest,
+        dateVal, travelDay, dep, dest, aiSummary,
        signS, signC,
        trackDist, trackMax, trackAvg, motorH,
        '', '', '',
-        '', '', '', '',
+        '', '', '', '', '',
        '', '', '', '', '',
        '', '', '',
        fwM, fwR, fwE, fwCons,
        fuelM, fuelR, fuelE, fuelCons,
+        greywaterLevel,
        yachtName, homePort, owner, charter, registration, callsign, atis, mmsi
      ].map(escapeCsvValue));
    } else {
@@ -144,15 +143,17 @@ export async function exportLogbookToCsv(logbookId: string, preloadedData?: { ya
      const sortedEvents = sortLogEventsByTime(eventsList);
      for (const ev of sortedEvents) {
        rows.push([
-          dateVal, travelDay, dep, dest,
+          dateVal, travelDay, dep, dest, aiSummary,
          signS, signC,
          trackDist, trackMax, trackAvg, motorH,
          ev.time || '', ev.mgk || '', ev.rwk || '',
          ev.windDirection || '', ev.windStrength || '', ev.windPressure || '', ev.seaState || '',
+          ev.visibility || '',
          ev.current || '', ev.heel || '', ev.sailsOrMotor || '', ev.logReading || '', ev.distance || '',
          ev.gpsLat || '', ev.gpsLng || '', ev.remarks || '',
          fwM, fwR, fwE, fwCons,
          fuelM, fuelR, fuelE, fuelCons,
+          greywaterLevel,
          yachtName, homePort, owner, charter, registration, callsign, atis, mmsi
        ].map(escapeCsvValue));
      }
@@ -35,6 +35,14 @@ export interface LocalDeviation {
  updatedAt: string
 }

+export interface EntryListCache {
+  date: string
+  dayOfTravel: string
+  departure: string
+  destination: string
+  skipperSignStatus: 'none' | 'valid' | 'invalid'
+}
+
 export interface LocalEntry {
  payloadId: string
  logbookId: string
@@ -42,6 +50,8 @@ export interface LocalEntry {
  iv: string
  tag: string
  updatedAt: string
+  /** Plaintext list fields — avoids full decrypt when opening the journal list. */
+  listCache?: EntryListCache
 }

 export interface LocalPhoto {
@@ -64,6 +74,15 @@ export interface LocalGpsTrack {
  updatedAt: string
 }

+export interface LocalNmeaArchive {
+  entryId: string
+  logbookId: string
+  encryptedData: string
+  iv: string
+  tag: string
+  updatedAt: string
+}
+
 export interface LocalLogbookKey {
  logbookId: string
  encryptedKey: string
@@ -71,16 +90,75 @@ export interface LocalLogbookKey {
  tag: string
 }

+export interface LocalPerson {
+  payloadId: string
+  encryptedData: string
+  iv: string
+  tag: string
+  updatedAt: string
+}
+
+export interface LocalVessel {
+  payloadId: string
+  encryptedData: string
+  iv: string
+  tag: string
+  updatedAt: string
+}
+
+export interface LocalLogbookCrewSelection {
+  logbookId: string
+  encryptedData: string
+  iv: string
+  tag: string
+  updatedAt: string
+}
+
+export interface LocalLogbookVesselSelection {
+  logbookId: string
+  encryptedData: string
+  iv: string
+  tag: string
+  updatedAt: string
+}
+
 export interface SyncQueueItem {
  id?: number
  action: 'create' | 'update' | 'delete'
-  type: 'yacht' | 'crew' | 'deviation' | 'entry' | 'logbook' | 'photo' | 'gpsTrack'
+  type:
+    | 'yacht'
+    | 'crew'
+    | 'deviation'
+    | 'entry'
+    | 'logbook'
+    | 'photo'
+    | 'gpsTrack'
+    | 'logbookCrew'
+    | 'logbookVessel'
  payloadId: string // payloadId or logbookId depending on the type
  logbookId: string
  data: string // JSON representation of the local record
  updatedAt: string
 }

+export interface UserSyncQueueItem {
+  id?: number
+  action: 'create' | 'update' | 'delete'
+  type: 'person' | 'vessel'
+  payloadId: string
+  data: string
+  updatedAt: string
+}
+
+export interface EntryDraftRecord {
+  logbookId: string
+  entryId: string
+  encryptedData: string
+  iv: string
+  tag: string
+  updatedAt: string
+}
+
 class DaagboxDatabase extends Dexie {
  logbooks!: Table<LocalLogbook>
  yachts!: Table<LocalYacht>
@@ -89,8 +167,15 @@ class DaagboxDatabase extends Dexie {
  entries!: Table<LocalEntry>
  photos!: Table<LocalPhoto>
  gpsTracks!: Table<LocalGpsTrack>
+  nmeaArchives!: Table<LocalNmeaArchive>
  logbookKeys!: Table<LocalLogbookKey>
+  personPool!: Table<LocalPerson>
+  vesselPool!: Table<LocalVessel>
+  logbookCrewSelections!: Table<LocalLogbookCrewSelection>
+  logbookVesselSelections!: Table<LocalLogbookVesselSelection>
  syncQueue!: Table<SyncQueueItem>
+  userSyncQueue!: Table<UserSyncQueueItem>
+  entryDrafts!: Table<EntryDraftRecord, [string, string]>

  constructor() {
    super('DaagboxDatabase')
@@ -145,6 +230,65 @@ class DaagboxDatabase extends Dexie {
      gpsTracks: 'entryId, logbookId, updatedAt',
      logbookKeys: 'logbookId'
    })
+    this.version(6).stores({
+      logbooks: 'id, encryptedTitle, updatedAt, isSynced, isShared, isDemo',
+      yachts: 'logbookId, updatedAt',
+      crews: 'payloadId, logbookId, updatedAt',
+      deviations: 'logbookId, updatedAt',
+      entries: 'payloadId, logbookId, updatedAt',
+      syncQueue: '++id, action, type, payloadId, logbookId',
+      photos: 'payloadId, entryId, logbookId, updatedAt',
+      gpsTracks: 'entryId, logbookId, updatedAt',
+      nmeaArchives: 'entryId, logbookId, updatedAt',
+      logbookKeys: 'logbookId'
+    })
+    this.version(7).stores({
+      logbooks: 'id, encryptedTitle, updatedAt, isSynced, isShared, isDemo',
+      yachts: 'logbookId, updatedAt',
+      crews: 'payloadId, logbookId, updatedAt',
+      deviations: 'logbookId, updatedAt',
+      entries: 'payloadId, logbookId, updatedAt',
+      syncQueue: '++id, action, type, payloadId, logbookId',
+      photos: 'payloadId, entryId, logbookId, updatedAt',
+      gpsTracks: 'entryId, logbookId, updatedAt',
+      nmeaArchives: 'entryId, logbookId, updatedAt',
+      logbookKeys: 'logbookId',
+      entryDrafts: '[logbookId+entryId], updatedAt'
+    })
+    this.version(8).stores({
+      logbooks: 'id, encryptedTitle, updatedAt, isSynced, isShared, isDemo',
+      yachts: 'logbookId, updatedAt',
+      crews: 'payloadId, logbookId, updatedAt',
+      deviations: 'logbookId, updatedAt',
+      entries: 'payloadId, logbookId, updatedAt',
+      syncQueue: '++id, action, type, payloadId, logbookId',
+      photos: 'payloadId, entryId, logbookId, updatedAt',
+      gpsTracks: 'entryId, logbookId, updatedAt',
+      nmeaArchives: 'entryId, logbookId, updatedAt',
+      logbookKeys: 'logbookId',
+      personPool: 'payloadId, updatedAt',
+      logbookCrewSelections: 'logbookId, updatedAt',
+      userSyncQueue: '++id, action, type, payloadId',
+      entryDrafts: '[logbookId+entryId], updatedAt'
+    })
+    this.version(9).stores({
+      logbooks: 'id, encryptedTitle, updatedAt, isSynced, isShared, isDemo',
+      yachts: 'logbookId, updatedAt',
+      crews: 'payloadId, logbookId, updatedAt',
+      deviations: 'logbookId, updatedAt',
+      entries: 'payloadId, logbookId, updatedAt',
+      syncQueue: '++id, action, type, payloadId, logbookId',
+      photos: 'payloadId, entryId, logbookId, updatedAt',
+      gpsTracks: 'entryId, logbookId, updatedAt',
+      nmeaArchives: 'entryId, logbookId, updatedAt',
+      logbookKeys: 'logbookId',
+      personPool: 'payloadId, updatedAt',
+      vesselPool: 'payloadId, updatedAt',
+      logbookCrewSelections: 'logbookId, updatedAt',
+      logbookVesselSelections: 'logbookId, updatedAt',
+      userSyncQueue: '++id, action, type, payloadId',
+      entryDrafts: '[logbookId+entryId], updatedAt'
+    })
  }
 }

@@ -4,9 +4,13 @@ import { getActiveMasterKey } from './auth.js'
 import { getLogbookKey } from './logbookKeys.js'
 import { encryptJson } from './crypto.js'
 import { syncLogbook } from './sync.js'
+import { putEntryRecord } from '../utils/entryListCache.js'
+import { syncPersonPool } from './personPoolSync.js'
 import i18n from '../i18n/index.js'
+import type { PersonData } from '../types/person.js'
+import { buildLogbookCrewSelection } from '../utils/personSnapshots.js'
 import {
-  buildDemoCrewRecords,
+  buildDemoPersonPool,
  buildDemoEntryPayloads,
  buildDemoYachtData
 } from './demoLogbookData.js'
@@ -24,7 +28,7 @@ export function getDemoFirstEntryStorageKey(userId: string): string {
 async function putEncryptedRecord(
  logbookId: string,
  key: ArrayBuffer,
-  type: 'entry' | 'crew' | 'yacht' | 'gpsTrack',
+  type: 'entry' | 'yacht' | 'gpsTrack' | 'logbookCrew',
  payloadId: string,
  data: unknown,
  now: string
@@ -32,23 +36,17 @@ async function putEncryptedRecord(
  const encrypted = await encryptJson(data, key)

  if (type === 'entry') {
-    await db.entries.put({
-      payloadId,
-      logbookId,
-      encryptedData: encrypted.ciphertext,
-      iv: encrypted.iv,
-      tag: encrypted.tag,
-      updatedAt: now
-    })
-  } else if (type === 'crew') {
-    await db.crews.put({
-      payloadId,
-      logbookId,
-      encryptedData: encrypted.ciphertext,
-      iv: encrypted.iv,
-      tag: encrypted.tag,
-      updatedAt: now
-    })
+    await putEntryRecord(
+      {
+        payloadId,
+        logbookId,
+        encryptedData: encrypted.ciphertext,
+        iv: encrypted.iv,
+        tag: encrypted.tag,
+        updatedAt: now
+      },
+      data as Record<string, unknown>
+    )
  } else if (type === 'yacht') {
    await db.yachts.put({
      logbookId,
@@ -66,25 +64,62 @@ async function putEncryptedRecord(
      tag: encrypted.tag,
      updatedAt: now
    })
+  } else if (type === 'logbookCrew') {
+    await db.logbookCrewSelections.put({
+      logbookId,
+      encryptedData: encrypted.ciphertext,
+      iv: encrypted.iv,
+      tag: encrypted.tag,
+      updatedAt: now
+    })
  }

  await db.syncQueue.put({
-    action: type === 'yacht' ? 'update' : 'create',
+    action: type === 'yacht' || type === 'logbookCrew' ? 'update' : 'create',
    type,
-    payloadId: type === 'yacht' ? logbookId : payloadId,
+    payloadId: type === 'yacht' || type === 'logbookCrew' ? logbookId : payloadId,
    logbookId,
    data: JSON.stringify(encrypted),
    updatedAt: now
  })
 }

+async function seedPersonPool(masterKey: ArrayBuffer, now: string): Promise<Map<string, PersonData>> {
+  const poolMap = new Map<string, PersonData>()
+  for (const person of buildDemoPersonPool()) {
+    poolMap.set(person.payloadId, person.data)
+    const encrypted = await encryptJson(person.data, masterKey)
+    await db.personPool.put({
+      payloadId: person.payloadId,
+      encryptedData: encrypted.ciphertext,
+      iv: encrypted.iv,
+      tag: encrypted.tag,
+      updatedAt: now
+    })
+    await db.userSyncQueue.put({
+      action: 'create',
+      type: 'person',
+      payloadId: person.payloadId,
+      data: JSON.stringify(encrypted),
+      updatedAt: now
+    })
+  }
+  syncPersonPool().catch((err) => console.warn('Demo person pool sync failed:', err))
+  return poolMap
+}
+
 async function seedYachtAndCrew(logbookId: string, key: ArrayBuffer, now: string): Promise<void> {
+  const masterKey = getActiveMasterKey()
+  if (!masterKey) throw new Error('Encryption key not available')
+
  const yachtData = buildDemoYachtData()
  await putEncryptedRecord(logbookId, key, 'yacht', logbookId, yachtData, now)

-  for (const crew of buildDemoCrewRecords()) {
-    await putEncryptedRecord(logbookId, key, 'crew', crew.payloadId, crew.data, now)
-  }
+  const poolMap = await seedPersonPool(masterKey, now)
+  const skipperId = [...poolMap.entries()].find(([, d]) => d.role === 'skipper')?.[0] ?? null
+  const crewIds = [...poolMap.entries()].filter(([, d]) => d.role === 'crew').map(([id]) => id)
+  const selection = buildLogbookCrewSelection(skipperId, crewIds, poolMap)
+  await putEncryptedRecord(logbookId, key, 'logbookCrew', logbookId, selection, now)
 }

 export interface DemoSeedResult {
@@ -1,6 +1,7 @@
 import { parseTrackFile } from './trackUpload.js'
 import { computeTrackStats } from '../utils/trackStats.js'
 import i18n from '../i18n/index.js'
+import { isGermanLocale } from '../utils/i18nLanguages.js'

 import kielLaboeGpx from '../assets/demo/kiel-laboe.gpx?raw'
 import laboeDampGpx from '../assets/demo/laboe-damp.gpx?raw'
@@ -15,6 +16,8 @@ const PUBLIC_DEMO_ENTRY_IDS = [
  'a0000001-0000-4000-8000-000000000003'
 ] as const

+export const PUBLIC_DEMO_SKIPPER_ID = 'skipper'
+export const PUBLIC_DEMO_VESSEL_ID = 'demo-vessel-1'
 const PUBLIC_DEMO_CREW_MEMBER_ID = 'a0000001-0000-4000-8000-000000000010'

 export interface DemoDaySpec {
@@ -26,6 +29,7 @@ export interface DemoDaySpec {
  filename: string
  freshwater: { morning: number; refilled: number; evening: number; consumption: number }
  fuel: { morning: number; refilled: number; evening: number; consumption: number }
+  greywaterLevel?: number
  motorHours?: number
  events: Array<Record<string, string>>
 }
@@ -47,10 +51,27 @@ export interface DemoCrewRecord {
  }
 }

+export interface DemoVesselRecord {
+  payloadId: string
+  data: Record<string, unknown> & { name: string }
+}
+
 export interface PublicDemoFixture {
  title: string
  yacht: Record<string, unknown>
+  vesselPool: DemoVesselRecord[]
+  logbookVesselSelection: {
+    activeVesselId: string | null
+    vesselSnapshot: Record<string, unknown> | null
+  }
+  /** @deprecated legacy share payload */
  crews: DemoCrewRecord[]
+  personPool: DemoCrewRecord[]
+  logbookCrewSelection: {
+    activeSkipperId: string
+    activeCrewIds: string[]
+    snapshotsById: Record<string, DemoCrewRecord['data'] & { id: string }>
+  }
  entries: Array<Record<string, unknown> & { payloadId: string }>
  gpsTracks: Array<{ entryId: string; waypoints: unknown[]; filename: string; gpxContent?: string; fileType: string }>
  photos: never[]
@@ -58,7 +79,7 @@ export interface PublicDemoFixture {
 }

 export function buildDemoDays(): DemoDaySpec[] {
-  const isDe = i18n.language.startsWith('de')
+  const isDe = isGermanLocale(i18n.language)
  return [
    {
      date: '2026-05-29',
@@ -69,6 +90,7 @@ export function buildDemoDays(): DemoDaySpec[] {
      filename: 'kiel-laboe.gpx',
      freshwater: { morning: 120, refilled: 0, evening: 105, consumption: 15 },
      fuel: { morning: 85, refilled: 0, evening: 78, consumption: 7 },
+      greywaterLevel: 25,
      events: [
        {
          time: '10:15',
@@ -101,6 +123,7 @@ export function buildDemoDays(): DemoDaySpec[] {
      filename: 'laboe-damp.gpx',
      freshwater: { morning: 105, refilled: 25, evening: 110, consumption: 20 },
      fuel: { morning: 78, refilled: 0, evening: 70, consumption: 8 },
+      greywaterLevel: 38,
      motorHours: 1.5,
      events: [
        {
@@ -134,6 +157,7 @@ export function buildDemoDays(): DemoDaySpec[] {
      filename: 'damp-schleimuende.gpx',
      freshwater: { morning: 110, refilled: 0, evening: 95, consumption: 15 },
      fuel: { morning: 70, refilled: 15, evening: 80, consumption: 5 },
+      greywaterLevel: 52,
      events: [
        {
          time: '08:30',
@@ -161,7 +185,7 @@ export function buildDemoDays(): DemoDaySpec[] {
 }

 export function buildDemoYachtData(): Record<string, unknown> {
-  const isDe = i18n.language.startsWith('de')
+  const isDe = isGermanLocale(i18n.language)
  return {
    name: 'Seeadler',
    vesselType: isDe ? 'Segelyacht' : 'Sailing yacht',
@@ -176,15 +200,22 @@ export function buildDemoYachtData(): Record<string, unknown> {
    atis: '',
    mmsi: '',
    sails: isDe ? ['Großsegel', 'Genua', 'Spinnaker'] : ['Mainsail', 'Genoa', 'Spinnaker'],
-    photo: null
+    photo: null,
+    freshwaterCapacityL: 200,
+    fuelCapacityL: 100,
+    greywaterCapacityL: 80
  }
 }

+export function buildDemoPersonPool(): DemoCrewRecord[] {
+  return buildDemoCrewRecords()
+}
+
 export function buildDemoCrewRecords(): DemoCrewRecord[] {
-  const isDe = i18n.language.startsWith('de')
+  const isDe = isGermanLocale(i18n.language)
  return [
    {
-      payloadId: 'skipper',
+      payloadId: PUBLIC_DEMO_SKIPPER_ID,
      data: {
        name: 'Demo Skipper',
        address: isDe ? 'Am Hafen 12, 24103 Kiel' : 'Harbour Quay 12, 24103 Kiel',
@@ -218,10 +249,46 @@ export function buildDemoCrewRecords(): DemoCrewRecord[] {
  ]
 }

+function buildDemoVesselPool(yacht: Record<string, unknown>): DemoVesselRecord[] {
+  return [
+    {
+      payloadId: PUBLIC_DEMO_VESSEL_ID,
+      data: { name: String(yacht.name ?? 'Demo'), ...yacht }
+    }
+  ]
+}
+
+function buildDemoLogbookVesselSelection(
+  yacht: Record<string, unknown>
+): PublicDemoFixture['logbookVesselSelection'] {
+  return {
+    activeVesselId: PUBLIC_DEMO_VESSEL_ID,
+    vesselSnapshot: { id: PUBLIC_DEMO_VESSEL_ID, ...yacht }
+  }
+}
+
+function buildDemoLogbookCrewSelection(pool: DemoCrewRecord[]) {
+  const skipper = pool.find((p) => p.data.role === 'skipper')
+  const crew = pool.filter((p) => p.data.role === 'crew')
+  const snapshotsById: Record<string, DemoCrewRecord['data'] & { id: string }> = {}
+  for (const p of pool) {
+    snapshotsById[p.payloadId] = { id: p.payloadId, ...p.data }
+  }
+  return {
+    activeSkipperId: skipper?.payloadId ?? PUBLIC_DEMO_SKIPPER_ID,
+    activeCrewIds: crew.map((c) => c.payloadId),
+    snapshotsById
+  }
+}
+
 export function buildPublicDemoFixture(): PublicDemoFixture {
  const title = i18n.t('demo.logbook_title')
  const yacht = buildDemoYachtData()
-  const crews = buildDemoCrewRecords()
+  const vesselPool = buildDemoVesselPool(yacht)
+  const logbookVesselSelection = buildDemoLogbookVesselSelection(yacht)
+  const personPool = buildDemoPersonPool()
+  const crews = personPool
+  const logbookCrewSelection = buildDemoLogbookCrewSelection(personPool)
  const days = buildDemoDays()
  const entries: PublicDemoFixture['entries'] = []
  const gpsTracks: PublicDemoFixture['gpsTracks'] = []
@@ -239,11 +306,18 @@ export function buildPublicDemoFixture(): PublicDemoFixture {
      destination: day.destination,
      freshwater: { ...day.freshwater },
      fuel: { ...day.fuel },
+      selectedSkipperId: logbookCrewSelection.activeSkipperId,
+      selectedCrewIds: [...logbookCrewSelection.activeCrewIds],
+      crewSnapshotsById: { ...logbookCrewSelection.snapshotsById },
      signSkipper: '',
      signCrew: '',
      events: day.events
    }

+    if (day.greywaterLevel != null && day.greywaterLevel > 0) {
+      entryPayload.greywater = { level: day.greywaterLevel }
+    }
+
    if (stats) {
      entryPayload.trackDistanceNm = stats.distanceNm
      entryPayload.trackSpeedMaxKn = stats.speedMaxKn
@@ -267,7 +341,11 @@ export function buildPublicDemoFixture(): PublicDemoFixture {
  return {
    title,
    yacht,
+    vesselPool,
+    logbookVesselSelection,
    crews,
+    personPool,
+    logbookCrewSelection,
    entries,
    gpsTracks,
    photos: [],
@@ -285,6 +363,7 @@ export function buildDemoEntryPayloads(): Array<{
  entryPayload: Record<string, unknown>
  trackData: { waypoints: unknown[]; gpxContent: string; filename: string; fileType: string }
 }> {
+  const logbookCrewSelection = buildDemoLogbookCrewSelection(buildDemoPersonPool())
  const days = buildDemoDays()
  return days.map((day) => {
    const entryId = crypto.randomUUID()
@@ -298,11 +377,18 @@ export function buildDemoEntryPayloads(): Array<{
      destination: day.destination,
      freshwater: { ...day.freshwater },
      fuel: { ...day.fuel },
+      selectedSkipperId: logbookCrewSelection.activeSkipperId,
+      selectedCrewIds: [...logbookCrewSelection.activeCrewIds],
+      crewSnapshotsById: { ...logbookCrewSelection.snapshotsById },
      signSkipper: '',
      signCrew: '',
      events: day.events
    }

+    if (day.greywaterLevel != null && day.greywaterLevel > 0) {
+      entryPayload.greywater = { level: day.greywaterLevel }
+    }
+
    if (stats) {
      entryPayload.trackDistanceNm = stats.distanceNm
      entryPayload.trackSpeedMaxKn = stats.speedMaxKn
@@ -0,0 +1,53 @@
+import { db } from './db.js'
+import { encryptJson, decryptJson } from './crypto.js'
+import { getActiveMasterKey } from './auth.js'
+
+export interface EntryDraftRecord {
+  logbookId: string
+  entryId: string
+  encryptedData: string
+  iv: string
+  tag: string
+  updatedAt: string
+}
+
+export async function saveEntryDraft(
+  logbookId: string,
+  entryId: string,
+  payload: unknown
+): Promise<void> {
+  const masterKey = getActiveMasterKey()
+  if (!masterKey) return
+
+  const { ciphertext, iv, tag } = await encryptJson(payload, masterKey)
+  await db.entryDrafts.put({
+    logbookId,
+    entryId,
+    encryptedData: ciphertext,
+    iv,
+    tag,
+    updatedAt: new Date().toISOString()
+  })
+}
+
+export async function loadEntryDraft<T = unknown>(
+  logbookId: string,
+  entryId: string
+): Promise<T | null> {
+  const masterKey = getActiveMasterKey()
+  if (!masterKey) return null
+
+  const row = await db.entryDrafts.get([logbookId, entryId])
+  if (!row) return null
+
+  try {
+    return (await decryptJson(row.encryptedData, row.iv, row.tag, masterKey)) as T
+  } catch {
+    await db.entryDrafts.delete([logbookId, entryId])
+    return null
+  }
+}
+
+export async function clearEntryDraft(logbookId: string, entryId: string): Promise<void> {
+  await db.entryDrafts.delete([logbookId, entryId])
+}
@@ -0,0 +1,106 @@
+import { db } from './db.js'
+import { getActiveMasterKey } from './auth.js'
+import { getLogbookKey } from './logbookKeys.js'
+import { decryptJson } from './crypto.js'
+import { compareTravelDaysChronological } from '../utils/logEntryTankLevels.js'
+import type { LogEventPayload } from '../utils/logEntryPayload.js'
+import { LIVE_EVENT_CODES } from '../utils/liveEventCodes.js'
+
+export interface EventSeriesPoint {
+  entryId: string
+  date: string
+  dayOfTravel: string
+  time: string
+  summary: string
+}
+
+export interface EventSeriesSummary {
+  pressure: EventSeriesPoint[]
+  wind: EventSeriesPoint[]
+  motor: EventSeriesPoint[]
+}
+
+function sortPoints(points: EventSeriesPoint[]): EventSeriesPoint[] {
+  return [...points].sort((a, b) => {
+    const dateCompare = a.date.localeCompare(b.date)
+    if (dateCompare !== 0) return dateCompare
+    return a.time.localeCompare(b.time)
+  })
+}
+
+export async function loadLogbookEventSeries(logbookId: string): Promise<EventSeriesSummary> {
+  const masterKey = await getLogbookKey(logbookId) || getActiveMasterKey()
+  if (!masterKey) throw new Error('Encryption key not found. Please log in.')
+
+  const local = await db.entries.where({ logbookId }).toArray()
+  const decryptedEntries: Array<{
+    entryId: string
+    date: string
+    dayOfTravel: string
+    events: LogEventPayload[]
+  }> = []
+
+  for (const entry of local) {
+    const decrypted = await decryptJson(entry.encryptedData, entry.iv, entry.tag, masterKey)
+    if (!decrypted) continue
+    decryptedEntries.push({
+      entryId: entry.payloadId,
+      date: String(decrypted.date || ''),
+      dayOfTravel: String(decrypted.dayOfTravel || ''),
+      events: (decrypted.events as LogEventPayload[]) || []
+    })
+  }
+
+  decryptedEntries.sort((a, b) =>
+    compareTravelDaysChronological(
+      { date: a.date, dayOfTravel: a.dayOfTravel },
+      { date: b.date, dayOfTravel: b.dayOfTravel }
+    )
+  )
+
+  const pressure: EventSeriesPoint[] = []
+  const wind: EventSeriesPoint[] = []
+  const motor: EventSeriesPoint[] = []
+
+  for (const entry of decryptedEntries) {
+    for (const event of entry.events) {
+      const base = {
+        entryId: entry.entryId,
+        date: entry.date,
+        dayOfTravel: entry.dayOfTravel,
+        time: event.time
+      }
+
+      if (event.windPressure?.trim()) {
+        pressure.push({
+          ...base,
+          summary: `${event.windPressure} hPa`
+        })
+      }
+
+      if (event.windDirection?.trim() || event.windStrength?.trim()) {
+        wind.push({
+          ...base,
+          summary: [event.windDirection, event.windStrength].filter(Boolean).join(' ')
+        })
+      }
+
+      const code = event.remarks?.trim() ?? ''
+      if (
+        code === LIVE_EVENT_CODES.MOTOR_START ||
+        code === LIVE_EVENT_CODES.MOTOR_STOP
+      ) {
+        motor.push({
+          ...base,
+          summary: code === LIVE_EVENT_CODES.MOTOR_START ? 'start' : 'stop'
+        })
+      }
+    }
+  }
+
+  return {
+    pressure: sortPoints(pressure),
+    wind: sortPoints(wind),
+    motor: sortPoints(motor)
+  }
+}
@@ -1,6 +1,6 @@
 import { apiFetch } from './api.js'

-export type FeedbackCategory = 'bug' | 'feature' | 'general'
+export type FeedbackCategory = 'bug' | 'feature' | 'general' | 'translation'

 export class FeedbackApiError extends Error {
  code: 'NOT_CONFIGURED' | 'REQUEST_FAILED' | 'INVALID_EMAIL' | 'RATE_LIMITED' | 'SPAM_DETECTED'
@@ -214,6 +214,10 @@ export async function createLogbook(title: string): Promise<DecryptedLogbook> {

      if (response.ok) {
        const serverLb = await response.json()
+        if (serverLb.id !== localId) {
+          await saveLogbookKey(serverLb.id, logbookKey)
+          await db.logbookKeys.delete(localId)
+        }
        await db.logbooks.put({
          id: serverLb.id,
          encryptedTitle: serverLb.encryptedTitle,
@@ -0,0 +1,75 @@
+import { db } from './db.js'
+import { getActiveMasterKey } from './auth.js'
+import { getLogbookKey } from './logbookKeys.js'
+import { decryptJson, encryptJson } from './crypto.js'
+import { syncLogbook } from './sync.js'
+import type { LogbookCrewSelectionData } from '../types/person.js'
+import { emptyLogbookCrewSelection } from '../types/person.js'
+import { buildLogbookCrewSelection } from '../utils/personSnapshots.js'
+import type { PersonData } from '../types/person.js'
+import { loadPersonPoolMap } from './personPool.js'
+
+async function resolveLogbookKey(logbookId: string): Promise<ArrayBuffer> {
+  const key = (await getLogbookKey(logbookId)) || getActiveMasterKey()
+  if (!key) throw new Error('Encryption key not found. Please log in.')
+  return key
+}
+
+export async function loadLogbookCrewSelection(
+  logbookId: string
+): Promise<LogbookCrewSelectionData> {
+  const record = await db.logbookCrewSelections.get(logbookId)
+  if (!record) return emptyLogbookCrewSelection()
+
+  const key = await resolveLogbookKey(logbookId)
+  const data = (await decryptJson(record.encryptedData, record.iv, record.tag, key)) as
+    | LogbookCrewSelectionData
+    | null
+  if (!data) return emptyLogbookCrewSelection()
+
+  return {
+    activeSkipperId: data.activeSkipperId ?? null,
+    activeCrewIds: Array.isArray(data.activeCrewIds) ? data.activeCrewIds : [],
+    snapshotsById: data.snapshotsById && typeof data.snapshotsById === 'object' ? data.snapshotsById : {}
+  }
+}
+
+export async function saveLogbookCrewSelection(
+  logbookId: string,
+  selection: LogbookCrewSelectionData
+): Promise<void> {
+  const key = await resolveLogbookKey(logbookId)
+  const encrypted = await encryptJson(selection, key)
+  const now = new Date().toISOString()
+
+  await db.logbookCrewSelections.put({
+    logbookId,
+    encryptedData: encrypted.ciphertext,
+    iv: encrypted.iv,
+    tag: encrypted.tag,
+    updatedAt: now
+  })
+
+  await db.syncQueue.put({
+    action: 'update',
+    type: 'logbookCrew',
+    payloadId: logbookId,
+    logbookId,
+    data: JSON.stringify(encrypted),
+    updatedAt: now
+  })
+
+  syncLogbook(logbookId).catch((err) => console.warn('Background sync failed:', err))
+}
+
+export async function saveLogbookCrewSelectionFromIds(
+  logbookId: string,
+  activeSkipperId: string | null,
+  activeCrewIds: string[],
+  poolOverride?: Map<string, PersonData>
+): Promise<LogbookCrewSelectionData> {
+  const pool = poolOverride ?? (await loadPersonPoolMap())
+  const selection = buildLogbookCrewSelection(activeSkipperId, activeCrewIds, pool)
+  await saveLogbookCrewSelection(logbookId, selection)
+  return selection
+}
@@ -91,6 +91,7 @@ export function clearLogbookKeysCache() {
 export async function ensureLogbookKey(logbookId: string): Promise<ArrayBuffer> {
  const localLb = await db.logbooks.get(logbookId)
  const encryptedTitle = localLb ? localLb.encryptedTitle : ''
+  const isShared = localLb?.isShared === 1
  const masterKey = getActiveMasterKey()

  let key = await getLogbookKey(logbookId)
@@ -103,6 +104,11 @@ export async function ensureLogbookKey(logbookId: string): Promise<ArrayBuffer>
      // Key works, return it
      return key
    } catch (err) {
+      if (isShared) {
+        throw new Error(
+          'Shared logbook encryption key is missing or invalid. Please go online and refresh your logbooks.'
+        )
+      }
      console.warn('Stored logbook key failed to decrypt title. Testing if master key works (legacy migration)...')
      try {
        const parsed = JSON.parse(encryptedTitle)
@@ -145,6 +151,12 @@ export async function ensureLogbookKey(logbookId: string): Promise<ArrayBuffer>

  // If no logbook key exists yet
  if (!key) {
+    if (isShared) {
+      throw new Error(
+        'Shared logbook encryption key not found. Please go online and refresh your logbooks.'
+      )
+    }
+
    if (encryptedTitle && masterKey) {
      try {
        // Check if title is already decryptable using masterKey (meaning it is a legacy logbook)
@@ -0,0 +1,81 @@
+import { db } from './db.js'
+import { getActiveMasterKey } from './auth.js'
+import { decryptJson } from './crypto.js'
+import { getLogbookKey } from './logbookKeys.js'
+import type { PersonData } from '../types/person.js'
+import { loadLogbookCrewSelection } from './logbookCrewSelection.js'
+import { loadPersonPoolMap } from './personPool.js'
+import { resolveVesselForLogbook } from './resolveVessel.js'
+import type { LogbookSearchFields } from '../utils/logbookFilter.js'
+
+async function loadLegacyCrewNames(logbookId: string): Promise<string[]> {
+  const records = await db.crews.where({ logbookId }).toArray()
+  if (records.length === 0) return []
+
+  const key = (await getLogbookKey(logbookId)) || getActiveMasterKey()
+  if (!key) return []
+
+  const names: string[] = []
+  for (const record of records) {
+    const data = (await decryptJson(record.encryptedData, record.iv, record.tag, key)) as PersonData | null
+    const name = data?.name?.trim()
+    if (name) names.push(name)
+  }
+  return names
+}
+
+function collectCrewNamesFromSelection(
+  selection: Awaited<ReturnType<typeof loadLogbookCrewSelection>>,
+  pool: Map<string, PersonData>
+): string[] {
+  const names = new Set<string>()
+
+  for (const snapshot of Object.values(selection.snapshotsById)) {
+    const name = snapshot.name?.trim()
+    if (name) names.add(name)
+  }
+
+  const ids = [
+    ...(selection.activeSkipperId ? [selection.activeSkipperId] : []),
+    ...selection.activeCrewIds
+  ]
+  for (const id of ids) {
+    const fromSnapshot = selection.snapshotsById[id]?.name?.trim()
+    if (fromSnapshot) {
+      names.add(fromSnapshot)
+      continue
+    }
+    const fromPool = pool.get(id)?.name?.trim()
+    if (fromPool) names.add(fromPool)
+  }
+
+  return [...names]
+}
+
+export async function loadLogbookSearchFields(logbookId: string): Promise<LogbookSearchFields> {
+  const [vessel, crewSelection, pool] = await Promise.all([
+    resolveVesselForLogbook(logbookId),
+    loadLogbookCrewSelection(logbookId),
+    loadPersonPoolMap()
+  ])
+
+  let crewNames = collectCrewNamesFromSelection(crewSelection, pool)
+  if (crewNames.length === 0) {
+    crewNames = await loadLegacyCrewNames(logbookId)
+  }
+
+  return {
+    vesselName: vessel?.name?.trim() ?? '',
+    crewNames
+  }
+}
+
+export async function loadLogbookSearchFieldsBatch(
+  logbookIds: string[]
+): Promise<Map<string, LogbookSearchFields>> {
+  const uniqueIds = [...new Set(logbookIds)]
+  const entries = await Promise.all(
+    uniqueIds.map(async (id) => [id, await loadLogbookSearchFields(id)] as const)
+  )
+  return new Map(entries)
+}
@@ -0,0 +1,73 @@
+import { db } from './db.js'
+import { getActiveMasterKey } from './auth.js'
+import { getLogbookKey } from './logbookKeys.js'
+import { decryptJson, encryptJson } from './crypto.js'
+import { syncLogbook } from './sync.js'
+import type { LogbookVesselSelectionData } from '../types/vessel.js'
+import { emptyLogbookVesselSelection } from '../types/vessel.js'
+import { buildLogbookVesselSelection } from '../utils/vesselSnapshot.js'
+import type { VesselData } from '../types/vessel.js'
+import { loadVesselPoolMap } from './vesselPool.js'
+
+async function resolveLogbookKey(logbookId: string): Promise<ArrayBuffer> {
+  const key = (await getLogbookKey(logbookId)) || getActiveMasterKey()
+  if (!key) throw new Error('Encryption key not found. Please log in.')
+  return key
+}
+
+export async function loadLogbookVesselSelection(
+  logbookId: string
+): Promise<LogbookVesselSelectionData> {
+  const record = await db.logbookVesselSelections.get(logbookId)
+  if (!record) return emptyLogbookVesselSelection()
+
+  const key = await resolveLogbookKey(logbookId)
+  const data = (await decryptJson(record.encryptedData, record.iv, record.tag, key)) as
+    | LogbookVesselSelectionData
+    | null
+  if (!data) return emptyLogbookVesselSelection()
+
+  return {
+    activeVesselId: data.activeVesselId ?? null,
+    vesselSnapshot: data.vesselSnapshot ?? null
+  }
+}
+
+export async function saveLogbookVesselSelection(
+  logbookId: string,
+  selection: LogbookVesselSelectionData
+): Promise<void> {
+  const key = await resolveLogbookKey(logbookId)
+  const encrypted = await encryptJson(selection, key)
+  const now = new Date().toISOString()
+
+  await db.logbookVesselSelections.put({
+    logbookId,
+    encryptedData: encrypted.ciphertext,
+    iv: encrypted.iv,
+    tag: encrypted.tag,
+    updatedAt: now
+  })
+
+  await db.syncQueue.put({
+    action: 'update',
+    type: 'logbookVessel',
+    payloadId: logbookId,
+    logbookId,
+    data: JSON.stringify(encrypted),
+    updatedAt: now
+  })
+
+  syncLogbook(logbookId).catch((err) => console.warn('Background sync failed:', err))
+}
+
+export async function saveLogbookVesselSelectionFromId(
+  logbookId: string,
+  activeVesselId: string | null,
+  poolOverride?: Map<string, VesselData>
+): Promise<LogbookVesselSelectionData> {
+  const pool = poolOverride ?? (await loadVesselPoolMap())
+  const selection = buildLogbookVesselSelection(activeVesselId, pool)
+  await saveLogbookVesselSelection(logbookId, selection)
+  return selection
+}
@@ -0,0 +1,31 @@
+import { readFileSync } from 'node:fs'
+import { resolve } from 'node:path'
+import { describe, expect, it } from 'vitest'
+import { parseNmeaFile } from './nmeaParse.js'
+import { detectNmeaChanges } from './nmeaChangeDetection.js'
+import { generateNmeaJournalCandidates } from './nmeaJournalGenerator.js'
+
+const nmeaPath = resolve(import.meta.dirname, '../../../../testdata/tracks/kieler-foerde-5sm.nmea')
+
+describe('kieler-foerde testdata', () => {
+  it('parses the sample NMEA log and yields journal candidates', () => {
+    const text = readFileSync(nmeaPath, 'utf8')
+    const result = parseNmeaFile(text, 'kieler-foerde-5sm.nmea')
+
+    expect(result.stats.checksumErrors).toBe(0)
+    expect(result.points.length).toBeGreaterThan(30)
+    expect(result.stats.sentenceTypes).toEqual(expect.arrayContaining(['RMC', 'GGA', 'MWV', 'DPT', 'MDA']))
+
+    const changes = detectNmeaChanges(result.points)
+    expect(changes.length).toBeGreaterThan(0)
+    expect(changes.some((c) => ['wind', 'engine_start', 'departure', 'speed', 'depth'].includes(c.type))).toBe(true)
+
+    const journal = generateNmeaJournalCandidates({
+      points: result.points,
+      mode: 'both',
+      intervalMinutes: 60,
+      t: (key) => key
+    })
+    expect(journal.candidates.length).toBeGreaterThanOrEqual(3)
+  })
+})
@@ -0,0 +1,76 @@
+import { describe, expect, it } from 'vitest'
+import type { NmeaTimePoint } from './nmeaTypes.js'
+import { detectNmeaChanges } from './nmeaChangeDetection.js'
+
+function point(
+  timestamp: number,
+  overrides: Partial<NmeaTimePoint> = {}
+): NmeaTimePoint {
+  return { timestamp, ...overrides }
+}
+
+describe('detectNmeaChanges', () => {
+  it('detects significant course changes while underway', () => {
+    const points = [
+      point(0, { cog: 0, sog: 5 }),
+      point(60_000, { cog: 45, sog: 5 })
+    ]
+
+    const events = detectNmeaChanges(points, {
+      courseDeltaDeg: 30,
+      windDirDeltaDeg: 30,
+      windSpeedDeltaKnots: 5,
+      pressureDeltaHpa: 2,
+      depthDeltaM: 1,
+      depthDeltaPercent: 25,
+      rpmIdle: 400,
+      rpmRunning: 800,
+      sogUnderWayKn: 2,
+      sogStoppedKn: 0.5,
+      anchorMinutes: 10,
+      speedDeltaKn: 2,
+      dedupeWindowMs: 60_000
+    })
+
+    expect(events.some((e) => e.type === 'course')).toBe(true)
+    const course = events.find((e) => e.type === 'course')
+    expect(course?.summaryParams).toMatchObject({ from: 0, to: 45 })
+  })
+
+  it('detects engine start when RPM rises above threshold', () => {
+    const points = [
+      point(0, { sog: 0, rpm: 0 }),
+      point(30_000, { sog: 3, rpm: 1200 })
+    ]
+
+    const events = detectNmeaChanges(points)
+    expect(events.some((e) => e.type === 'engine_start')).toBe(true)
+  })
+
+  it('dedupes repeated events within the configured window', () => {
+    const points = [
+      point(0, { cog: 0, sog: 5 }),
+      point(10_000, { cog: 50, sog: 5 }),
+      point(20_000, { cog: 100, sog: 5 })
+    ]
+
+    const events = detectNmeaChanges(points, {
+      courseDeltaDeg: 30,
+      windDirDeltaDeg: 30,
+      windSpeedDeltaKnots: 5,
+      pressureDeltaHpa: 2,
+      depthDeltaM: 1,
+      depthDeltaPercent: 25,
+      rpmIdle: 400,
+      rpmRunning: 800,
+      sogUnderWayKn: 2,
+      sogStoppedKn: 0.5,
+      anchorMinutes: 10,
+      speedDeltaKn: 2,
+      dedupeWindowMs: 120_000
+    })
+
+    const courseEvents = events.filter((e) => e.type === 'course')
+    expect(courseEvents.length).toBe(1)
+  })
+})
@@ -0,0 +1,211 @@
+import type { NmeaChangeEvent, NmeaDetectionConfig, NmeaTimePoint } from './nmeaTypes.js'
+import { DEFAULT_NMEA_DETECTION_CONFIG } from './nmeaTypes.js'
+import { angularDelta } from './nmeaTimeSeries.js'
+
+function pushUnique(events: NmeaChangeEvent[], event: NmeaChangeEvent, minGapMs: number) {
+  const last = events[events.length - 1]
+  if (last && last.type === event.type && event.timestamp - last.timestamp < minGapMs) return
+  events.push(event)
+}
+
+export function detectNmeaChanges(
+  points: NmeaTimePoint[],
+  config: NmeaDetectionConfig = DEFAULT_NMEA_DETECTION_CONFIG
+): NmeaChangeEvent[] {
+  const events: NmeaChangeEvent[] = []
+  if (points.length < 2) return events
+
+  let lastCourse: number | undefined
+  let lastWindDir: number | undefined
+  let lastWindSpeed: number | undefined
+  let lastPressure: number | undefined
+  let lastDepth: number | undefined
+  let lastWaterTemp: number | undefined
+  let lastFix: boolean | undefined
+  let engineRunning = false
+  let autopilot: boolean | undefined
+  let underWay = false
+  let stoppedSince: number | null = null
+  let lastSog: number | undefined
+
+  for (const p of points) {
+    const course = p.cog ?? p.hdt ?? p.hdm
+    if (course != null && lastCourse != null && (p.sog ?? 0) > 1) {
+      if (angularDelta(course, lastCourse) >= config.courseDeltaDeg) {
+        pushUnique(events, {
+          type: 'course',
+          timestamp: p.timestamp,
+          confidence: 'high',
+          summaryKey: 'logs.nmea_change_course',
+          summaryParams: { from: Math.round(lastCourse), to: Math.round(course) },
+          data: p
+        }, config.dedupeWindowMs)
+      }
+    }
+    if (course != null) lastCourse = course
+
+    if (p.windDir != null && lastWindDir != null) {
+      if (angularDelta(p.windDir, lastWindDir) >= config.windDirDeltaDeg) {
+        pushUnique(events, {
+          type: 'wind',
+          timestamp: p.timestamp,
+          confidence: 'high',
+          summaryKey: 'logs.nmea_change_wind',
+          summaryParams: { from: Math.round(lastWindDir), to: Math.round(p.windDir) },
+          data: p
+        }, config.dedupeWindowMs)
+      } else if (
+        p.windSpeedKnots != null &&
+        lastWindSpeed != null &&
+        Math.abs(p.windSpeedKnots - lastWindSpeed) >= config.windSpeedDeltaKnots
+      ) {
+        pushUnique(events, {
+          type: 'wind',
+          timestamp: p.timestamp,
+          confidence: 'medium',
+          summaryKey: 'logs.nmea_change_wind_speed',
+          summaryParams: { from: lastWindSpeed.toFixed(1), to: p.windSpeedKnots.toFixed(1) },
+          data: p
+        }, config.dedupeWindowMs)
+      }
+    }
+    if (p.windDir != null) lastWindDir = p.windDir
+    if (p.windSpeedKnots != null) lastWindSpeed = p.windSpeedKnots
+
+    if (p.pressureHpa != null && lastPressure != null) {
+      if (Math.abs(p.pressureHpa - lastPressure) >= config.pressureDeltaHpa) {
+        pushUnique(events, {
+          type: 'pressure',
+          timestamp: p.timestamp,
+          confidence: 'medium',
+          summaryKey: 'logs.nmea_change_pressure',
+          summaryParams: { from: lastPressure.toFixed(1), to: p.pressureHpa.toFixed(1) },
+          data: p
+        }, config.dedupeWindowMs)
+      }
+    }
+    if (p.pressureHpa != null) lastPressure = p.pressureHpa
+
+    if (p.depthM != null && lastDepth != null) {
+      const delta = Math.abs(p.depthM - lastDepth)
+      const rel = lastDepth > 0 ? (delta / lastDepth) * 100 : 100
+      if (delta >= config.depthDeltaM || rel >= config.depthDeltaPercent) {
+        pushUnique(events, {
+          type: 'depth',
+          timestamp: p.timestamp,
+          confidence: 'high',
+          summaryKey: 'logs.nmea_change_depth',
+          summaryParams: { from: lastDepth.toFixed(1), to: p.depthM.toFixed(1) },
+          data: p
+        }, config.dedupeWindowMs)
+      }
+    }
+    if (p.depthM != null) lastDepth = p.depthM
+
+    if (p.rpm != null) {
+      const running = p.rpm >= config.rpmRunning
+      const idle = p.rpm <= config.rpmIdle
+      if (running && !engineRunning) {
+        pushUnique(events, {
+          type: 'engine_start',
+          timestamp: p.timestamp,
+          confidence: 'high',
+          summaryKey: 'logs.nmea_change_engine_start',
+          summaryParams: { rpm: Math.round(p.rpm) },
+          data: p
+        }, config.dedupeWindowMs)
+        engineRunning = true
+      } else if (idle && engineRunning) {
+        pushUnique(events, {
+          type: 'engine_stop',
+          timestamp: p.timestamp,
+          confidence: 'high',
+          summaryKey: 'logs.nmea_change_engine_stop',
+          data: p
+        }, config.dedupeWindowMs)
+        engineRunning = false
+      }
+    }
+
+    if (p.autopilotEngaged != null && autopilot != null && p.autopilotEngaged !== autopilot) {
+      pushUnique(events, {
+        type: p.autopilotEngaged ? 'autopilot_on' : 'autopilot_off',
+        timestamp: p.timestamp,
+        confidence: 'high',
+        summaryKey: p.autopilotEngaged ? 'logs.nmea_change_autopilot_on' : 'logs.nmea_change_autopilot_off',
+        data: p
+      }, config.dedupeWindowMs)
+    }
+    if (p.autopilotEngaged != null) autopilot = p.autopilotEngaged
+
+    if (p.fixValid != null && lastFix != null && p.fixValid !== lastFix) {
+      pushUnique(events, {
+        type: p.fixValid ? 'gps_fix_regained' : 'gps_fix_lost',
+        timestamp: p.timestamp,
+        confidence: 'high',
+        summaryKey: p.fixValid ? 'logs.nmea_change_gps_regained' : 'logs.nmea_change_gps_lost',
+        data: p
+      }, config.dedupeWindowMs)
+    }
+    if (p.fixValid != null) lastFix = p.fixValid
+
+    if (p.waterTempC != null && lastWaterTemp != null) {
+      if (Math.abs(p.waterTempC - lastWaterTemp) >= 2) {
+        pushUnique(events, {
+          type: 'water_temp',
+          timestamp: p.timestamp,
+          confidence: 'medium',
+          summaryKey: 'logs.nmea_change_water_temp',
+          summaryParams: { from: lastWaterTemp.toFixed(1), to: p.waterTempC.toFixed(1) },
+          data: p
+        }, config.dedupeWindowMs)
+      }
+    }
+    if (p.waterTempC != null) lastWaterTemp = p.waterTempC
+
+    const sog = p.sog ?? 0
+    if (sog >= config.sogUnderWayKn && !underWay) {
+      if (stoppedSince != null && p.timestamp - stoppedSince >= config.anchorMinutes * 60 * 1000) {
+        pushUnique(events, {
+          type: 'departure',
+          timestamp: p.timestamp,
+          confidence: 'medium',
+          summaryKey: 'logs.nmea_change_departure',
+          data: p
+        }, config.dedupeWindowMs)
+      }
+      underWay = true
+      stoppedSince = null
+    }
+    if (sog <= config.sogStoppedKn && underWay) {
+      underWay = false
+      stoppedSince = p.timestamp
+    }
+    if (sog <= config.sogStoppedKn && stoppedSince != null && !underWay) {
+      if (p.timestamp - stoppedSince >= config.anchorMinutes * 60 * 1000) {
+        pushUnique(events, {
+          type: 'anchor',
+          timestamp: p.timestamp,
+          confidence: 'medium',
+          summaryKey: 'logs.nmea_change_anchor',
+          data: p
+        }, config.dedupeWindowMs)
+        stoppedSince = null
+      }
+    }
+
+    if (lastSog != null && Math.abs(sog - lastSog) >= config.speedDeltaKn) {
+      pushUnique(events, {
+        type: 'speed',
+        timestamp: p.timestamp,
+        confidence: 'low',
+        summaryKey: 'logs.nmea_change_speed',
+        summaryParams: { from: lastSog.toFixed(1), to: sog.toFixed(1) },
+        data: p
+      }, config.dedupeWindowMs)
+    }
+    lastSog = sog
+  }
+
+  return events.sort((a, b) => a.timestamp - b.timestamp)
+}
@@ -0,0 +1,139 @@
+import type { TFunction } from 'i18next'
+import type { LogEventPayload } from '../../utils/logEntryPayload.js'
+import { normalizeLogEvent } from '../../utils/logEntryPayload.js'
+import { formatCourseAngle } from '../../utils/courseAngle.js'
+import { degreesToCardinal } from '../../utils/courseAngle.js'
+import type {
+  NmeaChangeEvent,
+  NmeaImportMode,
+  NmeaJournalCandidate,
+  NmeaTimePoint
+} from './nmeaTypes.js'
+import { detectNmeaChanges } from './nmeaChangeDetection.js'
+import { intervalTimestamps, sampleAt, timestampToHHMM } from './nmeaTimeSeries.js'
+
+export interface GeneratedNmeaJournal {
+  candidates: Array<NmeaJournalCandidate & { event: LogEventPayload }>
+}
+
+function pointToLogEvent(
+  point: NmeaTimePoint,
+  remarks: string,
+  sailsOrMotor: string
+): LogEventPayload {
+  const course = point.cog ?? point.hdt ?? point.hdm
+  const mgk = course != null ? formatCourseAngle(course) : ''
+  const windDir =
+    point.windDir != null ? degreesToCardinal(point.windDir) : ''
+
+  return normalizeLogEvent({
+    time: timestampToHHMM(point.timestamp),
+    mgk,
+    rwk: '',
+    windDirection: windDir,
+    windStrength: point.windSpeedKnots != null ? String(point.windSpeedKnots) : '',
+    windPressure: point.pressureHpa != null ? String(Math.round(point.pressureHpa)) : '',
+    gpsLat: point.lat != null ? point.lat.toFixed(6) : '',
+    gpsLng: point.lng != null ? point.lng.toFixed(6) : '',
+    logReading: point.logDistanceNm != null ? point.logDistanceNm.toFixed(2) : '',
+    sailsOrMotor,
+    remarks
+  })
+}
+
+function changeToSailsOrMotor(type: NmeaChangeEvent['type']): string {
+  if (type === 'engine_start') return 'Motor'
+  if (type === 'engine_stop') return 'Segel'
+  return ''
+}
+
+function buildRemarks(change: NmeaChangeEvent, t: TFunction): string {
+  const parts: string[] = []
+  parts.push(t(change.summaryKey, change.summaryParams ?? {}))
+  if (change.data?.depthM != null) {
+    parts.push(t('logs.nmea_remark_depth', { depth: change.data.depthM.toFixed(1) }))
+  }
+  if (change.confidence === 'low') {
+    parts.push(t('logs.nmea_remark_uncertain'))
+  }
+  return parts.join(' · ')
+}
+
+function dedupeCandidates(
+  items: Array<NmeaJournalCandidate & { event: LogEventPayload; timestamp: number }>,
+  windowMs: number
+): Array<NmeaJournalCandidate & { event: LogEventPayload }> {
+  const sorted = [...items].sort((a, b) => a.timestamp - b.timestamp)
+  const kept: typeof sorted = []
+
+  for (const item of sorted) {
+    const near = kept.find((k) => Math.abs(k.timestamp - item.timestamp) <= windowMs)
+    if (!near) {
+      kept.push(item)
+      continue
+    }
+    if (item.source === 'change' && near.source === 'interval') {
+      const idx = kept.indexOf(near)
+      kept[idx] = {
+        ...item,
+        event: {
+          ...near.event,
+          remarks: [item.event.remarks, near.event.remarks].filter(Boolean).join(' · ')
+        }
+      }
+    }
+  }
+
+  return kept
+}
+
+export function generateNmeaJournalCandidates(options: {
+  points: NmeaTimePoint[]
+  mode: NmeaImportMode
+  intervalMinutes: number
+  t: TFunction
+}): GeneratedNmeaJournal {
+  const { points, mode, intervalMinutes, t } = options
+  const items: Array<NmeaJournalCandidate & { event: LogEventPayload; timestamp: number }> = []
+
+  if (mode === 'interval' || mode === 'both') {
+    for (const ts of intervalTimestamps(points, intervalMinutes)) {
+      const sample = sampleAt(points, ts)
+      if (!sample) continue
+      items.push({
+        id: `interval-${ts}`,
+        timestamp: ts,
+        source: 'interval',
+        selected: true,
+        event: pointToLogEvent(sample, t('logs.nmea_remark_interval'), '')
+      })
+    }
+  }
+
+  if (mode === 'change' || mode === 'both') {
+    const changes = detectNmeaChanges(points)
+    for (const change of changes) {
+      const sample = change.data ?? sampleAt(points, change.timestamp)
+      if (!sample) continue
+      items.push({
+        id: `change-${change.type}-${change.timestamp}`,
+        timestamp: change.timestamp,
+        source: 'change',
+        changeType: change.type,
+        confidence: change.confidence,
+        selected: true,
+        event: pointToLogEvent(
+          { ...sample, timestamp: change.timestamp },
+          buildRemarks(change, t),
+          changeToSailsOrMotor(change.type)
+        )
+      })
+    }
+  }
+
+  const deduped = mode === 'both'
+    ? dedupeCandidates(items, 15 * 60 * 1000)
+    : items
+
+  return { candidates: deduped }
+}
@@ -0,0 +1,69 @@
+import { describe, expect, it } from 'vitest'
+import { nmeaPointsToWaypoints, parseNmeaFile } from './nmeaParse.js'
+
+describe('parseNmeaFile', () => {
+  it('parses RMC position, course and speed', () => {
+    const text = [
+      '$GPRMC,123519,A,4807.038,N,01131.000,E,022.4,084.4,230394,003.1,W',
+      '$GPRMC,133519,A,4808.038,N,01132.000,E,025.0,090.0,230394,003.1,W'
+    ].join('\n')
+
+    const result = parseNmeaFile(text, 'test.nmea')
+
+    expect(result.stats.parsedLines).toBe(2)
+    expect(result.stats.sentenceTypes).toContain('RMC')
+    expect(result.points.length).toBeGreaterThanOrEqual(2)
+
+    const first = result.points[0]
+    expect(first.lat).toBeCloseTo(48.1173, 3)
+    expect(first.lng).toBeCloseTo(11.516667, 3)
+    expect(first.sog).toBe(22.4)
+    expect(first.cog).toBe(84.4)
+    expect(first.fixValid).toBe(true)
+  })
+
+  it('merges wind and depth sentences onto the same timestamp', () => {
+    const text = [
+      '$GPRMC,100000,A,5400.000,N,01000.000,E,5.0,180.0,010124,003.0,E',
+      '$IIMWV,270.0,R,12.5,N,A',
+      '$SDDPT,4.5,0.0'
+    ].join('\n')
+
+    const result = parseNmeaFile(text, 'merged.nmea')
+    const last = result.points[result.points.length - 1]
+
+    expect(last.windDir).toBe(270)
+    expect(last.windSpeedKnots).toBe(12.5)
+    expect(last.depthM).toBe(4.5)
+  })
+
+  it('skips lines with invalid checksum', () => {
+    const text = '$GPRMC,123519,A,4807.038,N,01131.000,E,022.4,084.4,230394,003.1,W*FF'
+    const result = parseNmeaFile(text, 'bad.nmea')
+
+    expect(result.stats.checksumErrors).toBe(1)
+    expect(result.points).toHaveLength(0)
+    expect(result.warnings).toContain('no_samples')
+  })
+
+  it('warns when no position sentences are present', () => {
+    const text = '$IIMWV,090.0,R,8.0,N,A'
+    const result = parseNmeaFile(text, 'wind-only.nmea')
+
+    expect(result.warnings).toContain('no_position')
+  })
+})
+
+describe('nmeaPointsToWaypoints', () => {
+  it('maps points with coordinates to track waypoints', () => {
+    const waypoints = nmeaPointsToWaypoints([
+      { timestamp: 1, lat: 54.0, lng: 10.0, sog: 6, cog: 90 },
+      { timestamp: 2, windDir: 180 },
+      { timestamp: 3, lat: 54.01, lng: 10.01, hdt: 95 }
+    ])
+
+    expect(waypoints).toHaveLength(2)
+    expect(waypoints[0]).toMatchObject({ lat: 54, lng: 10, speedKnots: 6, heading: 90 })
+    expect(waypoints[1].heading).toBe(95)
+  })
+})
@@ -0,0 +1,283 @@
+import type { NmeaParseResult, NmeaParseStats, NmeaTimePoint } from './nmeaTypes.js'
+
+function parseChecksum(line: string): boolean {
+  const star = line.lastIndexOf('*')
+  if (star < 0) return true
+  const expected = line.slice(star + 1, star + 3)
+  if (!/^[0-9A-Fa-f]{2}$/.test(expected)) return false
+  let sum = 0
+  for (let i = 1; i < star; i++) sum ^= line.charCodeAt(i)
+  return sum.toString(16).toUpperCase().padStart(2, '0') === expected.toUpperCase()
+}
+
+function sentenceType(field0: string): string {
+  return field0.length >= 3 ? field0.slice(-3) : field0
+}
+
+function parseLatLon(latStr: string, latHem: string, lonStr: string, lonHem: string): { lat?: number; lng?: number } {
+  const latVal = parseFloat(latStr)
+  const lonVal = parseFloat(lonStr)
+  if (Number.isNaN(latVal) || Number.isNaN(lonVal)) return {}
+  const latDeg = Math.floor(latVal / 100)
+  const latMin = latVal - latDeg * 100
+  let lat = latDeg + latMin / 60
+  if (latHem === 'S') lat = -lat
+
+  const lonDeg = Math.floor(lonVal / 100)
+  const lonMin = lonVal - lonDeg * 100
+  let lng = lonDeg + lonMin / 60
+  if (lonHem === 'W') lng = -lng
+
+  return { lat: Number(lat.toFixed(6)), lng: Number(lng.toFixed(6)) }
+}
+
+function parseRmcDateTime(timeStr: string, dateStr: string, baseYear = new Date().getFullYear()): number | null {
+  if (!timeStr || timeStr.length < 6) return null
+  const hh = parseInt(timeStr.slice(0, 2), 10)
+  const mm = parseInt(timeStr.slice(2, 4), 10)
+  const ss = parseInt(timeStr.slice(4, 6), 10)
+  if ([hh, mm, ss].some((n) => Number.isNaN(n))) return null
+
+  let year = baseYear
+  let month = 0
+  let day = 1
+  if (dateStr && dateStr.length >= 6) {
+    day = parseInt(dateStr.slice(0, 2), 10)
+    month = parseInt(dateStr.slice(2, 4), 10) - 1
+    const yy = parseInt(dateStr.slice(4, 6), 10)
+    year = yy >= 70 ? 1900 + yy : 2000 + yy
+  }
+
+  return Date.UTC(year, month, day, hh, mm, ss)
+}
+
+function parseWindSpeed(value: string, unit: string): number | undefined {
+  const speed = parseFloat(value)
+  if (Number.isNaN(speed)) return undefined
+  if (unit === 'N') return speed
+  if (unit === 'M') return speed * 1.94384
+  if (unit === 'K') return speed * 0.539957
+  return speed
+}
+
+interface MutableState extends NmeaTimePoint {
+  lastTimestamp: number | null
+}
+
+function snapshot(state: MutableState): NmeaTimePoint | null {
+  if (state.lastTimestamp == null) return null
+  const { lastTimestamp, ...rest } = state
+  void lastTimestamp
+  if (
+    rest.lat == null &&
+    rest.lng == null &&
+    rest.cog == null &&
+    rest.sog == null &&
+    rest.hdt == null &&
+    rest.windDir == null &&
+    rest.windSpeedKnots == null &&
+    rest.depthM == null &&
+    rest.rpm == null
+  ) {
+    return null
+  }
+  return rest as NmeaTimePoint
+}
+
+function pushPoint(points: NmeaTimePoint[], state: MutableState) {
+  const snap = snapshot(state)
+  if (!snap) return
+  const last = points[points.length - 1]
+  if (last && last.timestamp === snap.timestamp) {
+    points[points.length - 1] = { ...last, ...snap }
+    return
+  }
+  points.push(snap)
+}
+
+function applySentence(state: MutableState, type: string, fields: string[], points: NmeaTimePoint[]) {
+  switch (type) {
+    case 'RMC': {
+      const status = fields[2]
+      const ts = parseRmcDateTime(fields[1], fields[9])
+      if (ts != null) {
+        state.timestamp = ts
+        state.lastTimestamp = ts
+      }
+      if (status === 'A') {
+        Object.assign(state, parseLatLon(fields[3], fields[4], fields[5], fields[6]))
+        state.fixValid = true
+        const sog = parseFloat(fields[7])
+        const cog = parseFloat(fields[8])
+        if (!Number.isNaN(sog)) state.sog = sog
+        if (!Number.isNaN(cog)) state.cog = cog
+      } else {
+        state.fixValid = false
+      }
+      pushPoint(points, state)
+      break
+    }
+    case 'GGA': {
+      const ts = parseRmcDateTime(fields[1], '')
+      if (ts != null) {
+        state.timestamp = ts
+        state.lastTimestamp = ts
+      }
+      Object.assign(state, parseLatLon(fields[2], fields[3], fields[4], fields[5]))
+      const quality = parseInt(fields[6], 10)
+      state.fixValid = !Number.isNaN(quality) && quality > 0
+      pushPoint(points, state)
+      break
+    }
+    case 'GLL': {
+      const ts = parseRmcDateTime(fields[5], fields[6] ?? '')
+      if (ts != null) {
+        state.timestamp = ts
+        state.lastTimestamp = ts
+      }
+      Object.assign(state, parseLatLon(fields[1], fields[2], fields[3], fields[4]))
+      state.fixValid = fields[7] === 'A'
+      pushPoint(points, state)
+      break
+    }
+    case 'VTG': {
+      const cog = parseFloat(fields[1])
+      const sog = parseFloat(fields[5] || fields[7])
+      if (!Number.isNaN(cog)) state.cog = cog
+      if (!Number.isNaN(sog)) state.sog = sog
+      if (state.lastTimestamp != null) pushPoint(points, state)
+      break
+    }
+    case 'HDT':
+      state.hdt = parseFloat(fields[1])
+      if (state.lastTimestamp != null) pushPoint(points, state)
+      break
+    case 'HDM':
+      state.hdm = parseFloat(fields[1])
+      if (state.lastTimestamp != null) pushPoint(points, state)
+      break
+    case 'HDG': {
+      const hdg = parseFloat(fields[1])
+      if (!Number.isNaN(hdg)) state.hdm = hdg
+      if (state.lastTimestamp != null) pushPoint(points, state)
+      break
+    }
+    case 'MWV': {
+      if (fields[5] !== 'A') break
+      const dir = parseFloat(fields[1])
+      const speed = parseWindSpeed(fields[3], fields[4])
+      if (!Number.isNaN(dir)) state.windDir = dir
+      if (speed != null) state.windSpeedKnots = Number(speed.toFixed(1))
+      if (state.lastTimestamp != null) pushPoint(points, state)
+      break
+    }
+    case 'MWD': {
+      const dir = parseFloat(fields[1])
+      const speed = parseFloat(fields[5])
+      if (!Number.isNaN(dir)) state.windDir = dir
+      if (!Number.isNaN(speed)) state.windSpeedKnots = Number(speed.toFixed(1))
+      if (state.lastTimestamp != null) pushPoint(points, state)
+      break
+    }
+    case 'DPT':
+    case 'DBT': {
+      const depth = parseFloat(fields[1])
+      if (!Number.isNaN(depth)) state.depthM = depth
+      if (state.lastTimestamp != null) pushPoint(points, state)
+      break
+    }
+    case 'RPM': {
+      const rpm = parseFloat(fields[3] ?? fields[2])
+      if (!Number.isNaN(rpm)) state.rpm = rpm
+      if (state.lastTimestamp != null) pushPoint(points, state)
+      break
+    }
+    case 'MDA': {
+      const inchHg = parseFloat(fields[3])
+      const hpaField = parseFloat(fields[15] ?? fields[4])
+      if (!Number.isNaN(hpaField) && hpaField > 800) state.pressureHpa = hpaField
+      else if (!Number.isNaN(inchHg)) state.pressureHpa = inchHg * 33.8639
+      if (state.lastTimestamp != null) pushPoint(points, state)
+      break
+    }
+    case 'MTW': {
+      const temp = parseFloat(fields[1])
+      if (!Number.isNaN(temp)) state.waterTempC = temp
+      if (state.lastTimestamp != null) pushPoint(points, state)
+      break
+    }
+    case 'VLW': {
+      const nm = parseFloat(fields[1] ?? fields[2])
+      if (!Number.isNaN(nm)) state.logDistanceNm = nm
+      if (state.lastTimestamp != null) pushPoint(points, state)
+      break
+    }
+    case 'APA': {
+      const mode = fields[1]
+      state.autopilotEngaged = mode === '1' || mode?.toUpperCase() === 'A'
+      if (state.lastTimestamp != null) pushPoint(points, state)
+      break
+    }
+    default:
+      break
+  }
+}
+
+export function parseNmeaFile(text: string, filename: string): NmeaParseResult {
+  const warnings: string[] = []
+  const points: NmeaTimePoint[] = []
+  const typesSeen = new Set<string>()
+  let totalLines = 0
+  let parsedLines = 0
+  let checksumErrors = 0
+
+  const state: MutableState = { timestamp: 0, lastTimestamp: null }
+
+  for (const rawLine of text.split(/\r?\n/)) {
+    const line = rawLine.trim()
+    if (!line || (!line.startsWith('$') && !line.startsWith('!'))) continue
+    totalLines++
+    if (!parseChecksum(line)) {
+      checksumErrors++
+      continue
+    }
+
+    const star = line.indexOf('*')
+    const body = star >= 0 ? line.slice(0, star) : line
+    const fields = body.slice(1).split(',')
+    if (fields.length < 2) continue
+
+    const type = sentenceType(fields[0])
+    typesSeen.add(type)
+    applySentence(state, type, fields, points)
+    parsedLines++
+  }
+
+  if (points.length === 0) {
+    warnings.push('no_samples')
+  }
+  if (!typesSeen.has('RMC') && !typesSeen.has('GGA') && !typesSeen.has('GLL')) {
+    warnings.push('no_position')
+  }
+
+  const stats: NmeaParseStats = {
+    totalLines,
+    parsedLines,
+    checksumErrors,
+    sentenceTypes: [...typesSeen].sort()
+  }
+
+  return { points, stats, warnings, rawText: text, filename }
+}
+
+export function nmeaPointsToWaypoints(points: NmeaTimePoint[]): import('../trackUpload.js').TrackWaypoint[] {
+  return points
+    .filter((p) => p.lat != null && p.lng != null)
+    .map((p) => ({
+      timestamp: p.timestamp,
+      lat: p.lat!,
+      lng: p.lng!,
+      speedKnots: p.sog,
+      heading: p.cog ?? p.hdt ?? p.hdm
+    }))
+}
@@ -0,0 +1,58 @@
+import type { NmeaTimePoint } from './nmeaTypes.js'
+
+/** Nearest sample at or before timestamp (carry-forward). */
+export function sampleAt(points: NmeaTimePoint[], timestamp: number): NmeaTimePoint | null {
+  if (points.length === 0) return null
+  let best: NmeaTimePoint | null = null
+  for (const p of points) {
+    if (p.timestamp <= timestamp) best = p
+    else break
+  }
+  return best ?? points[0]
+}
+
+export function filterPointsForDate(points: NmeaTimePoint[], dateYmd: string): NmeaTimePoint[] {
+  if (!dateYmd || points.length === 0) return points
+  const [y, m, d] = dateYmd.split('-').map((v) => parseInt(v, 10))
+  if ([y, m, d].some((n) => Number.isNaN(n))) return points
+
+  const start = Date.UTC(y, m - 1, d, 0, 0, 0)
+  const end = Date.UTC(y, m - 1, d, 23, 59, 59)
+
+  const filtered = points.filter((p) => p.timestamp >= start && p.timestamp <= end)
+  return filtered.length > 0 ? filtered : points
+}
+
+export function timestampToHHMM(timestamp: number, timeZone?: string): string {
+  const opts: Intl.DateTimeFormatOptions = {
+    hour: '2-digit',
+    minute: '2-digit',
+    hour12: false,
+    timeZone: timeZone ?? undefined
+  }
+  const parts = new Intl.DateTimeFormat('en-GB', opts).formatToParts(new Date(timestamp))
+  const hh = parts.find((p) => p.type === 'hour')?.value ?? '00'
+  const mm = parts.find((p) => p.type === 'minute')?.value ?? '00'
+  return `${hh}:${mm}`
+}
+
+export function angularDelta(a: number, b: number): number {
+  const diff = Math.abs(a - b) % 360
+  return diff > 180 ? 360 - diff : diff
+}
+
+export function intervalTimestamps(
+  points: NmeaTimePoint[],
+  intervalMinutes: number
+): number[] {
+  if (points.length === 0) return []
+  const start = points[0].timestamp
+  const end = points[points.length - 1].timestamp
+  const stepMs = intervalMinutes * 60 * 1000
+  const stamps: number[] = []
+  for (let t = start; t <= end; t += stepMs) {
+    stamps.push(t)
+  }
+  if (stamps[stamps.length - 1] !== end) stamps.push(end)
+  return stamps
+}
@@ -0,0 +1,102 @@
+export type NmeaChangeType =
+  | 'course'
+  | 'wind'
+  | 'pressure'
+  | 'engine_start'
+  | 'engine_stop'
+  | 'autopilot_on'
+  | 'autopilot_off'
+  | 'depth'
+  | 'anchor'
+  | 'departure'
+  | 'speed'
+  | 'gps_fix_lost'
+  | 'gps_fix_regained'
+  | 'water_temp'
+  | 'wind_shift'
+
+export interface NmeaParseStats {
+  totalLines: number
+  parsedLines: number
+  checksumErrors: number
+  sentenceTypes: string[]
+}
+
+export interface NmeaTimePoint {
+  timestamp: number
+  lat?: number
+  lng?: number
+  cog?: number
+  sog?: number
+  hdt?: number
+  hdm?: number
+  windDir?: number
+  windSpeedKnots?: number
+  depthM?: number
+  rpm?: number
+  pressureHpa?: number
+  waterTempC?: number
+  logDistanceNm?: number
+  fixValid?: boolean
+  autopilotEngaged?: boolean
+}
+
+export interface NmeaChangeEvent {
+  type: NmeaChangeType
+  timestamp: number
+  confidence: 'high' | 'medium' | 'low'
+  summaryKey: string
+  summaryParams?: Record<string, string | number>
+  data?: Partial<NmeaTimePoint>
+}
+
+export interface NmeaParseResult {
+  points: NmeaTimePoint[]
+  stats: NmeaParseStats
+  warnings: string[]
+  rawText: string
+  filename: string
+}
+
+export type NmeaImportMode = 'interval' | 'change' | 'both'
+
+export interface NmeaJournalCandidate {
+  id: string
+  timestamp: number
+  source: 'interval' | 'change'
+  changeType?: NmeaChangeType
+  confidence?: 'high' | 'medium' | 'low'
+  selected: boolean
+}
+
+export interface NmeaDetectionConfig {
+  courseDeltaDeg: number
+  windDirDeltaDeg: number
+  windSpeedDeltaKnots: number
+  pressureDeltaHpa: number
+  depthDeltaM: number
+  depthDeltaPercent: number
+  rpmIdle: number
+  rpmRunning: number
+  sogUnderWayKn: number
+  sogStoppedKn: number
+  anchorMinutes: number
+  speedDeltaKn: number
+  dedupeWindowMs: number
+}
+
+export const DEFAULT_NMEA_DETECTION_CONFIG: NmeaDetectionConfig = {
+  courseDeltaDeg: 28,
+  windDirDeltaDeg: 35,
+  windSpeedDeltaKnots: 4,
+  pressureDeltaHpa: 2,
+  depthDeltaM: 2,
+  depthDeltaPercent: 25,
+  rpmIdle: 400,
+  rpmRunning: 800,
+  sogUnderWayKn: 2,
+  sogStoppedKn: 0.5,
+  anchorMinutes: 10,
+  speedDeltaKn: 3,
+  dedupeWindowMs: 5 * 60 * 1000
+}
@@ -0,0 +1,24 @@
+import { describe, expect, it } from 'vitest'
+import { isNmeaCrcAlreadyImported, type NmeaArchiveRecord } from './nmeaArchive.js'
+import { nmeaFileCrc32 } from '../utils/crc32.js'
+
+describe('nmeaArchive CRC tracking', () => {
+  it('detects duplicate file content by CRC32', () => {
+    const text = '$GPRMC,123519,A,4807.038,N,01131.000,E,022.4,084.4,230394,003.1,W\n'
+    const record: NmeaArchiveRecord = {
+      filename: 'a.nmea',
+      rawText: '',
+      importedAt: '2026-05-29T10:00:00.000Z',
+      importedFiles: [{
+        crc32: nmeaFileCrc32(text),
+        filename: 'a.nmea',
+        importedAt: '2026-05-29T10:00:00.000Z'
+      }]
+    }
+
+    expect(isNmeaCrcAlreadyImported(record, text)).toBe(true)
+    expect(isNmeaCrcAlreadyImported(record, text.replace('\n', '\r\n'))).toBe(true)
+    expect(isNmeaCrcAlreadyImported(record, '$GPRMC,999999,A\n')).toBe(false)
+    expect(isNmeaCrcAlreadyImported(null, text)).toBe(false)
+  })
+})
@@ -0,0 +1,146 @@
+import { db } from './db.js'
+import { getActiveMasterKey } from './auth.js'
+import { getLogbookKey } from './logbookKeys.js'
+import { encryptJson, decryptJson } from './crypto.js'
+import { nmeaFileCrc32 } from '../utils/crc32.js'
+
+export interface NmeaImportedFile {
+  crc32: string
+  filename: string
+  importedAt: string
+}
+
+export interface NmeaArchiveRecord {
+  filename: string
+  rawText: string
+  importedAt: string
+  importedFiles: NmeaImportedFile[]
+}
+
+function normalizeArchiveRecord(raw: Partial<NmeaArchiveRecord>): NmeaArchiveRecord {
+  const importedFiles = [...(raw.importedFiles ?? [])]
+  if (importedFiles.length === 0 && raw.rawText) {
+    importedFiles.push({
+      crc32: nmeaFileCrc32(raw.rawText),
+      filename: raw.filename ?? '',
+      importedAt: raw.importedAt ?? ''
+    })
+  }
+  return {
+    filename: raw.filename ?? '',
+    rawText: raw.rawText ?? '',
+    importedAt: raw.importedAt ?? '',
+    importedFiles
+  }
+}
+
+async function putNmeaArchiveRecord(
+  logbookId: string,
+  entryId: string,
+  payload: NmeaArchiveRecord
+): Promise<void> {
+  const masterKey = await getLogbookKey(logbookId) || getActiveMasterKey()
+  if (!masterKey) throw new Error('Encryption key not found. Please log in.')
+
+  const encrypted = await encryptJson(payload, masterKey)
+  await db.nmeaArchives.put({
+    entryId,
+    logbookId,
+    encryptedData: encrypted.ciphertext,
+    iv: encrypted.iv,
+    tag: encrypted.tag,
+    updatedAt: payload.importedAt || new Date().toISOString()
+  })
+}
+
+export async function getNmeaArchive(entryId: string): Promise<NmeaArchiveRecord | null> {
+  const record = await db.nmeaArchives.get(entryId)
+  if (!record) return null
+
+  const masterKey = await getLogbookKey(record.logbookId) || getActiveMasterKey()
+  if (!masterKey) throw new Error('Encryption key not found. Please log in.')
+
+  try {
+    return normalizeArchiveRecord(
+      await decryptJson(record.encryptedData, record.iv, record.tag, masterKey) as Partial<NmeaArchiveRecord>
+    )
+  } catch {
+    return null
+  }
+}
+
+export function isNmeaCrcAlreadyImported(record: NmeaArchiveRecord | null, rawText: string): boolean {
+  if (!record) return false
+  const crc32 = nmeaFileCrc32(rawText)
+  return record.importedFiles.some((file) => file.crc32 === crc32)
+}
+
+/** Remember imported file by CRC (even when raw log is discarded). */
+export async function recordNmeaFileImport(
+  logbookId: string,
+  entryId: string,
+  filename: string,
+  rawText: string
+): Promise<string> {
+  const crc32 = nmeaFileCrc32(rawText)
+  const existing = await getNmeaArchive(entryId)
+  const importedFiles = [...(existing?.importedFiles ?? [])]
+  if (!importedFiles.some((file) => file.crc32 === crc32)) {
+    importedFiles.push({
+      crc32,
+      filename,
+      importedAt: new Date().toISOString()
+    })
+  }
+
+  const payload: NmeaArchiveRecord = {
+    filename: existing?.filename ?? '',
+    rawText: existing?.rawText ?? '',
+    importedAt: new Date().toISOString(),
+    importedFiles
+  }
+  await putNmeaArchiveRecord(logbookId, entryId, payload)
+  return crc32
+}
+
+export async function saveNmeaArchive(
+  logbookId: string,
+  entryId: string,
+  filename: string,
+  rawText: string
+): Promise<void> {
+  const crc32 = nmeaFileCrc32(rawText)
+  const existing = await getNmeaArchive(entryId)
+  const importedFiles = [...(existing?.importedFiles ?? [])]
+  if (!importedFiles.some((file) => file.crc32 === crc32)) {
+    importedFiles.push({
+      crc32,
+      filename,
+      importedAt: new Date().toISOString()
+    })
+  }
+
+  const payload: NmeaArchiveRecord = {
+    filename,
+    rawText,
+    importedAt: new Date().toISOString(),
+    importedFiles
+  }
+  await putNmeaArchiveRecord(logbookId, entryId, payload)
+}
+
+export async function deleteNmeaArchive(entryId: string): Promise<void> {
+  await db.nmeaArchives.delete(entryId)
+}
+
+export function downloadNmeaArchive(record: NmeaArchiveRecord): void {
+  const blob = new Blob([record.rawText], { type: 'text/plain;charset=utf-8' })
+  const url = URL.createObjectURL(blob)
+  const a = document.createElement('a')
+  a.href = url
+  a.download = record.filename || 'track.nmea'
+  document.body.appendChild(a)
+  a.click()
+  document.body.removeChild(a)
+  URL.revokeObjectURL(url)
+}
@@ -31,20 +31,15 @@ export async function generateLogbookPagePdf(logbookId: string, entryId: string,
      throw new Error('Encryption key not found. Please log in.')
    }

-    // 1. Fetch Yacht details
-    const yachtRecord = await db.yachts.get(logbookId);
-    if (yachtRecord) {
-      try {
-        const yacht = await decryptJson(yachtRecord.encryptedData, yachtRecord.iv, yachtRecord.tag, masterKey);
-        yachtName = yacht.name || '';
-        homePort = yacht.port || '';
-        registration = yacht.registrationNumber || yacht.registration || '';
-        callsign = yacht.callSign || '';
-        atis = yacht.atis || '';
-        mmsi = yacht.mmsi || '';
-      } catch (e) {
-        console.error('Failed to decrypt yacht details for PDF:', e);
-      }
+    const { resolveVesselForLogbook } = await import('./resolveVessel.js')
+    const yacht = await resolveVesselForLogbook(logbookId)
+    if (yacht) {
+      yachtName = yacht.name || ''
+      homePort = yacht.homePort || ''
+      registration = yacht.registrationNumber || ''
+      callsign = yacht.callSign || ''
+      atis = yacht.atis || ''
+      mmsi = yacht.mmsi || ''
    }

    // 2. Fetch active Entry
@@ -197,13 +192,15 @@ export async function generateLogbookPagePdf(logbookId: string, entryId: string,
  doc.text('VERBRAUCHSWERTE / CONSUMPTON STATS', 10, footerY + 3);

  let fwY = footerY + 5;
-  doc.rect(10, fwY, 110, rowHeight * 3, 'S');
+  const tankRows = 4;
+  doc.rect(10, fwY, 110, rowHeight * tankRows, 'S');
  doc.line(10, fwY + rowHeight, 120, fwY + rowHeight);
  doc.line(10, fwY + rowHeight * 2, 120, fwY + rowHeight * 2);
-  doc.line(40, fwY, 40, fwY + rowHeight * 3);
-  doc.line(60, fwY, 60, fwY + rowHeight * 3);
-  doc.line(80, fwY, 80, fwY + rowHeight * 3);
-  doc.line(100, fwY, 100, fwY + rowHeight * 3);
+  doc.line(10, fwY + rowHeight * 3, 120, fwY + rowHeight * 3);
+  doc.line(40, fwY, 40, fwY + rowHeight * tankRows);
+  doc.line(60, fwY, 60, fwY + rowHeight * tankRows);
+  doc.line(80, fwY, 80, fwY + rowHeight * tankRows);
+  doc.line(100, fwY, 100, fwY + rowHeight * tankRows);

  doc.setFont('Helvetica', 'bold');
  doc.setFontSize(7.5);
@@ -226,6 +223,12 @@ export async function generateLogbookPagePdf(logbookId: string, entryId: string,
  doc.text(String(entry.fuel?.evening ?? '0'), 81, fwY + rowHeight * 2 + 4.2);
  doc.text(String(entry.fuel?.consumption ?? '0'), 101, fwY + rowHeight * 2 + 4.2);

+  doc.text('Grauwasser', 11, fwY + rowHeight * 3 + 4.2);
+  doc.text('—', 41, fwY + rowHeight * 3 + 4.2);
+  doc.text('—', 61, fwY + rowHeight * 3 + 4.2);
+  doc.text(String(entry.greywater?.level ?? '0'), 81, fwY + rowHeight * 3 + 4.2);
+  doc.text('—', 101, fwY + rowHeight * 3 + 4.2);
+
  // Signatures Box
  let sigX = 130;
  let sigY = footerY + 5;
@@ -0,0 +1,110 @@
+import { db } from './db.js'
+import { getActiveMasterKey } from './auth.js'
+import { decryptJson, encryptJson } from './crypto.js'
+import type { PersonData } from '../types/person.js'
+import { MAX_POOL_CREW_MEMBERS } from '../types/person.js'
+import { syncPersonPool } from './personPoolSync.js'
+
+export interface DecryptedPerson {
+  payloadId: string
+  data: PersonData
+}
+
+function requireMasterKey(): ArrayBuffer {
+  const key = getActiveMasterKey()
+  if (!key) throw new Error('Encryption key not found. Please log in.')
+  return key
+}
+
+export async function loadPersonPool(): Promise<DecryptedPerson[]> {
+  const masterKey = requireMasterKey()
+  const records = await db.personPool.toArray()
+  const result: DecryptedPerson[] = []
+
+  for (const record of records) {
+    const data = (await decryptJson(record.encryptedData, record.iv, record.tag, masterKey)) as
+      | PersonData
+      | null
+    if (data) {
+      result.push({ payloadId: record.payloadId, data })
+    }
+  }
+
+  result.sort((a, b) => {
+    if (a.data.role !== b.data.role) return a.data.role === 'skipper' ? -1 : 1
+    return a.data.name.localeCompare(b.data.name, undefined, { sensitivity: 'base' })
+  })
+
+  return result
+}
+
+export async function loadPersonPoolMap(): Promise<Map<string, PersonData>> {
+  const people = await loadPersonPool()
+  return new Map(people.map((p) => [p.payloadId, p.data]))
+}
+
+export async function savePerson(
+  payloadId: string,
+  data: PersonData,
+  isNew: boolean
+): Promise<void> {
+  if (data.role === 'crew' && isNew) {
+    const crewCount = await db.personPool
+      .toArray()
+      .then(async (rows) => {
+        let count = 0
+        const masterKey = requireMasterKey()
+        for (const row of rows) {
+          const dec = (await decryptJson(row.encryptedData, row.iv, row.tag, masterKey)) as PersonData | null
+          if (dec?.role === 'crew') count++
+        }
+        return count
+      })
+    if (crewCount >= MAX_POOL_CREW_MEMBERS) {
+      throw new Error('MAX_CREW')
+    }
+  }
+
+  const masterKey = requireMasterKey()
+  const encrypted = await encryptJson(data, masterKey)
+  const now = new Date().toISOString()
+
+  await db.personPool.put({
+    payloadId,
+    encryptedData: encrypted.ciphertext,
+    iv: encrypted.iv,
+    tag: encrypted.tag,
+    updatedAt: now
+  })
+
+  await db.userSyncQueue.put({
+    action: isNew ? 'create' : 'update',
+    type: 'person',
+    payloadId,
+    data: JSON.stringify(encrypted),
+    updatedAt: now
+  })
+
+  syncPersonPool().catch((err) => console.warn('Person pool sync failed:', err))
+}
+
+export async function deletePerson(payloadId: string): Promise<void> {
+  const now = new Date().toISOString()
+  await db.personPool.delete(payloadId)
+  await db.userSyncQueue.put({
+    action: 'delete',
+    type: 'person',
+    payloadId,
+    data: '',
+    updatedAt: now
+  })
+  syncPersonPool().catch((err) => console.warn('Person pool sync failed:', err))
+}
+
+export function filterSkippers(people: DecryptedPerson[]): DecryptedPerson[] {
+  return people.filter((p) => p.data.role === 'skipper')
+}
+
+export function filterCrew(people: DecryptedPerson[]): DecryptedPerson[] {
+  return people.filter((p) => p.data.role === 'crew')
+}
@@ -0,0 +1,83 @@
+import { db } from './db.js'
+import { getActiveMasterKey } from './auth.js'
+import { apiFetch } from './api.js'
+
+const API_BASE = '/api/auth/person-pool'
+
+function isNewer(timeA: string | Date, timeB: string | Date): boolean {
+  return new Date(timeA).getTime() > new Date(timeB).getTime()
+}
+
+export async function syncPersonPool(): Promise<void> {
+  if (!navigator.onLine || !getActiveMasterKey() || !localStorage.getItem('active_userid')) return
+
+  await pushPersonPool()
+  await pullPersonPool()
+}
+
+async function pushPersonPool(): Promise<void> {
+  const pending = (await db.userSyncQueue.toArray()).filter((item) => item.type === 'person')
+  if (pending.length === 0) return
+
+  try {
+    const response = await apiFetch(`${API_BASE}/push`, {
+      method: 'POST',
+      body: JSON.stringify({ items: pending })
+    })
+    if (!response.ok) {
+      console.warn('Person pool push rejected')
+      return
+    }
+
+    const { results } = await response.json()
+    for (let i = 0; i < results.length; i++) {
+      const res = results[i]
+      const item = pending[i]
+      if (!item) continue
+      if (res.status === 'success' && item.id !== undefined) {
+        await db.userSyncQueue.delete(item.id)
+      }
+    }
+  } catch (err) {
+    console.warn('Person pool push failed:', err)
+  }
+}
+
+async function pullPersonPool(): Promise<void> {
+  try {
+    const response = await apiFetch(API_BASE, { method: 'GET' })
+    if (!response.ok) return
+
+    const { persons } = await response.json()
+    if (!Array.isArray(persons)) return
+
+    const serverMap = new Map<string, (typeof persons)[0]>()
+    for (const p of persons) {
+      serverMap.set(p.payloadId, p)
+      const local = await db.personPool.get(p.payloadId)
+      if (!local || isNewer(p.updatedAt, local.updatedAt)) {
+        await db.personPool.put({
+          payloadId: p.payloadId,
+          encryptedData: p.encryptedData,
+          iv: p.iv,
+          tag: p.tag,
+          updatedAt: p.updatedAt
+        })
+      }
+    }
+
+    const localAll = await db.personPool.toArray()
+    for (const local of localAll) {
+      if (!serverMap.has(local.payloadId)) {
+        const pendingCreate = await db.userSyncQueue
+          .where({ payloadId: local.payloadId, action: 'create' })
+          .first()
+        if (!pendingCreate) {
+          await db.personPool.delete(local.payloadId)
+        }
+      }
+    }
+  } catch (err) {
+    console.warn('Person pool pull failed:', err)
+  }
+}
@@ -0,0 +1,92 @@
+import { db } from './db.js'
+import { getActiveMasterKey } from './auth.js'
+import { getLogbookKey } from './logbookKeys.js'
+import { encryptJson } from './crypto.js'
+import { syncLogbook } from './sync.js'
+import { PlausibleEvents, trackPlausibleEvent } from './analytics.js'
+
+async function getEncryptionKey(logbookId: string): Promise<ArrayBuffer> {
+  const key = await getLogbookKey(logbookId) || getActiveMasterKey()
+  if (!key) throw new Error('Encryption key not found. Please log in.')
+  return key
+}
+
+export async function saveEntryPhoto(options: {
+  logbookId: string
+  entryId: string
+  imageDataUrl: string
+  caption?: string
+  analyticsContext?: string
+}): Promise<string> {
+  const { logbookId, entryId, imageDataUrl, caption = '', analyticsContext = 'logbook' } = options
+  const masterKey = await getEncryptionKey(logbookId)
+  const photoId = window.crypto.randomUUID()
+  const photoPayload = {
+    image: imageDataUrl,
+    caption: caption.trim()
+  }
+
+  const encrypted = await encryptJson(photoPayload, masterKey)
+  const now = new Date().toISOString()
+
+  await db.photos.put({
+    payloadId: photoId,
+    entryId,
+    logbookId,
+    encryptedData: encrypted.ciphertext,
+    iv: encrypted.iv,
+    tag: encrypted.tag,
+    caption: '',
+    updatedAt: now
+  })
+
+  await db.syncQueue.put({
+    action: 'create',
+    type: 'photo',
+    payloadId: photoId,
+    logbookId,
+    data: JSON.stringify({
+      encryptedData: encrypted.ciphertext,
+      iv: encrypted.iv,
+      tag: encrypted.tag,
+      entryId
+    }),
+    updatedAt: now
+  })
+
+  trackPlausibleEvent(PlausibleEvents.PHOTO_UPLOADED, { context: analyticsContext })
+  if (analyticsContext === 'live_log') {
+    trackPlausibleEvent(PlausibleEvents.LIVE_LOG_PHOTO_UPLOADED)
+  }
+  syncLogbook(logbookId).catch((err) => console.warn('Background sync failed:', err))
+  return photoId
+}
+
+export async function deleteEntryPhoto(logbookId: string, photoId: string): Promise<void> {
+  const now = new Date().toISOString()
+  await db.photos.delete(photoId)
+  await db.syncQueue.put({
+    action: 'delete',
+    type: 'photo',
+    payloadId: photoId,
+    logbookId,
+    data: '',
+    updatedAt: now
+  })
+  syncLogbook(logbookId).catch((err) => console.warn('Background sync failed:', err))
+}
+
+/** Deletes the newest photo for an entry; returns its id or null. */
+export async function removeLastPhotoForEntry(
+  logbookId: string,
+  entryId: string
+): Promise<string | null> {
+  const photos = await db.photos.where({ entryId }).toArray()
+  if (photos.length === 0) return null
+  photos.sort(
+    (a, b) => new Date(b.updatedAt).getTime() - new Date(a.updatedAt).getTime()
+  )
+  const lastId = photos[0].payloadId
+  await deleteEntryPhoto(logbookId, lastId)
+  return lastId
+}
@@ -27,22 +27,79 @@ export function getNotificationPermission(): NotificationPermission | 'unsupport
  return Notification.permission
 }

+let cachedVapidKey: string | null = null
+let cachedRegistration: ServiceWorkerRegistration | null = null
+
+async function getRegistrationCompat(timeoutMs = 8000): Promise<ServiceWorkerRegistration> {
+  if (!('serviceWorker' in navigator)) {
+    throw new Error('Service Worker is not supported by your browser')
+  }
+
+  try {
+    const reg = await navigator.serviceWorker.getRegistration()
+    if (reg) return reg
+  } catch (e) {
+    console.warn('Failed to get service worker registration directly:', e)
+  }
+
+  // Fallback to waiting for ready state with a timeout
+  const readyPromise = navigator.serviceWorker.ready
+  const timeoutPromise = new Promise<never>((_, reject) =>
+    setTimeout(() => reject(new Error('Timeout waiting for Service Worker ready state')), timeoutMs)
+  )
+
+  return Promise.race([readyPromise, timeoutPromise])
+}
+
+export async function preloadPushService(): Promise<void> {
+  if (!isPushSupported()) return
+  try {
+    if (!cachedVapidKey) {
+      await fetchVapidPublicKey()
+    }
+    if (!cachedRegistration) {
+      cachedRegistration = await getRegistrationCompat()
+    }
+  } catch (err) {
+    console.warn('Failed to preload push service:', err)
+  }
+}
+
 async function fetchVapidPublicKey(): Promise<string | null> {
+  if (cachedVapidKey) return cachedVapidKey
+
  const envKey = import.meta.env.VITE_VAPID_PUBLIC_KEY
  if (typeof envKey === 'string' && envKey.trim()) {
-    return envKey.trim()
+    cachedVapidKey = envKey.trim()
+    return cachedVapidKey
  }

  try {
    const res = await fetch(`${API_BASE}/vapid-public-key`)
    if (!res.ok) return null
    const data = await res.json()
-    return typeof data.publicKey === 'string' ? data.publicKey : null
+    if (typeof data.publicKey === 'string') {
+      cachedVapidKey = data.publicKey.trim()
+      return cachedVapidKey
+    }
+    return null
  } catch {
    return null
  }
 }

+/** True when crew-change push is enabled and notification permission is granted. */
+export async function isCollaboratorPushActive(): Promise<boolean> {
+  if (!isPushSupported()) return false
+  if (getNotificationPermission() !== 'granted') return false
+  try {
+    const prefs = await fetchPushPrefs()
+    return prefs.collaboratorChangesEnabled
+  } catch {
+    return false
+  }
+}
+
 export async function fetchPushPrefs(): Promise<{ collaboratorChangesEnabled: boolean }> {
  if (!localStorage.getItem('active_userid')) {
    return { collaboratorChangesEnabled: false }
@@ -60,11 +117,61 @@ export async function savePushPrefs(collaboratorChangesEnabled: boolean): Promis
  })
 }

+async function requestNotificationPermission(): Promise<NotificationPermission> {
+  if (typeof Notification === 'undefined') return 'denied'
+  
+  // Try promise-based signature first
+  try {
+    const result = Notification.requestPermission()
+    if (result !== undefined) {
+      return await result
+    }
+  } catch {
+    // Ignore and fall back to callback
+  }
+
+  // Callback-based fallback
+  return new Promise<NotificationPermission>((resolve) => {
+    Notification.requestPermission((permission) => {
+      resolve(permission)
+    })
+  })
+}
+
 async function saveSubscriptionToServer(subscription: PushSubscription): Promise<void> {
  if (!localStorage.getItem('active_userid')) throw new Error('Not authenticated')

+  const endpoint = subscription.endpoint
  const json = subscription.toJSON()
-  if (!json.endpoint || !json.keys?.p256dh || !json.keys?.auth) {
+  let p256dh = json.keys?.p256dh
+  let auth = json.keys?.auth
+
+  // Fallback for browsers (like Safari) that might not serialize keys in toJSON()
+  if (!p256dh && typeof subscription.getKey === 'function') {
+    try {
+      const rawKey = subscription.getKey('p256dh')
+      if (rawKey) {
+        p256dh = btoa(String.fromCharCode(...new Uint8Array(rawKey)))
+          .replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '')
+      }
+    } catch (e) {
+      console.warn('Failed to extract p256dh key manually:', e)
+    }
+  }
+
+  if (!auth && typeof subscription.getKey === 'function') {
+    try {
+      const rawAuth = subscription.getKey('auth')
+      if (rawAuth) {
+        auth = btoa(String.fromCharCode(...new Uint8Array(rawAuth)))
+          .replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '')
+      }
+    } catch (e) {
+      console.warn('Failed to extract auth key manually:', e)
+    }
+  }
+
+  if (!endpoint || !p256dh || !auth) {
    throw new Error('Invalid push subscription')
  }

@@ -73,8 +180,8 @@ async function saveSubscriptionToServer(subscription: PushSubscription): Promise
  await apiJson(`${API_BASE}/subscription`, {
    method: 'PUT',
    body: JSON.stringify({
-      endpoint: json.endpoint,
-      keys: json.keys,
+      endpoint,
+      keys: { p256dh, auth },
      locale,
      userAgent: navigator.userAgent
    })
@@ -86,35 +193,48 @@ export async function subscribeToPush(): Promise<void> {
    throw new Error('Push notifications are not supported on this device')
  }

-  const permission = await Notification.requestPermission()
-  if (permission !== 'granted') {
-    throw new Error('Notification permission denied')
+  // Pre-resolve registration using getRegistrationCompat to prevent ready state hangs
+  let registration = cachedRegistration
+  if (!registration) {
+    registration = await getRegistrationCompat()
+    cachedRegistration = registration
  }

-  const publicKey = await fetchVapidPublicKey()
+  const publicKey = cachedVapidKey || await fetchVapidPublicKey()
  if (!publicKey) {
    throw new Error('Push notifications are not configured on this server')
  }

-  const registration = await navigator.serviceWorker.ready
-  let subscription = await registration.pushManager.getSubscription()
-
-  if (!subscription) {
-    const keyBytes = urlBase64ToUint8Array(publicKey)
-    const applicationServerKey = new Uint8Array(keyBytes)
-    subscription = await registration.pushManager.subscribe({
-      userVisibleOnly: true,
-      applicationServerKey
-    })
+  const permission = await requestNotificationPermission()
+  if (permission !== 'granted') {
+    throw new Error('Notification permission denied')
  }

+  const keyBytes = urlBase64ToUint8Array(publicKey)
+  const applicationServerKey = new Uint8Array(keyBytes)
+  
+  // Always call subscribe with timeout to prevent silent hangs on push network errors
+  const subscribePromise = registration.pushManager.subscribe({
+    userVisibleOnly: true,
+    applicationServerKey
+  })
+  const subscribeTimeout = new Promise<never>((_, reject) =>
+    setTimeout(() => reject(new Error('Timeout establishing subscription with push service (FCM/APNs)')), 12000)
+  )
+  const subscription = await Promise.race([subscribePromise, subscribeTimeout])
+
  await saveSubscriptionToServer(subscription)
 }

 export async function unsubscribeFromPush(): Promise<void> {
  if (!isPushSupported()) return

-  const registration = await navigator.serviceWorker.ready
+  let registration = cachedRegistration
+  if (!registration) {
+    registration = await getRegistrationCompat()
+    cachedRegistration = registration
+  }
+
  const subscription = await registration.pushManager.getSubscription()
  if (!subscription) return

@@ -152,3 +272,7 @@ export async function disableCollaboratorChangePush(): Promise<void> {
  await savePushPrefs(false)
  await unsubscribeFromPush()
 }
+
+if (isPushSupported()) {
+  void preloadPushService()
+}
@@ -0,0 +1,146 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import {
+  forcePwaRecovery,
+  markReloadAttempt,
+  recentlyAttemptedReload,
+  reconcileServiceWorkerOnStartup,
+  reconcileVersionOnStartup
+} from './pwaStartup.js'
+
+const STALE_RECOVERY_COUNT_KEY = 'pwa_stale_recovery_count'
+const STALE_RECOVERY_LAST_KEY = 'pwa_stale_recovery_last_ts'
+
+describe('pwaStartup reload guards', () => {
+  beforeEach(() => {
+    sessionStorage.clear()
+  })
+
+  it('blocks repeated reload attempts within the debounce window', () => {
+    expect(recentlyAttemptedReload(10_000)).toBe(false)
+    markReloadAttempt(10_000)
+    expect(recentlyAttemptedReload(12_000)).toBe(true)
+    expect(recentlyAttemptedReload(15_000)).toBe(false)
+  })
+})
+
+describe('forcePwaRecovery stale counter reset', () => {
+  beforeEach(() => {
+    sessionStorage.clear()
+    vi.unstubAllEnvs()
+    vi.restoreAllMocks()
+  })
+
+  it('clears stale recovery counter before hard recovery reload', async () => {
+    vi.stubEnv('DEV', false)
+    sessionStorage.setItem(STALE_RECOVERY_COUNT_KEY, '2')
+    sessionStorage.setItem(STALE_RECOVERY_LAST_KEY, String(Date.now()))
+
+    const reload = vi.fn()
+    vi.stubGlobal('location', { reload })
+    vi.stubGlobal('caches', {
+      keys: vi.fn().mockResolvedValue([]),
+      delete: vi.fn()
+    })
+    Object.defineProperty(navigator, 'serviceWorker', {
+      configurable: true,
+      value: {
+        getRegistrations: vi.fn().mockResolvedValue([])
+      }
+    })
+
+    await forcePwaRecovery()
+
+    expect(sessionStorage.getItem(STALE_RECOVERY_COUNT_KEY)).toBeNull()
+    expect(sessionStorage.getItem(STALE_RECOVERY_LAST_KEY)).toBeNull()
+    expect(reload).toHaveBeenCalledOnce()
+  })
+
+  it('returns false when hard recovery was just attempted', async () => {
+    sessionStorage.setItem('pwa_hard_recovery_ts', String(Date.now()))
+    const result = await forcePwaRecovery()
+    expect(result).toBe(false)
+  })
+})
+
+describe('reconcileServiceWorkerOnStartup', () => {
+  beforeEach(() => {
+    sessionStorage.clear()
+    vi.unstubAllEnvs()
+  })
+
+  it('returns false in dev mode', async () => {
+    vi.stubEnv('DEV', true)
+    await expect(reconcileServiceWorkerOnStartup()).resolves.toBe(false)
+  })
+
+  it('returns false when no waiting worker exists', async () => {
+    vi.stubEnv('DEV', false)
+    Object.defineProperty(navigator, 'serviceWorker', {
+      configurable: true,
+      value: {
+        controller: {},
+        getRegistration: vi.fn().mockResolvedValue({
+          waiting: null,
+          installing: null,
+          update: vi.fn().mockResolvedValue(undefined),
+          addEventListener: vi.fn()
+        }),
+        addEventListener: vi.fn()
+      }
+    })
+
+    await expect(reconcileServiceWorkerOnStartup()).resolves.toBe(false)
+  })
+
+  it('returns false when waiting worker activation never takes over', async () => {
+    vi.useFakeTimers()
+    const postMessage = vi.fn()
+    const addEventListener = vi.fn()
+    vi.stubEnv('DEV', false)
+
+    Object.defineProperty(navigator, 'serviceWorker', {
+      configurable: true,
+      value: {
+        controller: { scriptURL: '/sw.js?v=1' },
+        getRegistration: vi.fn().mockResolvedValue({
+          waiting: { postMessage },
+          installing: null,
+          update: vi.fn().mockResolvedValue(undefined),
+          addEventListener: vi.fn()
+        }),
+        addEventListener
+      }
+    })
+
+    const reconcilePromise = reconcileServiceWorkerOnStartup()
+    await vi.advanceTimersByTimeAsync(4_000)
+
+    await expect(reconcilePromise).resolves.toBe(false)
+    expect(postMessage).toHaveBeenCalledWith({ type: 'SKIP_WAITING' })
+    vi.useRealTimers()
+  })
+})
+
+describe('reconcileVersionOnStartup', () => {
+  beforeEach(() => {
+    sessionStorage.clear()
+    vi.unstubAllEnvs()
+    vi.restoreAllMocks()
+  })
+
+  it('returns noop in dev mode', async () => {
+    vi.stubEnv('DEV', true)
+    await expect(reconcileVersionOnStartup()).resolves.toBe('noop')
+  })
+
+  it('returns noop when deployed version matches bundled version', async () => {
+    vi.stubEnv('DEV', false)
+    vi.stubGlobal('fetch', vi.fn().mockResolvedValue({
+      ok: true,
+      json: async () => ({ version: '0.1.0.57' })
+    }))
+    vi.stubGlobal('__APP_VERSION__', '0.1.0.57')
+
+    await expect(reconcileVersionOnStartup()).resolves.toBe('noop')
+  })
+})
@@ -0,0 +1,289 @@
+import { isNewerAppVersion, fetchDeployedVersion, getAppVersion } from './pwaVersion.js'
+
+const RELOAD_ATTEMPT_KEY = 'pwa_reload_attempt_ts'
+const COLD_START_UPDATE_KEY = 'pwa_coldstart_update_ts'
+const HARD_RECOVERY_KEY = 'pwa_hard_recovery_ts'
+const STALE_RECOVERY_COUNT_KEY = 'pwa_stale_recovery_count'
+const STALE_RECOVERY_LAST_KEY = 'pwa_stale_recovery_last_ts'
+const STALE_RECOVERY_WINDOW_MS = 60_000
+const RELOAD_DEBOUNCE_MS = 4_000
+const COLD_START_UPDATE_DEBOUNCE_MS = 15_000
+const HARD_RECOVERY_DEBOUNCE_MS = 30_000
+
+export function recentlyAttemptedReload(now = Date.now()): boolean {
+  const last = Number(sessionStorage.getItem(RELOAD_ATTEMPT_KEY) || '0')
+  return now - last < RELOAD_DEBOUNCE_MS
+}
+
+export function markReloadAttempt(now = Date.now()): void {
+  sessionStorage.setItem(RELOAD_ATTEMPT_KEY, String(now))
+}
+
+function recentlyAttemptedColdStartUpdate(now = Date.now()): boolean {
+  const last = Number(sessionStorage.getItem(COLD_START_UPDATE_KEY) || '0')
+  return now - last < COLD_START_UPDATE_DEBOUNCE_MS
+}
+
+function markColdStartUpdateAttempt(now = Date.now()): void {
+  sessionStorage.setItem(COLD_START_UPDATE_KEY, String(now))
+}
+
+function recentlyAttemptedHardRecovery(now = Date.now()): boolean {
+  const last = Number(sessionStorage.getItem(HARD_RECOVERY_KEY) || '0')
+  return now - last < HARD_RECOVERY_DEBOUNCE_MS
+}
+
+function markHardRecoveryAttempt(now = Date.now()): void {
+  sessionStorage.setItem(HARD_RECOVERY_KEY, String(now))
+}
+
+function resetStaleRecoveryCount(): void {
+  sessionStorage.removeItem(STALE_RECOVERY_COUNT_KEY)
+  sessionStorage.removeItem(STALE_RECOVERY_LAST_KEY)
+}
+
+function incrementStaleRecoveryCount(now = Date.now()): number {
+  const last = Number(sessionStorage.getItem(STALE_RECOVERY_LAST_KEY) || '0')
+  let current = Number(sessionStorage.getItem(STALE_RECOVERY_COUNT_KEY) || '0')
+
+  if (now - last > STALE_RECOVERY_WINDOW_MS) {
+    current = 0
+  }
+
+  const next = current + 1
+  sessionStorage.setItem(STALE_RECOVERY_COUNT_KEY, String(next))
+  sessionStorage.setItem(STALE_RECOVERY_LAST_KEY, String(now))
+  return next
+}
+
+function isStaleModuleLoadError(error: unknown): boolean {
+  const message =
+    error instanceof Error
+      ? error.message
+      : typeof error === 'string'
+        ? error
+        : ''
+
+  return (
+    message.includes('Failed to fetch dynamically imported module') ||
+    message.includes('Importing a module script failed') ||
+    message.includes('error loading dynamically imported module') ||
+    message.includes('Loading chunk') ||
+    message.includes('ChunkLoadError') ||
+    message.includes('Unable to preload CSS')
+  )
+}
+
+export async function clearPwaCachesAndWorkers(): Promise<void> {
+  if ('serviceWorker' in navigator) {
+    const registrations = await navigator.serviceWorker.getRegistrations()
+    await Promise.all(registrations.map((registration) => registration.unregister()))
+  }
+
+  if ('caches' in window) {
+    const keys = await caches.keys()
+    await Promise.all(keys.map((key) => caches.delete(key)))
+  }
+}
+
+/**
+ * Last-resort recovery when soft reloads cannot escape a stale precache.
+ * Equivalent to manually clearing site data / reinstalling the PWA.
+ */
+export async function forcePwaRecovery(): Promise<boolean> {
+  if (recentlyAttemptedHardRecovery()) return false
+
+  markHardRecoveryAttempt()
+  markReloadAttempt()
+  resetStaleRecoveryCount()
+  await clearPwaCachesAndWorkers()
+  window.location.reload()
+  return true
+}
+
+async function waitForWaitingWorker(
+  registration: ServiceWorkerRegistration,
+  timeoutMs: number
+): Promise<ServiceWorker | null> {
+  if (registration.waiting) {
+    return registration.waiting
+  }
+
+  return new Promise((resolve) => {
+    const timeoutId = window.setTimeout(() => resolve(null), timeoutMs)
+
+    const inspectWorker = (worker: ServiceWorker | null) => {
+      if (!worker) return
+
+      if (worker.state === 'installed' && navigator.serviceWorker.controller) {
+        window.clearTimeout(timeoutId)
+        resolve(worker)
+        return
+      }
+
+      worker.addEventListener(
+        'statechange',
+        () => {
+          if (worker.state === 'installed' && navigator.serviceWorker.controller) {
+            window.clearTimeout(timeoutId)
+            resolve(worker)
+          }
+        },
+        { once: true }
+      )
+    }
+
+    inspectWorker(registration.installing)
+
+    registration.addEventListener(
+      'updatefound',
+      () => {
+        inspectWorker(registration.installing)
+      },
+      { once: true }
+    )
+  })
+}
+
+export async function triggerServiceWorkerUpdate(timeoutMs = 5_000): Promise<boolean> {
+  if (import.meta.env.DEV || !('serviceWorker' in navigator)) {
+    return false
+  }
+
+  const registration = await navigator.serviceWorker.getRegistration()
+  if (!registration) return false
+
+  try {
+    await registration.update()
+  } catch {
+    return false
+  }
+
+  const waiting = await waitForWaitingWorker(registration, timeoutMs)
+  return waiting !== null
+}
+
+async function activateWaitingWorker(waiting: ServiceWorker): Promise<boolean> {
+  const currentController = navigator.serviceWorker.controller?.scriptURL ?? null
+  waiting.postMessage({ type: 'SKIP_WAITING' })
+
+  return new Promise<boolean>((resolve) => {
+    const timeoutId = window.setTimeout(() => resolve(false), 4_000)
+    navigator.serviceWorker.addEventListener(
+      'controllerchange',
+      () => {
+        window.clearTimeout(timeoutId)
+        const nextController = navigator.serviceWorker.controller?.scriptURL ?? null
+        resolve(nextController !== null && nextController !== currentController)
+      },
+      { once: true }
+    )
+  })
+}
+
+/**
+ * After missed deploys, a waiting SW may exist while the page still runs an old bundle.
+ * Apply the waiting worker once on cold start (one controlled reload) instead of hanging.
+ */
+export async function reconcileServiceWorkerOnStartup(): Promise<boolean> {
+  if (import.meta.env.DEV || !('serviceWorker' in navigator)) {
+    return false
+  }
+
+  if (recentlyAttemptedColdStartUpdate()) {
+    return false
+  }
+
+  const registration = await navigator.serviceWorker.getRegistration()
+  let waiting = registration?.waiting ?? null
+
+  if (!waiting && registration) {
+    await registration.update().catch(() => {})
+    waiting = await waitForWaitingWorker(registration, 4_000)
+  }
+
+  if (!waiting || !navigator.serviceWorker.controller) {
+    return false
+  }
+
+  const activated = await activateWaitingWorker(waiting)
+  if (activated) {
+    markColdStartUpdateAttempt()
+  }
+  return activated
+}
+
+/**
+ * Compare deployed version.json with the bundled app version.
+ * When the server is ahead, try a soft SW takeover before hard recovery.
+ */
+export async function reconcileVersionOnStartup(): Promise<'reload' | 'recovered' | 'noop'> {
+  if (import.meta.env.DEV || !navigator.onLine) {
+    return 'noop'
+  }
+
+  const deployedVersion = await fetchDeployedVersion()
+  if (!deployedVersion || !isNewerAppVersion(deployedVersion, getAppVersion())) {
+    return 'noop'
+  }
+
+  const reconciled = await reconcileServiceWorkerOnStartup()
+  if (reconciled) {
+    return 'reload'
+  }
+
+  const updated = await triggerServiceWorkerUpdate()
+  if (updated) {
+    const registration = await navigator.serviceWorker.getRegistration()
+    const waiting = registration?.waiting
+    if (waiting) {
+      const activated = await activateWaitingWorker(waiting)
+      if (activated) {
+        markColdStartUpdateAttempt()
+        return 'reload'
+      }
+    }
+  }
+
+  if (!recentlyAttemptedHardRecovery()) {
+    const recovered = await forcePwaRecovery()
+    if (recovered) {
+      return 'recovered'
+    }
+  }
+
+  return 'noop'
+}
+
+export function installStaleAssetRecovery(): void {
+  if (import.meta.env.DEV) return
+
+  const recoverFromStaleAssets = () => {
+    if (recentlyAttemptedReload()) return
+
+    const attempts = incrementStaleRecoveryCount()
+    markReloadAttempt()
+
+    if (attempts >= 2) {
+      void forcePwaRecovery()
+      return
+    }
+
+    window.location.reload()
+  }
+
+  window.addEventListener('unhandledrejection', (event) => {
+    if (!isStaleModuleLoadError(event.reason)) return
+    event.preventDefault()
+    recoverFromStaleAssets()
+  })
+
+  window.addEventListener(
+    'error',
+    (event) => {
+      if (!isStaleModuleLoadError(event.message)) return
+      recoverFromStaleAssets()
+    },
+    true
+  )
+}
@@ -0,0 +1,23 @@
+import { describe, expect, it } from 'vitest'
+import {
+  compareAppVersions,
+  isNewerAppVersion,
+  parseAppVersion
+} from './pwaVersion.js'
+
+describe('pwaVersion', () => {
+  it('parses semantic build versions', () => {
+    expect(parseAppVersion('v0.1.0.57')).toEqual([0, 1, 0, 57])
+  })
+
+  it('compares build numbers numerically', () => {
+    expect(compareAppVersions('0.1.0.65', '0.1.0.57')).toBeGreaterThan(0)
+    expect(compareAppVersions('0.1.0.57', '0.1.0.65')).toBeLessThan(0)
+    expect(compareAppVersions('0.1.0.57', '0.1.0.57')).toBe(0)
+  })
+
+  it('detects newer deployed versions', () => {
+    expect(isNewerAppVersion('0.1.0.66', '0.1.0.57')).toBe(true)
+    expect(isNewerAppVersion('0.1.0.57', '0.1.0.57')).toBe(false)
+  })
+})
@@ -0,0 +1,59 @@
+const APP_VERSION =
+  typeof __APP_VERSION__ !== 'undefined' ? __APP_VERSION__ : '0.0.0.0-dev'
+
+export function getAppVersion(): string {
+  return APP_VERSION
+}
+
+export function parseAppVersion(version: string): number[] {
+  return version
+    .replace(/^v/i, '')
+    .split('.')
+    .map((part) => Number.parseInt(part, 10) || 0)
+}
+
+/** Positive when `a` is newer than `b`. */
+export function compareAppVersions(a: string, b: string): number {
+  const partsA = parseAppVersion(a)
+  const partsB = parseAppVersion(b)
+  const length = Math.max(partsA.length, partsB.length)
+
+  for (let index = 0; index < length; index += 1) {
+    const diff = (partsA[index] ?? 0) - (partsB[index] ?? 0)
+    if (diff !== 0) return diff
+  }
+
+  return 0
+}
+
+export function isNewerAppVersion(serverVersion: string, clientVersion: string): boolean {
+  return compareAppVersions(serverVersion, clientVersion) > 0
+}
+
+export async function fetchDeployedVersion(timeoutMs = 4_000): Promise<string | null> {
+  if (!navigator.onLine) return null
+
+  const controller = new AbortController()
+  const timeoutId = window.setTimeout(() => controller.abort(), timeoutMs)
+
+  try {
+    const response = await fetch(`/version.json?_=${Date.now()}`, {
+      cache: 'no-store',
+      signal: controller.signal
+    })
+    if (!response.ok) return null
+
+    const payload = (await response.json()) as { version?: unknown }
+    return typeof payload.version === 'string' ? payload.version.trim() : null
+  } catch {
+    return null
+  } finally {
+    window.clearTimeout(timeoutId)
+  }
+}
+
+export async function isDeployedVersionNewer(): Promise<boolean> {
+  const deployedVersion = await fetchDeployedVersion()
+  if (!deployedVersion) return false
+  return isNewerAppVersion(deployedVersion, getAppVersion())
+}
@@ -0,0 +1,19 @@
+import { describe, expect, it, vi } from 'vitest'
+import { tryDecryptEntryPayload } from './quickEventLog.js'
+
+vi.mock('./crypto.js', () => ({
+  decryptJson: vi.fn(async (_c: string, _i: string, _t: string) => {
+    throw new Error('decrypt failed')
+  }),
+  encryptJson: vi.fn()
+}))
+
+describe('tryDecryptEntryPayload', () => {
+  it('returns null when decryption fails', async () => {
+    const result = await tryDecryptEntryPayload(
+      { encryptedData: 'x', iv: 'y', tag: 'z' },
+      new ArrayBuffer(32)
+    )
+    expect(result).toBeNull()
+  })
+})
@@ -0,0 +1,406 @@
+import { db } from './db.js'
+import { getActiveMasterKey } from './auth.js'
+import { ensureLogbookKey, getLogbookKey } from './logbookKeys.js'
+import { decryptJson, encryptJson } from './crypto.js'
+import { syncLogbook } from './sync.js'
+import { putEntryRecord } from '../utils/entryListCache.js'
+import {
+  buildLogEntryPayload,
+  normalizeLogEvent,
+  sortLogEventsByTime,
+  currentLocalTimeHHMM,
+  type LogEventPayload
+} from '../utils/logEntryPayload.js'
+import {
+  carryOverFromPreviousDay,
+  compareTravelDaysChronological,
+  getNextTravelDayNumber,
+  type LogEntryTankSource,
+  type TravelDaySortable
+} from '../utils/logEntryTankLevels.js'
+
+export interface LoadedEntry {
+  payloadId: string
+  updatedAt: string
+  data: Record<string, unknown>
+}
+
+type EncryptedRecord = {
+  encryptedData: string
+  iv: string
+  tag: string
+}
+
+async function getMasterKey(logbookId: string): Promise<ArrayBuffer> {
+  const masterKey = await getLogbookKey(logbookId) || getActiveMasterKey()
+  if (!masterKey) throw new Error('Encryption key not found. Please log in.')
+  return masterKey
+}
+
+/** Decrypt one record; skip corrupt or legacy entries instead of aborting the whole scan. */
+export async function tryDecryptEntryPayload(
+  record: EncryptedRecord,
+  key: ArrayBuffer
+): Promise<Record<string, unknown> | null> {
+  try {
+    return await decryptJson(record.encryptedData, record.iv, record.tag, key)
+  } catch {
+    return null
+  }
+}
+
+function sortEntriesNewestFirst<T extends { updatedAt: string }>(entries: T[]): T[] {
+  return [...entries].sort(
+    (a, b) => new Date(b.updatedAt).getTime() - new Date(a.updatedAt).getTime()
+  )
+}
+
+function tankLevelsFromData(data: Record<string, unknown>) {
+  const fw = (data.freshwater as Record<string, number> | undefined) ?? {
+    morning: 0, refilled: 0, evening: 0, consumption: 0
+  }
+  const fuel = (data.fuel as Record<string, number> | undefined) ?? {
+    morning: 0, refilled: 0, evening: 0, consumption: 0
+  }
+  const gw = data.greywater as { level?: number } | undefined
+  return { fw, fuel, gw }
+}
+
+function buildEncryptedPayload(
+  data: Record<string, unknown>,
+  options: {
+    events: LogEventPayload[]
+    departure?: string
+    destination?: string
+    freshwater?: { morning: number; refilled: number; evening: number; consumption: number }
+    fuel?: { morning: number; refilled: number; evening: number; consumption: number }
+    clearSignatures?: boolean
+  }
+): Record<string, unknown> {
+  const { fw, fuel, gw } = tankLevelsFromData(data)
+  const trackDistance = data.trackDistanceNm
+  const trackSpeedMax = data.trackSpeedMaxKn
+  const trackSpeedAvg = data.trackSpeedAvgKn
+  const motorHoursRaw = data.motorHours
+
+  const freshwater = options.freshwater ?? {
+    morning: fw.morning || 0,
+    refilled: fw.refilled || 0,
+    evening: fw.evening || 0,
+    consumption: fw.consumption ?? 0
+  }
+  const fuelLevels = options.fuel ?? {
+    morning: fuel.morning || 0,
+    refilled: fuel.refilled || 0,
+    evening: fuel.evening || 0,
+    consumption: fuel.consumption ?? 0
+  }
+
+  const payload = buildLogEntryPayload({
+    date: String(data.date || ''),
+    dayOfTravel: String(data.dayOfTravel || ''),
+    departure: options.departure ?? String(data.departure || ''),
+    destination: options.destination ?? String(data.destination || ''),
+    freshwater,
+    fuel: fuelLevels,
+    greywater: gw ? { level: gw.level || 0 } : undefined,
+    trackDistanceNm:
+      trackDistance != null && trackDistance !== ''
+        ? parseFloat(String(trackDistance))
+        : undefined,
+    trackSpeedMaxKn:
+      trackSpeedMax != null && trackSpeedMax !== ''
+        ? parseFloat(String(trackSpeedMax))
+        : undefined,
+    trackSpeedAvgKn:
+      trackSpeedAvg != null && trackSpeedAvg !== ''
+        ? parseFloat(String(trackSpeedAvg))
+        : undefined,
+    motorHours:
+      motorHoursRaw != null && motorHoursRaw !== ''
+        ? parseFloat(String(motorHoursRaw))
+        : undefined,
+    events: options.events
+  })
+
+  const clear = options.clearSignatures
+  const entryData: Record<string, unknown> = {
+    ...payload,
+    signSkipper: clear ? '' : (data.signSkipper ?? ''),
+    signCrew: clear ? '' : (data.signCrew ?? '')
+  }
+
+  const summary = typeof data.aiSummary === 'string' ? data.aiSummary.trim() : ''
+  if (summary) {
+    entryData.aiSummary = summary
+    entryData.aiSummaryGeneratedAt =
+      typeof data.aiSummaryGeneratedAt === 'string' && data.aiSummaryGeneratedAt
+        ? data.aiSummaryGeneratedAt
+        : new Date().toISOString()
+  }
+
+  return entryData
+}
+
+export async function loadEntry(logbookId: string, entryId: string): Promise<LoadedEntry | null> {
+  const masterKey = await getMasterKey(logbookId)
+  const record = await db.entries.get(entryId)
+  if (!record) return null
+  const data = await tryDecryptEntryPayload(record, masterKey)
+  if (!data) return null
+  return { payloadId: record.payloadId, updatedAt: record.updatedAt, data }
+}
+
+export async function findTodayEntryId(logbookId: string): Promise<string | null> {
+  const todayStr = new Date().toISOString().substring(0, 10)
+  const masterKey = await getMasterKey(logbookId)
+  const local = sortEntriesNewestFirst(await db.entries.where({ logbookId }).toArray())
+
+  for (const entry of local) {
+    const decrypted = await tryDecryptEntryPayload(entry, masterKey)
+    if (decrypted && String(decrypted.date) === todayStr) {
+      return entry.payloadId
+    }
+  }
+  return null
+}
+
+export async function createTodayEntry(logbookId: string): Promise<string> {
+  const masterKey = await getMasterKey(logbookId)
+  const localEntries = await db.entries.where({ logbookId }).toArray()
+  const decryptedEntries: Array<LogEntryTankSource & TravelDaySortable> = []
+
+  if (localEntries.length > 0) {
+    for (const entry of localEntries) {
+      const decrypted = await tryDecryptEntryPayload(entry, masterKey)
+      if (decrypted) {
+        decryptedEntries.push(decrypted as LogEntryTankSource & TravelDaySortable)
+      }
+    }
+  }
+
+  decryptedEntries.sort(compareTravelDaysChronological)
+  const previousEntry = decryptedEntries.at(-1) ?? null
+  const { freshwater, fuel, greywaterLevel, departure } = carryOverFromPreviousDay(previousEntry)
+
+  const localId = window.crypto.randomUUID()
+  const nowStr = new Date().toISOString()
+  const todayStr = nowStr.substring(0, 10)
+
+  const initialPayload = {
+    date: todayStr,
+    dayOfTravel: getNextTravelDayNumber(decryptedEntries),
+    departure,
+    destination: '',
+    freshwater,
+    fuel,
+    ...(greywaterLevel > 0 ? { greywater: { level: greywaterLevel } } : {}),
+    signSkipper: '',
+    signCrew: '',
+    events: []
+  }
+
+  const encrypted = await encryptJson(initialPayload, masterKey)
+
+  await putEntryRecord(
+    {
+      payloadId: localId,
+      logbookId,
+      encryptedData: encrypted.ciphertext,
+      iv: encrypted.iv,
+      tag: encrypted.tag,
+      updatedAt: nowStr
+    },
+    initialPayload
+  )
+
+  await db.syncQueue.put({
+    action: 'create',
+    type: 'entry',
+    payloadId: localId,
+    logbookId,
+    data: JSON.stringify(encrypted),
+    updatedAt: nowStr
+  })
+
+  syncLogbook(logbookId).catch((err) => console.warn('Background sync failed:', err))
+  return localId
+}
+
+export async function findOrCreateTodayEntry(logbookId: string): Promise<string> {
+  const id = logbookId.trim()
+  if (!id) throw new Error('Logbook id required')
+
+  await ensureLogbookKey(id)
+
+  const entryCount = await db.entries.where({ logbookId: id }).count()
+  if (entryCount === 0) {
+    return createTodayEntry(id)
+  }
+
+  const existing = await findTodayEntryId(id)
+  if (existing) return existing
+  return createTodayEntry(id)
+}
+
+export interface AppendQuickEventResult {
+  events: LogEventPayload[]
+  hadSignature: boolean
+}
+
+export async function appendQuickEvent(
+  logbookId: string,
+  entryId: string,
+  partialEvent: Partial<LogEventPayload>,
+  headerPatch?: { departure?: string; destination?: string }
+): Promise<AppendQuickEventResult> {
+  const loaded = await loadEntry(logbookId, entryId)
+  if (!loaded) throw new Error('Entry not found')
+
+  const hadSignature = !!(loaded.data.signSkipper || loaded.data.signCrew)
+  const currentEvents = (loaded.data.events as LogEventPayload[]) || []
+  const newEvent = normalizeLogEvent({
+    time: currentLocalTimeHHMM(),
+    ...partialEvent
+  })
+  const nextEvents = sortLogEventsByTime([...currentEvents, newEvent])
+
+  await persistEntry(logbookId, entryId, loaded.data, {
+    events: nextEvents,
+    departure: headerPatch?.departure,
+    destination: headerPatch?.destination,
+    clearSignatures: hadSignature
+  })
+
+  return { events: nextEvents, hadSignature }
+}
+
+/** Append multiple events in one load/encrypt/persist cycle (avoids UI freezes). */
+export async function appendQuickEvents(
+  logbookId: string,
+  entryId: string,
+  partialEvents: Partial<LogEventPayload>[]
+): Promise<AppendQuickEventResult> {
+  const loaded = await loadEntry(logbookId, entryId)
+  if (!loaded) throw new Error('Entry not found')
+
+  const hadSignature = !!(loaded.data.signSkipper || loaded.data.signCrew)
+  const currentEvents = (loaded.data.events as LogEventPayload[]) || []
+  if (partialEvents.length === 0) {
+    return { events: currentEvents, hadSignature }
+  }
+
+  const time = currentLocalTimeHHMM()
+  const newEvents = partialEvents.map((partial) =>
+    normalizeLogEvent({ time, ...partial })
+  )
+  const nextEvents = sortLogEventsByTime([...currentEvents, ...newEvents])
+
+  await persistEntry(logbookId, entryId, loaded.data, {
+    events: nextEvents,
+    clearSignatures: hadSignature
+  })
+
+  return { events: nextEvents, hadSignature }
+}
+
+async function persistEntry(
+  logbookId: string,
+  entryId: string,
+  data: Record<string, unknown>,
+  options: Parameters<typeof buildEncryptedPayload>[1]
+): Promise<void> {
+  const hadSignature = !!(data.signSkipper || data.signCrew)
+  const entryData = buildEncryptedPayload(data, {
+    ...options,
+    clearSignatures: options.clearSignatures ?? hadSignature
+  })
+
+  const masterKey = await getMasterKey(logbookId)
+  const encrypted = await encryptJson(entryData, masterKey)
+  const now = new Date().toISOString()
+
+  await putEntryRecord(
+    {
+      payloadId: entryId,
+      logbookId,
+      encryptedData: encrypted.ciphertext,
+      iv: encrypted.iv,
+      tag: encrypted.tag,
+      updatedAt: now
+    },
+    entryData
+  )
+
+  await db.syncQueue.put({
+    action: 'update',
+    type: 'entry',
+    payloadId: entryId,
+    logbookId,
+    data: JSON.stringify(encrypted),
+    updatedAt: now
+  })
+
+  syncLogbook(logbookId).catch((err) => console.warn('Background sync failed:', err))
+}
+
+export async function removeLastEvent(
+  logbookId: string,
+  entryId: string
+): Promise<LogEventPayload[]> {
+  const loaded = await loadEntry(logbookId, entryId)
+  if (!loaded) throw new Error('Entry not found')
+
+  const currentEvents = (loaded.data.events as LogEventPayload[]) || []
+  if (currentEvents.length === 0) return []
+
+  const nextEvents = sortLogEventsByTime(currentEvents.slice(0, -1))
+  await persistEntry(logbookId, entryId, loaded.data, { events: nextEvents })
+  return nextEvents
+}
+
+export async function appendTankRefill(
+  logbookId: string,
+  entryId: string,
+  tank: 'fuel' | 'freshwater',
+  addLiters: number,
+  event: Partial<LogEventPayload>
+): Promise<AppendQuickEventResult> {
+  const loaded = await loadEntry(logbookId, entryId)
+  if (!loaded) throw new Error('Entry not found')
+
+  const { fw, fuel } = tankLevelsFromData(loaded.data)
+  const currentEvents = (loaded.data.events as LogEventPayload[]) || []
+  const newEvent = normalizeLogEvent({
+    time: currentLocalTimeHHMM(),
+    ...event
+  })
+  const nextEvents = sortLogEventsByTime([...currentEvents, newEvent])
+
+  const tankPatch = tank === 'fuel'
+    ? {
+        fuel: {
+          morning: fuel.morning || 0,
+          refilled: (fuel.refilled || 0) + addLiters,
+          evening: fuel.evening || 0,
+          consumption: fuel.consumption ?? 0
+        }
+      }
+    : {
+        freshwater: {
+          morning: fw.morning || 0,
+          refilled: (fw.refilled || 0) + addLiters,
+          evening: fw.evening || 0,
+          consumption: fw.consumption ?? 0
+        }
+      }
+
+  const hadSignature = !!(loaded.data.signSkipper || loaded.data.signCrew)
+  await persistEntry(logbookId, entryId, loaded.data, {
+    events: nextEvents,
+    ...tankPatch,
+    clearSignatures: hadSignature
+  })
+
+  return { events: nextEvents, hadSignature }
+}
--- a/Show More
+++ b/Show More