fix(api): refetch from server when online (stale-while-revalidate)

The Tier-2 rehydrated cache seeded fulfilled entries at startup, so RTKQ served stale data and never hit the network (manual metadata edits, etc. only appeared after clearing the cache). Enable refetchOnMountOrArgChange + refetchOnReconnect + refetchOnFocus and wire setupListeners, so the cached snapshot still shows instantly but the server silently revalidates it whenever reachable.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

.env.example

@@ -1,2 +1,6 @@
 # Default backend URL (overridable at runtime in the UI)
 PUBLIC_API_BASE_URL=http://localhost:8080/api/v1
+
+# Show the public sign-up UI on the connect screen. Set to false to hide it.
+# The backend's ALLOW_REGISTRATION is the real authority; this only gates the UI.
+PUBLIC_ENABLE_REGISTRATION=true

.gitea/workflows/docker-publish.yml

@@ -0,0 +1,121 @@
+name: Docker Build & Publish
+
+on:
+  push:
+    branches: [master]
+  workflow_dispatch:
+
+env:
+  # Number of tagged (non-latest) versions to keep per image name.
+  KEEP_VERSIONS: '5'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    outputs:
+      host: ${{ steps.meta.outputs.host }}
+      image: ${{ steps.meta.outputs.image }}
+      sha: ${{ steps.meta.outputs.sha }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Resolve registry metadata
+        id: meta
+        run: |
+          host=$(echo "${{ gitea.server_url }}" | sed 's|https\?://||; s|/$||')
+          repo_lc=$(echo "${{ gitea.repository }}" | tr '[:upper:]' '[:lower:]')
+          echo "host=$host"            >> "$GITHUB_OUTPUT"
+          echo "image=$host/$repo_lc" >> "$GITHUB_OUTPUT"
+          echo "sha=$(git rev-parse --short HEAD)" >> "$GITHUB_OUTPUT"
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: dockerfiles/Dockerfile.prod
+          push: false
+          build-args: |
+            PUBLIC_API_BASE_URL=/api/v1
+          tags: |
+            ${{ steps.meta.outputs.image }}:latest
+            ${{ steps.meta.outputs.image }}:${{ steps.meta.outputs.sha }}
+          outputs: type=docker,dest=/tmp/image.tar
+
+      - name: Upload image artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: docker-image
+          path: /tmp/image.tar
+          retention-days: 1
+
+  push:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download image artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: docker-image
+          path: /tmp
+
+      - name: Load image
+        run: docker load < /tmp/image.tar
+
+      - name: Log in to Gitea registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ needs.build.outputs.host }}
+          username: ${{ gitea.actor }}
+          password: ${{ secrets.PACKAGE_REGISTRY_TOKEN }}
+
+      - name: Push image
+        run: |
+          docker push ${{ needs.build.outputs.image }}:latest
+          docker push ${{ needs.build.outputs.image }}:${{ needs.build.outputs.sha }}
+
+  cleanup:
+    name: Prune old image versions
+    needs: push
+    runs-on: ubuntu-latest
+    steps:
+      - name: Delete versions beyond KEEP_VERSIONS
+        env:
+          GITEA_URL: ${{ gitea.server_url }}
+          OWNER: ${{ gitea.repository_owner }}
+          IMAGE: ${{ gitea.event.repository.name }}
+          TOKEN: ${{ secrets.PACKAGE_REGISTRY_TOKEN }}
+        run: |
+          image=$(echo "$IMAGE" | tr '[:upper:]' '[:lower:]')
+
+          # List all container package versions for this image (page size 50 is
+          # enough for typical repos; increase if you push very frequently).
+          response=$(curl -sf \
+            -H "Authorization: token $TOKEN" \
+            -H "Accept: application/json" \
+            "${GITEA_URL}/api/v1/packages/${OWNER}?type=container&limit=50&q=${image}")
+
+          # Keep the KEEP_VERSIONS newest SHA-tagged versions; always preserve 'latest'.
+          to_delete=$(printf '%s' "$response" \
+            | jq -r \
+                --arg  name "$image" \
+                --argjson keep "$KEEP_VERSIONS" \
+                '[.[] | select(.name == $name and .version != "latest")]
+                 | sort_by(.created) | reverse
+                 | .[$keep:][].version')
+
+          if [ -z "$to_delete" ]; then
+            echo "Nothing to prune."
+            exit 0
+          fi
+
+          while IFS= read -r version; do
+            echo "Deleting ${image}:${version}"
+            curl -sf -X DELETE \
+              -H "Authorization: token $TOKEN" \
+              "${GITEA_URL}/api/v1/packages/${OWNER}/container/${image}/${version}" \
+            && echo "  ok" || echo "  failed (may already be gone, continuing)"
+          done <<< "$to_delete"

dockerfiles/30-runtime-config.sh

@@ -0,0 +1,26 @@
+#!/bin/sh
+# Write the SPA's runtime operator config at container start.
+#
+# The nginx base image runs every /docker-entrypoint.d/*.sh before launching
+# nginx, so this overwrites the build-time public/config.js stub with the
+# operator's runtime config ($PUBLIC_API_BASE_URL, $PUBLIC_ENABLE_REGISTRATION).
+# That lets one prebuilt image target any backend origin and toggle sign-up
+# without rebuilding. Resolution + precedence live in src/config/env.ts.
+set -eu
+
+: "${PUBLIC_API_BASE_URL:=/api/v1}"
+: "${PUBLIC_ENABLE_REGISTRATION:=true}"
+ROOT="${NGINX_HTML_ROOT:-/usr/share/nginx/html}"
+
+# Anything but "false"/"0" enables the sign-up UI (mirrors parseFlag in env.ts).
+if [ "$PUBLIC_ENABLE_REGISTRATION" = "false" ] || [ "$PUBLIC_ENABLE_REGISTRATION" = "0" ]; then
+  ENABLE_REGISTRATION=false
+else
+  ENABLE_REGISTRATION=true
+fi
+
+printf 'window.__APP_CONFIG__={"apiBaseUrl":"%s","enableRegistration":%s};\n' \
+  "$PUBLIC_API_BASE_URL" "$ENABLE_REGISTRATION" \
+  >"$ROOT/config.js"
+
+echo "runtime-config: wrote apiBaseUrl=$PUBLIC_API_BASE_URL enableRegistration=$ENABLE_REGISTRATION to $ROOT/config.js"

dockerfiles/Dockerfile.dev

@@ -4,14 +4,9 @@
 # shadows the container install. Build context = mcma-webui/.
 FROM node:22-slim
 
-# `modern-sk` is a git dependency (git+https://...) — npm needs git to fetch it.
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends git \
-    && rm -rf /var/lib/apt/lists/*
-
 WORKDIR /app
 
-COPY package.json package-lock.json modern-sk-*.tgz ./
+COPY package.json package-lock.json ./
 RUN npm ci
 
 COPY . .

dockerfiles/Dockerfile.prod

@@ -8,13 +8,14 @@ FROM node:22-slim AS build
 
 WORKDIR /app
 
-COPY package.json package-lock.json modern-sk-*.tgz ./
+COPY package.json package-lock.json ./
 RUN npm ci
 
 COPY . .
 
-# Bake the API base URL at build time (rsbuild inlines PUBLIC_* vars).
-# Same-origin default ('/api/v1') works behind any reverse proxy.
+# Build-time default for the API base URL (rsbuild inlines PUBLIC_* vars). This
+# is only the *fallback* now — the real value is injected at container start by
+# 30-runtime-config.sh, so the image can target any backend without a rebuild.
 ARG PUBLIC_API_BASE_URL=/api/v1
 ENV PUBLIC_API_BASE_URL=$PUBLIC_API_BASE_URL
 RUN npm run build
@@ -25,5 +26,10 @@ FROM nginx:1.27-alpine AS runtime
 COPY dockerfiles/nginx.conf /etc/nginx/conf.d/default.conf
 COPY --from=build /app/dist /usr/share/nginx/html
 
+# Runtime config injection: the nginx image runs /docker-entrypoint.d/*.sh
+# before starting, regenerating /config.js from $PUBLIC_API_BASE_URL.
+COPY dockerfiles/30-runtime-config.sh /docker-entrypoint.d/30-runtime-config.sh
+RUN chmod +x /docker-entrypoint.d/30-runtime-config.sh
+
 EXPOSE 80
 CMD ["nginx", "-g", "daemon off;"]

dockerfiles/nginx.conf

@@ -14,6 +14,13 @@ server {
         try_files $uri =404;
     }
 
+    # Runtime operator config — regenerated per container start, so it must
+    # never be cached or a redeployed backend URL would be ignored.
+    location = /config.js {
+        add_header Cache-Control "no-store";
+        try_files $uri =404;
+    }
+
     # SPA: every unknown path falls back to index.html (client-side router).
     location / {
         try_files $uri $uri/ /index.html;

package-lock.json

@@ -8,7 +8,10 @@
       "name": "mcma-webui",
       "version": "1.0.0",
       "dependencies": {
-        "@olly/modern-sk": "0.1.4-3",
+        "@dnd-kit/core": "^6.3.1",
+        "@dnd-kit/sortable": "^10.0.0",
+        "@dnd-kit/utilities": "^3.2.2",
+        "@olly/modern-sk": "^0.1.5",
         "@phosphor-icons/react": "^2.1.10",
         "@reduxjs/toolkit": "^2.12.0",
         "i18next": "^26.3.1",
@@ -16,7 +19,8 @@
         "react-dom": "^19.2.6",
         "react-i18next": "^17.0.8",
         "react-redux": "^9.3.0",
-        "react-router": "^7.16.0"
+        "react-router": "^7.16.0",
+        "use-debounce": "^10.1.1"
       },
       "devDependencies": {
         "@rsbuild/core": "^2.0.7",
@@ -551,6 +555,59 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@dnd-kit/accessibility": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@dnd-kit/accessibility/-/accessibility-3.1.1.tgz",
+      "integrity": "sha512-2P+YgaXF+gRsIihwwY1gCsQSYnu9Zyj2py8kY5fFvUM1qm2WA2u639R6YNVfU4GWr+ZM5mqEsfHZZLoRONbemw==",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.8.0"
+      }
+    },
+    "node_modules/@dnd-kit/core": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/@dnd-kit/core/-/core-6.3.1.tgz",
+      "integrity": "sha512-xkGBRQQab4RLwgXxoqETICr6S5JlogafbhNsidmrkVv2YRs5MLwpjoF2qpiGjQt8S9AoxtIV603s0GIUpY5eYQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@dnd-kit/accessibility": "^3.1.1",
+        "@dnd-kit/utilities": "^3.2.2",
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.8.0",
+        "react-dom": ">=16.8.0"
+      }
+    },
+    "node_modules/@dnd-kit/sortable": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/@dnd-kit/sortable/-/sortable-10.0.0.tgz",
+      "integrity": "sha512-+xqhmIIzvAYMGfBYYnbKuNicfSsk4RksY2XdmJhT+HAC01nix6fHCztU68jooFiMUB01Ky3F0FyOvhG/BZrWkg==",
+      "license": "MIT",
+      "dependencies": {
+        "@dnd-kit/utilities": "^3.2.2",
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@dnd-kit/core": "^6.3.0",
+        "react": ">=16.8.0"
+      }
+    },
+    "node_modules/@dnd-kit/utilities": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/@dnd-kit/utilities/-/utilities-3.2.2.tgz",
+      "integrity": "sha512-+MKAJEOfaBe5SmV6t34p80MMKhjvUz0vRrvVJbPT0WElzaOJ/1xs+D+KDv+tD/NE5ujfrChEcshd4fLn0wpiqg==",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.8.0"
+      }
+    },
     "node_modules/@emnapi/core": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.10.0.tgz",
@@ -693,9 +750,9 @@
       }
     },
     "node_modules/@olly/modern-sk": {
-      "version": "0.1.4-3",
-      "resolved": "https://git.ollyhearn.ru/api/packages/olly/npm/%40olly%2Fmodern-sk/-/0.1.4-3/modern-sk-0.1.4-3.tgz",
-      "integrity": "sha512-h+d+Jd3DBr7d51V78p1Eb5rVrpN4PAskwQFnh2X4Dk7Q8oajiMVJuhZU1amx97bKHFDHgcOfhwc4cS8P4tFCmQ==",
+      "version": "0.1.5",
+      "resolved": "https://git.ollyhearn.ru/api/packages/olly/npm/%40olly%2Fmodern-sk/-/0.1.5/modern-sk-0.1.5.tgz",
+      "integrity": "sha512-rhKp4U2IovSZkgdfg4oZqyhF0GgB8oR5TPlPXg0iYQEuEtff5zAgRXS+uY3dOPg2tStG3ysHUJaohD9YS2ADiA==",
       "license": "MIT",
       "dependencies": {
         "@phosphor-icons/react": "^2.1.10",
@@ -4469,6 +4526,18 @@
         }
       }
     },
+    "node_modules/use-debounce": {
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/use-debounce/-/use-debounce-10.1.1.tgz",
+      "integrity": "sha512-kvds8BHR2k28cFsxW8k3nc/tRga2rs1RHYCqmmGqb90MEeE++oALwzh2COiuBLO1/QXiOuShXoSN2ZpWnMmvuQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 16.0.0"
+      },
+      "peerDependencies": {
+        "react": "*"
+      }
+    },
     "node_modules/use-sidecar": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/use-sidecar/-/use-sidecar-1.1.3.tgz",

package.json

@@ -13,7 +13,10 @@
     "test:watch": "rstest --watch"
   },
   "dependencies": {
-    "@olly/modern-sk": "0.1.4-3",
+    "@dnd-kit/core": "^6.3.1",
+    "@dnd-kit/sortable": "^10.0.0",
+    "@dnd-kit/utilities": "^3.2.2",
+    "@olly/modern-sk": "^0.1.5",
     "@phosphor-icons/react": "^2.1.10",
     "@reduxjs/toolkit": "^2.12.0",
     "i18next": "^26.3.1",
@@ -21,7 +24,8 @@
     "react-dom": "^19.2.6",
     "react-i18next": "^17.0.8",
     "react-redux": "^9.3.0",
-    "react-router": "^7.16.0"
+    "react-router": "^7.16.0",
+    "use-debounce": "^10.1.1"
   },
   "devDependencies": {
     "@rsbuild/core": "^2.0.7",

public/config.js

@@ -0,0 +1,8 @@
+// Runtime operator configuration, read by the app before the bundle loads
+// (see src/config/env.ts). In the PROD image this file is OVERWRITTEN at
+// container start from $PUBLIC_API_BASE_URL (dockerfiles/30-runtime-config.sh),
+// so one prebuilt image can target any backend origin without a rebuild.
+//
+// This committed stub is the local-dev / build-time default: it leaves the
+// config empty so base-URL resolution falls back to the build-time env var.
+window.__APP_CONFIG__ = {};

public/manifest.webmanifest

@@ -0,0 +1,19 @@
+{
+  "name": "MCMA — Music",
+  "short_name": "MCMA",
+  "description": "Self-hosted music — control center and offline-capable player.",
+  "start_url": "/",
+  "scope": "/",
+  "display": "standalone",
+  "orientation": "any",
+  "background_color": "#0b0b0b",
+  "theme_color": "#0b0b0b",
+  "icons": [
+    {
+      "src": "/favicon.png",
+      "sizes": "128x128",
+      "type": "image/png",
+      "purpose": "any"
+    }
+  ]
+}

public/sw-core.js

@@ -0,0 +1,98 @@
+/*
+ * Service-worker core: pure helpers with NO side effects (no `self`, no
+ * `caches`, no `fetch`). Split out from `sw.js` so the tricky bits — HTTP Range
+ * parsing, LRU eviction, cache-key normalization — can be unit-tested in Node.
+ *
+ * This is an ES module: `sw.js` imports it (the SW is registered with
+ * { type: 'module' }) and tests import it natively — one source, no drift.
+ */
+
+// Bump the version to invalidate every cached blob on a breaking change.
+export const AUDIO_CACHE = 'mcma-audio-v1';
+// Synthetic same-origin key holding the LRU index ({ key: {size, lastAccess} }).
+export const INDEX_URL = '/__mcma_audio_index__';
+// Soft cap on total cached audio. LRU eviction keeps us under this.
+export const MAX_BYTES = 500 * 1024 * 1024; // 500 MB
+
+// Cover art (album/artist/playlist images) gets its own cache with a simple
+// count cap — covers are small and stable, so no per-byte LRU is needed.
+export const COVER_CACHE = 'mcma-covers-v1';
+export const MAX_COVERS = 600;
+
+// Backend stream route: /api/v1/stream/<trackId>?token=...
+const STREAM_RE = /\/stream\/([^/?#]+)/;
+
+/** The track (content) id from a stream URL, or null if it isn't one. */
+export function trackIdFromUrl(url) {
+  const m = STREAM_RE.exec(url);
+  return m ? m[1] : null;
+}
+
+/**
+ * Canonical cache key for a stream URL: origin + path, query dropped. The auth
+ * token rides in the query and rotates on refresh, so keying by content path
+ * (origin keeps two backends from colliding) makes the cache token-stable —
+ * the same track is one entry regardless of which token fetched it.
+ */
+export function cacheKeyFor(url) {
+  try {
+    const u = new URL(url);
+    return u.origin + u.pathname;
+  } catch {
+    return String(url).split('?')[0];
+  }
+}
+
+/**
+ * Parse an HTTP `Range` header against a known resource size. Returns inclusive
+ * { start, end } byte offsets, or null for "no range / serve the whole thing".
+ * Handles `bytes=a-b`, `bytes=a-` (open-ended) and `bytes=-n` (last n bytes).
+ */
+export function parseRangeHeader(rangeHeader, size) {
+  if (!rangeHeader) return null;
+  const m = /^bytes=(\d*)-(\d*)$/.exec(String(rangeHeader).trim());
+  if (!m) return null;
+  let start = m[1] === '' ? null : parseInt(m[1], 10);
+  let end = m[2] === '' ? null : parseInt(m[2], 10);
+  if (start === null && end === null) return null;
+  if (start === null) {
+    // suffix range: the final `end` bytes
+    start = Math.max(0, size - end);
+    end = size - 1;
+  } else if (end === null) {
+    end = size - 1;
+  }
+  if (Number.isNaN(start) || Number.isNaN(end)) return null;
+  if (end >= size) end = size - 1;
+  if (start < 0 || start > end) return null;
+  return { start, end };
+}
+
+/**
+ * Choose which cached entries to evict (least-recently-used first) so that the
+ * existing total plus an incoming blob fits under `maxBytes`. Returns the list
+ * of keys to delete; empty when there's already room.
+ *
+ * `index` is { [key]: { size, lastAccess } }.
+ */
+export function selectEvictions(index, incomingSize, maxBytes) {
+  let total = incomingSize;
+  for (const k in index) total += index[k].size || 0;
+  if (total <= maxBytes) return [];
+
+  const entries = Object.keys(index)
+    .map((k) => ({
+      key: k,
+      lastAccess: index[k].lastAccess || 0,
+      size: index[k].size || 0,
+    }))
+    .sort((a, b) => a.lastAccess - b.lastAccess); // oldest first
+
+  const evict = [];
+  for (const e of entries) {
+    if (total <= maxBytes) break;
+    evict.push(e.key);
+    total -= e.size;
+  }
+  return evict;
+}

public/sw.js

@@ -0,0 +1,259 @@
+/*
+ * MCMA service worker — Tier 3 offline support: audio blob cache.
+ *
+ * It sits between the app and the network for audio-stream requests only
+ * (`/stream/<id>`). The first time a track is streamed it's copied
+ * into the Cache API (keyed by content id, token stripped); afterwards — or
+ * whenever the backend is unreachable — playback is served straight from the
+ * cache, so already-heard tracks play with no network at all.
+ *
+ * Pure helpers (range parsing, LRU, key normalization) live in sw-core.js so
+ * they can be unit-tested; this file owns the side-effectful cache/network I/O.
+ * Registered as a module worker ({ type: 'module' }), so it uses ES imports.
+ */
+import {
+  AUDIO_CACHE,
+  INDEX_URL,
+  MAX_BYTES,
+  COVER_CACHE,
+  MAX_COVERS,
+  trackIdFromUrl,
+  cacheKeyFor,
+  parseRangeHeader,
+  selectEvictions,
+} from './sw-core.js';
+
+self.addEventListener('install', () => {
+  // Activate immediately on first install / update — no stale SW lingering.
+  self.skipWaiting();
+});
+
+self.addEventListener('activate', (event) => {
+  event.waitUntil(self.clients.claim());
+});
+
+self.addEventListener('fetch', (event) => {
+  const req = event.request;
+  if (req.method !== 'GET') return;
+  if (trackIdFromUrl(req.url)) {
+    event.respondWith(handleAudio(event)); // audio stream → range-aware cache
+    return;
+  }
+  if (req.destination === 'image') {
+    event.respondWith(handleImage(event)); // cover art → stale-while-revalidate
+  }
+});
+
+async function handleAudio(event) {
+  const req = event.request;
+  const key = cacheKeyFor(req.url);
+  const range = req.headers.get('range');
+  const cache = await caches.open(AUDIO_CACHE);
+
+  // 1) Serve from cache when we have it (works fully offline).
+  const cached = await cache.match(key);
+  if (cached) {
+    event.waitUntil(touch(key));
+    return range ? buildRangeResponse(cached, range) : cached.clone();
+  }
+
+  // 2) Cache miss → fetch the WHOLE file (strip Range) so we can store a
+  //    complete copy, then satisfy the original request (range-sliced if asked).
+  try {
+    const fullReq = new Request(req.url, {
+      headers: withoutRange(req.headers),
+    });
+    const resp = await fetch(fullReq);
+    if (isCacheable(resp)) {
+      event.waitUntil(storeInCache(key, resp.clone()));
+    }
+    return range ? buildRangeResponse(resp, range) : resp;
+  } catch {
+    // Offline and never cached — nothing we can do for this one.
+    return new Response('Offline and not cached', {
+      status: 504,
+      statusText: 'Offline',
+    });
+  }
+}
+
+/**
+ * Cover art: stale-while-revalidate. Serve the cached image instantly (so the
+ * library renders offline), refresh it in the background, and cache fresh hits.
+ * Cover URLs are token-free and stable, and `<img>` is happy with opaque
+ * cross-origin responses — so unlike audio, these cache even cross-origin.
+ */
+async function handleImage(event) {
+  const req = event.request;
+  const cache = await caches.open(COVER_CACHE);
+  const cached = await cache.match(req);
+
+  const fromNetwork = fetch(req)
+    .then((resp) => {
+      if (resp && (resp.status === 200 || resp.type === 'opaque')) {
+        return cache
+          .put(req, resp.clone())
+          .then(() => trimCovers(cache))
+          .then(() => resp);
+      }
+      return resp;
+    })
+    .catch(() => null);
+
+  if (cached) {
+    event.waitUntil(fromNetwork); // revalidate without blocking the response
+    return cached;
+  }
+  const resp = await fromNetwork;
+  return resp || new Response('', { status: 504, statusText: 'Offline' });
+}
+
+/** Keep the cover cache bounded — drop the oldest entries past the cap. */
+async function trimCovers(cache) {
+  const keys = await cache.keys();
+  const excess = keys.length - MAX_COVERS;
+  for (let i = 0; i < excess; i++) await cache.delete(keys[i]);
+}
+
+/** Only cache readable, complete 200 responses — opaque/partial are useless. */
+function isCacheable(resp) {
+  return (
+    resp.status === 200 &&
+    resp.type !== 'opaque' &&
+    resp.type !== 'opaqueredirect'
+  );
+}
+
+function withoutRange(headers) {
+  const out = new Headers();
+  for (const [k, v] of headers.entries()) {
+    if (k.toLowerCase() !== 'range') out.set(k, v);
+  }
+  return out;
+}
+
+/** Build a 206 Partial Content response by slicing a full cached/fetched body. */
+async function buildRangeResponse(response, rangeHeader) {
+  const buf = await response.clone().arrayBuffer();
+  const size = buf.byteLength;
+  const r = parseRangeHeader(rangeHeader, size);
+  const type =
+    response.headers.get('content-type') || 'application/octet-stream';
+
+  if (!r) {
+    return new Response(buf, {
+      status: 200,
+      headers: {
+        'content-type': type,
+        'content-length': String(size),
+        'accept-ranges': 'bytes',
+      },
+    });
+  }
+
+  const sliced = buf.slice(r.start, r.end + 1);
+  return new Response(sliced, {
+    status: 206,
+    statusText: 'Partial Content',
+    headers: {
+      'content-type': type,
+      'content-range': `bytes ${r.start}-${r.end}/${size}`,
+      'content-length': String(sliced.byteLength),
+      'accept-ranges': 'bytes',
+    },
+  });
+}
+
+async function responseSize(resp) {
+  const len = resp.headers.get('content-length');
+  if (len) return Number(len);
+  const blob = await resp.blob();
+  return blob.size;
+}
+
+// --- LRU index -------------------------------------------------------------
+// The index lives as a JSON entry in the same cache. All mutations go through a
+// single serialized chain so concurrent fetch handlers can't clobber it.
+let indexChain = Promise.resolve();
+
+async function readIndex(cache) {
+  try {
+    const res = await cache.match(INDEX_URL);
+    if (!res) return {};
+    return (await res.json()) || {};
+  } catch {
+    return {};
+  }
+}
+
+function writeIndex(mutator) {
+  indexChain = indexChain
+    .then(async () => {
+      const cache = await caches.open(AUDIO_CACHE);
+      const index = await readIndex(cache);
+      await mutator(cache, index);
+      await cache.put(
+        INDEX_URL,
+        new Response(JSON.stringify(index), {
+          headers: { 'content-type': 'application/json' },
+        }),
+      );
+    })
+    .catch(() => {
+      /* keep the chain alive even if one write fails */
+    });
+  return indexChain;
+}
+
+async function storeInCache(key, resp) {
+  const size = await responseSize(resp.clone());
+  await writeIndex(async (cache, index) => {
+    for (const ek of selectEvictions(index, size, MAX_BYTES)) {
+      await cache.delete(ek);
+      delete index[ek];
+    }
+    await cache.put(key, resp);
+    index[key] = { size, lastAccess: Date.now() };
+  });
+}
+
+function touch(key) {
+  return writeIndex((_cache, index) => {
+    if (index[key]) index[key].lastAccess = Date.now();
+  });
+}
+
+// --- client messaging ------------------------------------------------------
+// The app talks to the SW over a MessageChannel: it sends a port, we reply on
+// it. Used for the offline-cache stats/controls in the UI.
+self.addEventListener('message', (event) => {
+  const data = event.data || {};
+  const reply = (result) => {
+    if (event.ports && event.ports[0]) event.ports[0].postMessage(result);
+  };
+  event.waitUntil(
+    (async () => {
+      try {
+        const cache = await caches.open(AUDIO_CACHE);
+        const index = await readIndex(cache);
+        if (data.type === 'STATS') {
+          const keys = Object.keys(index);
+          const bytes = keys.reduce((s, k) => s + (index[k].size || 0), 0);
+          reply({ count: keys.length, bytes, maxBytes: MAX_BYTES });
+        } else if (data.type === 'HAS') {
+          reply({ cached: !!index[cacheKeyFor(data.url)] });
+        } else if (data.type === 'CLEAR') {
+          await Promise.all([
+            caches.delete(AUDIO_CACHE),
+            caches.delete(COVER_CACHE),
+          ]);
+          reply({ ok: true });
+        } else {
+          reply({ error: 'unknown-message' });
+        }
+      } catch (e) {
+        reply({ error: String(e) });
+      }
+    })(),
+  );
+});

rsbuild.config.ts

@@ -32,5 +32,38 @@ export default defineConfig({
   // no manual source.define needed. See src/config/env.ts.
   html: {
     title: 'MCMA',
+    // PWA: link the manifest + declare theme/icon so the browser offers
+    // "Install app". The service worker (audio offline cache) is registered
+    // from src/index.tsx, not here.
+    tags: [
+      // Theme bootstrap — runs inline before first paint to kill the flash of
+      // white on a dark-themed load. Mirrors modern-sk's own logic exactly
+      // (localStorage 'modern-sk-theme' || 'dark' → data-theme on <html>), so
+      // there's no second flip when <ThemeProvider> mounts. Inline (not an
+      // external file) so it costs zero round-trips.
+      {
+        tag: 'script',
+        children:
+          "(function(){try{var t=localStorage.getItem('modern-sk-theme')||'dark';document.documentElement.setAttribute('data-theme',t);}catch(e){}})();",
+        head: true,
+        append: false,
+      },
+      // Runtime operator config. A classic (non-deferred) head script, so it
+      // runs before the deferred app bundle and window.__APP_CONFIG__ is set by
+      // the time src/config/env.ts reads it. Served from public/ in dev and
+      // overwritten from $PUBLIC_API_BASE_URL at container start in prod.
+      {
+        tag: 'script',
+        attrs: { src: '/config.js' },
+        head: true,
+        append: false,
+      },
+      {
+        tag: 'link',
+        attrs: { rel: 'manifest', href: '/manifest.webmanifest' },
+      },
+      { tag: 'meta', attrs: { name: 'theme-color', content: '#0b0b0b' } },
+      { tag: 'link', attrs: { rel: 'apple-touch-icon', href: '/favicon.png' } },
+    ],
   },
 });

src/api/baseQuery.ts

@@ -34,24 +34,23 @@ export const baseQueryWithReauth: BaseQueryFn<
         {
           url: '/auth/refresh',
           method: 'POST',
-          body: { refreshToken },
+          body: { refresh_token: refreshToken },
         },
         api,
         extraOptions,
       );
 
       if (refreshResult.data) {
-        const {
-          accessToken,
-          refreshToken: newRefresh,
-          expiresIn,
-        } = refreshResult.data as {
-          accessToken: string;
-          refreshToken: string;
-          expiresIn: number;
+        // Backend wire format is snake_case with no TTL (see auth.ts adapter).
+        const { access_token, refresh_token } = refreshResult.data as {
+          access_token: string;
+          refresh_token: string;
         };
         api.dispatch(
-          setTokens({ accessToken, refreshToken: newRefresh, expiresIn }),
+          setTokens({
+            accessToken: access_token,
+            refreshToken: refresh_token,
+          }),
         );
         result = await rawBaseQuery()(args, api, extraOptions);
       } else {

src/api/endpoints/admin.ts

@@ -1,33 +1,44 @@
 import { api } from '../index';
+import { toUser, type RawUser } from '../mappers';
 import type { User } from '../types';
 
+/**
+ * Admin user management. The backend models authorization as `is_superuser` /
+ * `is_active` (no `role`/`email`); `toUser` maps superuser→role for the UI and
+ * the mutations translate role back to `is_superuser` on the way out.
+ */
 export const adminApi = api.injectEndpoints({
   endpoints: (build) => ({
     getUsers: build.query<User[], void>({
       query: () => '/admin/users',
+      transformResponse: (raw: RawUser[]) => raw.map(toUser),
       providesTags: ['User'],
     }),
     createUser: build.mutation<
       User,
-      {
-        username: string;
-        password: string;
-        email?: string;
-        role: 'admin' | 'user';
-      }
+      { username: string; password: string; role: 'admin' | 'user' }
     >({
-      query: (body) => ({ url: '/admin/users', method: 'POST', body }),
+      query: ({ username, password, role }) => ({
+        url: '/admin/users',
+        method: 'POST',
+        body: { username, password, is_superuser: role === 'admin' },
+      }),
+      transformResponse: (raw: RawUser) => toUser(raw),
       invalidatesTags: ['User'],
     }),
     updateUser: build.mutation<
       User,
-      { id: string; role?: 'admin' | 'user'; email?: string }
+      { id: string; role?: 'admin' | 'user'; isActive?: boolean }
     >({
-      query: ({ id, ...body }) => ({
+      query: ({ id, role, isActive }) => ({
         url: `/admin/users/${id}`,
         method: 'PATCH',
-        body,
+        body: {
+          is_superuser: role === undefined ? undefined : role === 'admin',
+          is_active: isActive,
+        },
       }),
+      transformResponse: (raw: RawUser) => toUser(raw),
       invalidatesTags: ['User'],
     }),
     deleteUser: build.mutation<void, string>({

src/api/endpoints/auth.ts

@@ -1,26 +1,110 @@
 import { api } from '../index';
-import type { LoginRequest, LoginResponse } from '../types';
+import { toUser, type RawUser } from '../mappers';
+import type {
+  AuthTokens,
+  LoginRequest,
+  LoginResponse,
+  RegisterRequest,
+  User,
+} from '../types';
+
+/**
+ * Auth seam over the backend's wire format: tokens-only login + a separate
+ * `/auth/me` for the user. Token mapping lives here; user mapping is shared with
+ * the admin endpoints via `toUser` in `mappers.ts`.
+ */
+
+/** `/auth/login` & `/auth/refresh` response shape. */
+interface RawTokenResponse {
+  access_token: string;
+  refresh_token: string;
+  token_type?: string;
+}
+
+const toTokens = (raw: RawTokenResponse): AuthTokens => ({
+  accessToken: raw.access_token,
+  refreshToken: raw.refresh_token,
+  // No TTL on the wire — expiry is 401-driven (see baseQuery reauth).
+});
 
 export const authApi = api.injectEndpoints({
   endpoints: (build) => ({
+    // Login is a two-call flow: POST /auth/login yields tokens, then GET
+    // /auth/me resolves the user. A queryFn chains both so callers get the
+    // unified { user, tokens } the UI expects in one await.
     login: build.mutation<LoginResponse, LoginRequest>({
-      query: (body) => ({ url: '/auth/login', method: 'POST', body }),
+      async queryFn(body, _api, _extra, baseQuery) {
+        const tokenRes = await baseQuery({
+          url: '/auth/login',
+          method: 'POST',
+          body,
+        });
+        if (tokenRes.error) return { error: tokenRes.error };
+        const tokens = toTokens(tokenRes.data as RawTokenResponse);
+
+        // The access token isn't in the store yet, so attach it explicitly —
+        // baseQuery's prepareHeaders only injects what's already in auth state.
+        const meRes = await baseQuery({
+          url: '/auth/me',
+          headers: { Authorization: `Bearer ${tokens.accessToken}` },
+        });
+        if (meRes.error) return { error: meRes.error };
+        const user = toUser(meRes.data as RawUser);
+
+        return { data: { user, tokens } };
+      },
     }),
-    logout: build.mutation<void, void>({
-      query: () => ({ url: '/auth/logout', method: 'POST' }),
+    // Sign-up mirrors login: POST /auth/register returns a token pair (the
+    // backend logs the new account straight in), then GET /auth/me resolves the
+    // user — so the UI gets the same unified { user, tokens } as login.
+    register: build.mutation<LoginResponse, RegisterRequest>({
+      async queryFn(body, _api, _extra, baseQuery) {
+        const tokenRes = await baseQuery({
+          url: '/auth/register',
+          method: 'POST',
+          body,
+        });
+        if (tokenRes.error) return { error: tokenRes.error };
+        const tokens = toTokens(tokenRes.data as RawTokenResponse);
+
+        const meRes = await baseQuery({
+          url: '/auth/me',
+          headers: { Authorization: `Bearer ${tokens.accessToken}` },
+        });
+        if (meRes.error) return { error: meRes.error };
+        const user = toUser(meRes.data as RawUser);
+
+        return { data: { user, tokens } };
+      },
     }),
-    refreshToken: build.mutation<
-      { accessToken: string; refreshToken: string; expiresIn: number },
-      { refreshToken: string }
-    >({
-      query: (body) => ({ url: '/auth/refresh', method: 'POST', body }),
+    logout: build.mutation<void, { refreshToken: string }>({
+      query: ({ refreshToken }) => ({
+        url: '/auth/logout',
+        method: 'POST',
+        body: { refresh_token: refreshToken },
       }),
-    me: build.query<import('../types').User, void>({
+    }),
+    refreshToken: build.mutation<AuthTokens, { refreshToken: string }>({
+      query: ({ refreshToken }) => ({
+        url: '/auth/refresh',
+        method: 'POST',
+        body: { refresh_token: refreshToken },
+      }),
+      transformResponse: (raw: RawTokenResponse) => toTokens(raw),
+    }),
+    me: build.query<User, void>({
       query: () => '/auth/me',
+      transformResponse: (raw: RawUser) => toUser(raw),
       providesTags: ['User'],
     }),
   }),
   overrideExisting: false,
 });
 
-export const { useLoginMutation, useLogoutMutation, useMeQuery } = authApi;
+export const {
+  useLoginMutation,
+  useRegisterMutation,
+  useLogoutMutation,
+  useRefreshTokenMutation,
+  useMeQuery,
+} = authApi;

src/api/endpoints/downloads.ts

@@ -1,24 +1,88 @@
 import { api } from '../index';
-import type { DownloadJob } from '../types';
+import {
+  toDownloadJob,
+  toPage,
+  type RawDownloadJob,
+  type RawPaged,
+} from '../mappers';
+import type {
+  DownloadJob,
+  DownloadRequestResult,
+  PaginatedResponse,
+} from '../types';
+
+interface ListParams {
+  status?: DownloadJob['status'];
+  /** Only the current user's jobs (backend `mine=true`). */
+  mine?: boolean;
+  page?: number;
+  pageSize?: number;
+}
+
+interface RawCreateResponse {
+  already_in_library: boolean;
+  track_id: string | null;
+  job: RawDownloadJob | null;
+}
 
 export const downloadsApi = api.injectEndpoints({
   endpoints: (build) => ({
     getDownloads: build.query<
-      DownloadJob[],
-      { status?: DownloadJob['status'] } | void
+      PaginatedResponse<DownloadJob>,
+      ListParams | void
     >({
-      query: (params) => ({ url: '/downloads', params: params ?? {} }),
-      providesTags: ['Download'],
+      query: (params) => {
+        const p = params ?? {};
+        const size = p.pageSize ?? 50;
+        return {
+          url: '/downloads',
+          params: {
+            status: p.status,
+            mine: p.mine ? true : undefined,
+            limit: size,
+            offset: ((p.page ?? 1) - 1) * size,
+          },
+        };
+      },
+      transformResponse: (raw: RawPaged<RawDownloadJob>) =>
+        toPage(raw, toDownloadJob),
+      providesTags: (result) =>
+        result
+          ? [
+              ...result.items.map(({ id }) => ({
+                type: 'Download' as const,
+                id,
+              })),
+              'Download',
+            ]
+          : ['Download'],
     }),
-    addDownload: build.mutation<
-      DownloadJob,
-      {
-        url: string;
-        metadata?: { title?: string; artist?: string; album?: string };
-      }
+    getDownload: build.query<DownloadJob, string>({
+      query: (id) => `/downloads/${id}`,
+      transformResponse: (raw: RawDownloadJob) => toDownloadJob(raw),
+      providesTags: (_r, _e, id) => [{ type: 'Download', id }],
+    }),
+    /** Request a download of a discovered item (§A4 "Download to library"). */
+    createDownload: build.mutation<
+      DownloadRequestResult,
+      { source: string; sourceId: string; query?: string }
     >({
-      query: (body) => ({ url: '/downloads', method: 'POST', body }),
-      invalidatesTags: ['Download'],
+      query: (body) => ({
+        url: '/downloads',
+        method: 'POST',
+        body: {
+          source: body.source,
+          source_id: body.sourceId,
+          query: body.query,
+        },
+      }),
+      transformResponse: (raw: RawCreateResponse): DownloadRequestResult => ({
+        alreadyInLibrary: raw.already_in_library,
+        trackId: raw.track_id ?? undefined,
+        job: raw.job ? toDownloadJob(raw.job) : undefined,
+      }),
+      // A completed dedup can surface an existing library track; refresh both.
+      invalidatesTags: ['Download', 'Track'],
     }),
     cancelDownload: build.mutation<void, string>({
       query: (id) => ({ url: `/downloads/${id}`, method: 'DELETE' }),
@@ -26,7 +90,8 @@ export const downloadsApi = api.injectEndpoints({
     }),
     retryDownload: build.mutation<DownloadJob, string>({
       query: (id) => ({ url: `/downloads/${id}/retry`, method: 'POST' }),
-      invalidatesTags: ['Download'],
+      transformResponse: (raw: RawDownloadJob) => toDownloadJob(raw),
+      invalidatesTags: (_r, _e, id) => [{ type: 'Download', id }, 'Download'],
     }),
   }),
   overrideExisting: false,
@@ -34,7 +99,8 @@ export const downloadsApi = api.injectEndpoints({
 
 export const {
   useGetDownloadsQuery,
-  useAddDownloadMutation,
+  useGetDownloadQuery,
+  useCreateDownloadMutation,
   useCancelDownloadMutation,
   useRetryDownloadMutation,
 } = downloadsApi;

src/api/endpoints/library.ts

@@ -1,16 +1,62 @@
 import { api } from '../index';
+import {
+  toAlbum,
+  toArtist,
+  toMetadataMatch,
+  toPage,
+  toTrack,
+  type RawAlbum,
+  type RawArtist,
+  type RawMetadataMatch,
+  type RawPaged,
+  type RawTrack,
+} from '../mappers';
 import type {
   Track,
   Album,
   Artist,
+  MetadataEdit,
+  MetadataMatch,
   PaginatedResponse,
   LibraryFilters,
 } from '../types';
 
+// The backend sorts on a small allow-list; map the UI's sort keys onto it
+// (album/year aren't sortable server-side yet → fall back to recency).
+const SORT_BY: Record<NonNullable<LibraryFilters['sortBy']>, string> = {
+  title: 'title',
+  artist: 'artist',
+  album: 'created_at',
+  year: 'created_at',
+  dateAdded: 'created_at',
+};
+
+/** UI page/pageSize → backend limit/offset. */
+function paging(page?: number, pageSize?: number) {
+  const size = pageSize ?? 50;
+  return { limit: size, offset: ((page ?? 1) - 1) * size };
+}
+
+function trackParams(f: LibraryFilters) {
+  return {
+    q: f.search,
+    artist_id: f.artistId,
+    album_id: f.albumId,
+    source: f.source,
+    sort_by: f.sortBy ? SORT_BY[f.sortBy] : undefined,
+    order: f.sortOrder,
+    ...paging(f.page, f.pageSize),
+  };
+}
+
 export const libraryApi = api.injectEndpoints({
   endpoints: (build) => ({
     getTracks: build.query<PaginatedResponse<Track>, LibraryFilters | void>({
-      query: (filters) => ({ url: '/library/tracks', params: filters ?? {} }),
+      query: (filters) => ({
+        url: '/tracks',
+        params: trackParams(filters ?? {}),
+      }),
+      transformResponse: (raw: RawPaged<RawTrack>) => toPage(raw, toTrack),
       providesTags: (result) =>
         result
           ? [
@@ -20,7 +66,8 @@ export const libraryApi = api.injectEndpoints({
           : ['Track'],
     }),
     getTrack: build.query<Track, string>({
-      query: (id) => `/library/tracks/${id}`,
+      query: (id) => `/tracks/${id}`,
+      transformResponse: (raw: RawTrack) => toTrack(raw),
       providesTags: (_r, _e, id) => [{ type: 'Track', id }],
     }),
     getAlbums: build.query<
@@ -32,7 +79,15 @@ export const libraryApi = api.injectEndpoints({
         pageSize?: number;
       } | void
     >({
-      query: (params) => ({ url: '/library/albums', params: params ?? {} }),
+      query: (p) => ({
+        url: '/albums',
+        params: {
+          q: p?.search,
+          artist_id: p?.artistId,
+          ...paging(p?.page, p?.pageSize),
+        },
+      }),
+      transformResponse: (raw: RawPaged<RawAlbum>) => toPage(raw, toAlbum),
       providesTags: (result) =>
         result
           ? [
@@ -42,11 +97,13 @@ export const libraryApi = api.injectEndpoints({
           : ['Album'],
     }),
     getAlbum: build.query<Album, string>({
-      query: (id) => `/library/albums/${id}`,
+      query: (id) => `/albums/${id}`,
+      transformResponse: (raw: RawAlbum) => toAlbum(raw),
       providesTags: (_r, _e, id) => [{ type: 'Album', id }],
     }),
     getAlbumTracks: build.query<Track[], string>({
-      query: (albumId) => `/library/albums/${albumId}/tracks`,
+      query: (albumId) => `/albums/${albumId}/tracks`,
+      transformResponse: (raw: RawPaged<RawTrack>) => raw.items.map(toTrack),
       providesTags: (_r, _e, albumId) => [
         { type: 'Album', id: albumId },
         'Track',
@@ -56,7 +113,11 @@ export const libraryApi = api.injectEndpoints({
       PaginatedResponse<Artist>,
       { search?: string; page?: number; pageSize?: number } | void
     >({
-      query: (params) => ({ url: '/library/artists', params: params ?? {} }),
+      query: (p) => ({
+        url: '/artists',
+        params: { q: p?.search, ...paging(p?.page, p?.pageSize) },
+      }),
+      transformResponse: (raw: RawPaged<RawArtist>) => toPage(raw, toArtist),
       providesTags: (result) =>
         result
           ? [
@@ -69,23 +130,77 @@ export const libraryApi = api.injectEndpoints({
           : ['Artist'],
     }),
     getArtist: build.query<Artist, string>({
-      query: (id) => `/library/artists/${id}`,
+      query: (id) => `/artists/${id}`,
+      transformResponse: (raw: RawArtist) => toArtist(raw),
       providesTags: (_r, _e, id) => [{ type: 'Artist', id }],
     }),
     getArtistAlbums: build.query<Album[], string>({
-      query: (artistId) => `/library/artists/${artistId}/albums`,
+      query: (artistId) => `/artists/${artistId}/albums`,
+      transformResponse: (raw: RawPaged<RawAlbum>) => raw.items.map(toAlbum),
       providesTags: (_r, _e, artistId) => [
         { type: 'Artist', id: artistId },
         'Album',
       ],
     }),
+    getArtistTracks: build.query<Track[], string>({
+      query: (artistId) => `/artists/${artistId}/tracks`,
+      transformResponse: (raw: RawPaged<RawTrack>) => raw.items.map(toTrack),
+      providesTags: (_r, _e, artistId) => [
+        { type: 'Artist', id: artistId },
+        'Track',
+      ],
+    }),
     searchLibrary: build.query<
       { tracks: Track[]; albums: Album[]; artists: Artist[] },
       string
     >({
-      query: (q) => ({ url: '/library/search', params: { q } }),
+      query: (q) => ({ url: '/search/library', params: { q } }),
+      transformResponse: (raw: {
+        tracks: RawTrack[];
+        albums: RawAlbum[];
+        artists: RawArtist[];
+      }) => ({
+        tracks: raw.tracks.map(toTrack),
+        albums: raw.albums.map(toAlbum),
+        artists: raw.artists.map(toArtist),
+      }),
       providesTags: ['Track', 'Album', 'Artist'],
     }),
+    getMetadataMatches: build.query<MetadataMatch[], string>({
+      query: (trackId) => `/tracks/${trackId}/metadata/matches`,
+      transformResponse: (raw: { items: RawMetadataMatch[] }) =>
+        raw.items.map(toMetadataMatch),
+    }),
+    applyMetadata: build.mutation<
+      Track,
+      { trackId: string; edit: MetadataEdit }
+    >({
+      query: ({ trackId, edit }) => ({
+        url: `/tracks/${trackId}/metadata`,
+        method: 'PUT',
+        body: {
+          title: edit.title,
+          artist_name: edit.artistName,
+          album_title: edit.albumTitle,
+          year: edit.year,
+          genre: edit.genre,
+          track_number: edit.trackNumber,
+        },
+      }),
+      transformResponse: (raw: RawTrack) => toTrack(raw),
+      invalidatesTags: (_r, _e, { trackId }) => [
+        { type: 'Track', id: trackId },
+        'Album',
+        'Artist',
+      ],
+    }),
+    enrichTrack: build.mutation<{ track_id: string; job_id: string }, string>({
+      query: (trackId) => ({
+        url: `/tracks/${trackId}/metadata/enrich`,
+        method: 'POST',
+      }),
+      invalidatesTags: (_r, _e, trackId) => [{ type: 'Track', id: trackId }],
+    }),
   }),
   overrideExisting: false,
 });
@@ -99,5 +214,9 @@ export const {
   useGetArtistsQuery,
   useGetArtistQuery,
   useGetArtistAlbumsQuery,
+  useGetArtistTracksQuery,
   useSearchLibraryQuery,
+  useLazyGetMetadataMatchesQuery,
+  useApplyMetadataMutation,
+  useEnrichTrackMutation,
 } = libraryApi;

src/api/endpoints/likes.ts

@@ -1,20 +1,68 @@
 import { api } from '../index';
 
+/**
+ * Likes are an append-only event-log on the backend: state changes by POSTing a
+ * new `{track_id, value}` event, never by PUT/DELETE on a boolean. "Unlike" is
+ * just a `neutral` event superseding the prior `like`.
+ */
+type LikeValue = 'like' | 'dislike' | 'neutral';
+
+interface RawLikeState {
+  track_id: string;
+  value: LikeValue;
+  updated_at: string;
+}
+
+export interface LikeState {
+  trackId: string;
+  value: LikeValue;
+  updatedAt: string;
+}
+
+const toLikeState = (r: RawLikeState): LikeState => ({
+  trackId: r.track_id,
+  value: r.value,
+  updatedAt: r.updated_at,
+});
+
 export const likesApi = api.injectEndpoints({
   endpoints: (build) => ({
-    likeTrack: build.mutation<void, string>({
-      query: (trackId) => ({ url: `/likes/tracks/${trackId}`, method: 'PUT' }),
-      invalidatesTags: (_r, _e, id) => ['Like', { type: 'Track', id }],
+    setLike: build.mutation<LikeState, { trackId: string; value: LikeValue }>({
+      query: ({ trackId, value }) => ({
+        url: '/likes',
+        method: 'POST',
+        body: { track_id: trackId, value },
       }),
-    unlikeTrack: build.mutation<void, string>({
-      query: (trackId) => ({
-        url: `/likes/tracks/${trackId}`,
-        method: 'DELETE',
+      transformResponse: (raw: RawLikeState) => toLikeState(raw),
+      invalidatesTags: (_r, _e, { trackId }) => [
+        'Like',
+        { type: 'Track', id: trackId },
+      ],
     }),
-      invalidatesTags: (_r, _e, id) => ['Like', { type: 'Track', id }],
+    // Latest like state for a set of tracks (drives like buttons in lists).
+    getLikesState: build.query<LikeState[], string[]>({
+      query: (trackIds) => ({
+        url: '/likes/state',
+        params: { track_ids: trackIds.join(',') },
+      }),
+      transformResponse: (raw: RawLikeState[]) => raw.map(toLikeState),
+      providesTags: ['Like'],
     }),
   }),
   overrideExisting: false,
 });
 
-export const { useLikeTrackMutation, useUnlikeTrackMutation } = likesApi;
+const { useSetLikeMutation, useGetLikesStateQuery } = likesApi;
+
+/** Convenience hook preserving the like/unlike call sites. */
+export function useLikeActions() {
+  const [setLike, state] = useSetLikeMutation();
+  return {
+    like: (trackId: string) => setLike({ trackId, value: 'like' }),
+    unlike: (trackId: string) => setLike({ trackId, value: 'neutral' }),
+    dislike: (trackId: string) => setLike({ trackId, value: 'dislike' }),
+    state,
+  };
+}
+
+export { useSetLikeMutation, useGetLikesStateQuery };

src/api/endpoints/playlists.ts

@@ -1,36 +1,61 @@
 import { api } from '../index';
+import {
+  toPage,
+  toPlaylist,
+  toTrack,
+  type RawPaged,
+  type RawPlaylist,
+  type RawTrack,
+} from '../mappers';
 import type { Playlist, PlaylistTrack, PaginatedResponse } from '../types';
 
 export const playlistsApi = api.injectEndpoints({
   endpoints: (build) => ({
     getPlaylists: build.query<PaginatedResponse<Playlist>, void>({
       query: () => '/playlists',
+      transformResponse: (raw: RawPaged<RawPlaylist>) =>
+        toPage(raw, toPlaylist),
       providesTags: ['Playlist'],
     }),
     getPlaylist: build.query<Playlist, string>({
       query: (id) => `/playlists/${id}`,
+      transformResponse: (raw: RawPlaylist) => toPlaylist(raw),
       providesTags: (_r, _e, id) => [{ type: 'Playlist', id }],
     }),
     getPlaylistTracks: build.query<PlaylistTrack[], string>({
       query: (id) => `/playlists/${id}/tracks`,
+      // The backend returns plain tracks in playlist order; position/addedAt
+      // aren't on TrackOut, so derive position from order and default addedAt.
+      transformResponse: (raw: RawPaged<RawTrack>) =>
+        raw.items.map((r, i) => ({
+          ...toTrack(r),
+          position: i,
+          addedAt: r.created_at,
+        })),
       providesTags: (_r, _e, id) => [{ type: 'Playlist', id }, 'Track'],
     }),
     createPlaylist: build.mutation<
       Playlist,
-      { name: string; description?: string; isPublic?: boolean }
+      { name: string; description?: string }
     >({
-      query: (body) => ({ url: '/playlists', method: 'POST', body }),
+      query: ({ name, description }) => ({
+        url: '/playlists',
+        method: 'POST',
+        body: { name, description },
+      }),
+      transformResponse: (raw: RawPlaylist) => toPlaylist(raw),
       invalidatesTags: ['Playlist'],
     }),
     updatePlaylist: build.mutation<
       Playlist,
-      { id: string; name?: string; description?: string; isPublic?: boolean }
+      { id: string; name?: string; description?: string }
     >({
-      query: ({ id, ...body }) => ({
+      query: ({ id, name, description }) => ({
         url: `/playlists/${id}`,
         method: 'PATCH',
-        body,
+        body: { name, description },
       }),
+      transformResponse: (raw: RawPlaylist) => toPlaylist(raw),
       invalidatesTags: (_r, _e, { id }) => [{ type: 'Playlist', id }],
     }),
     deletePlaylist: build.mutation<void, string>({
@@ -39,12 +64,12 @@ export const playlistsApi = api.injectEndpoints({
     }),
     addTrackToPlaylist: build.mutation<
       void,
-      { playlistId: string; trackId: string }
+      { playlistId: string; trackId: string; position?: number }
     >({
-      query: ({ playlistId, trackId }) => ({
+      query: ({ playlistId, trackId, position }) => ({
         url: `/playlists/${playlistId}/tracks`,
         method: 'POST',
-        body: { trackId },
+        body: { track_id: trackId, position },
       }),
       invalidatesTags: (_r, _e, { playlistId }) => [
         { type: 'Playlist', id: playlistId },
@@ -52,10 +77,10 @@ export const playlistsApi = api.injectEndpoints({
     }),
     removeTrackFromPlaylist: build.mutation<
       void,
-      { playlistId: string; trackId: string; position: number }
+      { playlistId: string; trackId: string }
     >({
-      query: ({ playlistId, position }) => ({
-        url: `/playlists/${playlistId}/tracks/${position}`,
+      query: ({ playlistId, trackId }) => ({
+        url: `/playlists/${playlistId}/tracks/${trackId}`,
         method: 'DELETE',
       }),
       invalidatesTags: (_r, _e, { playlistId }) => [

src/api/endpoints/search.ts

@@ -0,0 +1,48 @@
+import { api } from '../index';
+import {
+  toSearchResult,
+  toSourceInfo,
+  type RawSearchResult,
+  type RawSourceInfo,
+} from '../mappers';
+import type { ExternalSearchResult, SourceInfo } from '../types';
+
+interface RawSearchResponse {
+  results: RawSearchResult[];
+  searched_sources: string[];
+}
+
+interface SearchResponse {
+  results: ExternalSearchResult[];
+  /** Names of the sources actually queried (available ones). */
+  searchedSources: string[];
+}
+
+const mapSearch = (raw: RawSearchResponse): SearchResponse => ({
+  results: raw.results.map(toSearchResult),
+  searchedSources: raw.searched_sources,
+});
+
+export const searchApi = api.injectEndpoints({
+  endpoints: (build) => ({
+    /** Registered source backends (for the §A4 source picker). */
+    getSources: build.query<SourceInfo[], void>({
+      query: () => '/sources',
+      transformResponse: (raw: RawSourceInfo[]) => raw.map(toSourceInfo),
+    }),
+    /** Search across every available fetch source (no `source` → aggregate). */
+    searchExternal: build.query<
+      SearchResponse,
+      { q: string; source?: string; limit?: number }
+    >({
+      query: ({ q, source, limit }) =>
+        source
+          ? { url: `/sources/${source}/search`, params: { q, limit } }
+          : { url: '/search', params: { q, limit } },
+      transformResponse: mapSearch,
+    }),
+  }),
+  overrideExisting: false,
+});
+
+export const { useGetSourcesQuery, useLazySearchExternalQuery } = searchApi;

src/api/endpoints/storage.ts

@@ -1,10 +1,16 @@
 import { api } from '../index';
+import { toStorageStats, type RawStorageStats } from '../mappers';
 import type { StorageStats } from '../types';
 
+// `GET /storage` returns library + disk statistics (§A6). The maintenance
+// routes (`/storage/duplicates`, `/storage/broken`, `/storage/missing-metadata`,
+// `POST /storage/cleanup`) are still backend stubs and unused by the UI.
+
 export const storageApi = api.injectEndpoints({
   endpoints: (build) => ({
     getStorageStats: build.query<StorageStats, void>({
-      query: () => '/storage/stats',
+      query: () => '/storage',
+      transformResponse: (raw: RawStorageStats) => toStorageStats(raw),
       providesTags: ['Storage'],
     }),
     scanStorage: build.mutation<{ jobId: string }, void>({

src/api/endpoints/streaming.ts

@@ -1,8 +1,13 @@
 import { getApiBaseUrl } from '../../config/runtime-config';
 
+/**
+ * Audio stream URL for the `<audio>` element. The access token rides as a query
+ * param because `<audio>` can't send an `Authorization` header; the backend
+ * accepts `?token=` on `GET /stream/{id}` for exactly this reason.
+ */
 export function getStreamUrl(trackId: string, token: string): string {
   const base = getApiBaseUrl();
-  return `${base}/streaming/tracks/${trackId}?token=${encodeURIComponent(token)}`;
+  return `${base}/stream/${trackId}?token=${encodeURIComponent(token)}`;
 }
 
 export function getCoverUrl(artUrl: string | undefined): string | undefined {
@@ -12,3 +17,33 @@ export function getCoverUrl(artUrl: string | undefined): string | undefined {
   const base = getApiBaseUrl();
   return `${base}${artUrl}`;
 }
+
+/**
+ * Cover image URL for a track, served by `GET /tracks/{id}/cover`. Like the
+ * audio stream, an `<img>` can't send an `Authorization` header, so the access
+ * token rides as `?token=`. Returns undefined when the track has no cover.
+ */
+export function getTrackCoverUrl(
+  trackId: string,
+  token: string,
+  hasCover: boolean,
+): string | undefined {
+  if (!hasCover) return undefined;
+  const base = getApiBaseUrl();
+  return `${base}/tracks/${trackId}/cover?token=${encodeURIComponent(token)}`;
+}
+
+/**
+ * Cover image URL for an album, served by `GET /albums/{id}/cover`. Same
+ * `?token=` rationale as the track cover. Returns undefined when the album has
+ * no cover (so callers fall back to generated tile art).
+ */
+export function getAlbumCoverUrl(
+  albumId: string,
+  token: string,
+  hasCover: boolean,
+): string | undefined {
+  if (!hasCover) return undefined;
+  const base = getApiBaseUrl();
+  return `${base}/albums/${albumId}/cover?token=${encodeURIComponent(token)}`;
+}

src/api/index.ts

@@ -1,9 +1,19 @@
 import { createApi } from '@reduxjs/toolkit/query/react';
 import { baseQueryWithReauth } from './baseQuery';
+import { REHYDRATE_API, type RehydrateApiPayload } from './rehydrate';
 
 export const api = createApi({
   reducerPath: 'api',
   baseQuery: baseQueryWithReauth,
+  // Stale-while-revalidate. The Tier-2 rehydrated cache (below) seeds fulfilled
+  // entries at startup, which would otherwise make RTKQ serve stale data and
+  // never hit the network. These flags keep showing the cached snapshot
+  // instantly but silently refetch from the server whenever it's reachable —
+  // on mount/arg change, on reconnect, and on window refocus. The result: the
+  // server is the source of truth when online; the cache is only a fallback.
+  refetchOnMountOrArgChange: true,
+  refetchOnReconnect: true,
+  refetchOnFocus: true,
   tagTypes: [
     'Track',
     'Album',
@@ -14,5 +24,16 @@ export const api = createApi({
     'User',
     'Storage',
   ],
+  // Tier 2 offline: seed the cache from the persisted snapshot dispatched at
+  // startup (see `store/rtkqPersist.ts`). Returning the saved queries/mutations
+  // lets the last-seen library render before — or instead of — any network call.
+  extractRehydrationInfo(action) {
+    if (action.type === REHYDRATE_API) {
+      // The api reducer reads `queries`/`mutations` off this and restores any
+      // fulfilled entries; pending/rejected ones are ignored automatically.
+      return action.payload as RehydrateApiPayload as never;
+    }
+    return undefined;
+  },
   endpoints: () => ({}),
 });

src/api/mappers.ts

@@ -0,0 +1,349 @@
+/**
+ * Backend-contract adapters: the single place where the backend's wire format
+ * (snake_case, lean `*Out` schemas, `{items,total,limit,offset}` paging) is
+ * translated into the UI's internal camelCase domain types from `types.ts`.
+ *
+ * The endpoint files (`endpoints/*.ts`) own *paths and params*; this module owns
+ * *shape*. Swapping or mocking a backend means rewriting the mappers here —
+ * nothing in components, slices, or `types.ts` changes.
+ *
+ * Where the backend's lean schema omits a field the UI type carries (cover art,
+ * liked state, durations on albums…), the mapper fills a safe client default and
+ * says why inline. Those defaults are the contract's current edges, not bugs.
+ */
+import type {
+  Album,
+  Artist,
+  DownloadJob,
+  DownloadStatus,
+  ExternalSearchResult,
+  MetadataMatch,
+  MetadataStatus,
+  PaginatedResponse,
+  Playlist,
+  SourceInfo,
+  StorageStats,
+  Track,
+  User,
+} from './types';
+
+const METADATA_STATUSES: readonly MetadataStatus[] = [
+  'pending',
+  'enriched',
+  'failed',
+  'manual',
+];
+
+/** Map the backend's free-form status string onto the UI union, defaulting any
+ * unknown value to `pending` (a safe "not yet identified" state). */
+const toMetadataStatus = (raw: string): MetadataStatus =>
+  (METADATA_STATUSES as readonly string[]).includes(raw)
+    ? (raw as MetadataStatus)
+    : 'pending';
+
+// ---- raw wire shapes (snake_case, exactly as the backend emits) ----
+
+export interface RawPaged<T> {
+  items: T[];
+  total: number;
+  limit: number;
+  offset: number;
+}
+
+export interface RawUser {
+  id: string;
+  username: string;
+  is_superuser: boolean;
+  is_active: boolean;
+  created_at: string;
+  updated_at: string;
+}
+
+export interface RawTrack {
+  id: string;
+  title: string;
+  artist_id: string;
+  artist_name: string;
+  album_id: string | null;
+  album_title: string | null;
+  duration_seconds: number | null;
+  file_format: string;
+  file_size: number;
+  genre: string | null;
+  year: number | null;
+  track_number: number | null;
+  metadata_status: string;
+  metadata_error: string | null;
+  enriched_at: string | null;
+  has_cover: boolean;
+  source: string;
+  created_at: string;
+}
+
+/** One AcoustID candidate, as returned by `GET /tracks/{id}/metadata/matches`. */
+export interface RawMetadataMatch {
+  acoustid: string;
+  score: number;
+  recording_mbid: string | null;
+  release_group_mbid: string | null;
+  title: string | null;
+  artist: string | null;
+  album: string | null;
+  year: number | null;
+}
+
+export interface RawAlbum {
+  id: string;
+  title: string;
+  artist_id: string;
+  artist_name: string;
+  year: number | null;
+  track_count: number;
+  has_cover: boolean;
+  created_at: string;
+}
+
+export interface RawArtist {
+  id: string;
+  name: string;
+  album_count: number;
+  track_count: number;
+  created_at: string;
+}
+
+export interface RawPlaylist {
+  id: string;
+  name: string;
+  description: string | null;
+  owner_id: string;
+  version: number;
+  track_count: number;
+  created_at: string;
+}
+
+// ---- mappers ----
+
+export const toUser = (r: RawUser): User => ({
+  id: r.id,
+  username: r.username,
+  // MVP role model: superuser → admin, everyone else → user.
+  role: r.is_superuser ? 'admin' : 'user',
+  createdAt: r.created_at,
+});
+
+export const toTrack = (r: RawTrack): Track => ({
+  id: r.id,
+  title: r.title,
+  artistId: r.artist_id,
+  artistName: r.artist_name,
+  albumId: r.album_id ?? '',
+  albumTitle: r.album_title ?? '',
+  // `has_cover` says a cover exists; the actual URL (which needs a `?token=`) is
+  // built in the component from the track id — see `getTrackCoverUrl`. Keep
+  // `albumArtUrl` undefined so callers fall back to generated tile art.
+  albumArtUrl: undefined,
+  hasCover: r.has_cover,
+  durationMs: (r.duration_seconds ?? 0) * 1000,
+  // The lean TrackOut carries no availability/like state: a track returned by
+  // the library is on the server, and per-track like state comes from /likes.
+  availability: 'server',
+  metadataStatus: toMetadataStatus(r.metadata_status),
+  metadataError: r.metadata_error ?? undefined,
+  genre: r.genre ?? undefined,
+  year: r.year ?? undefined,
+  trackNumber: r.track_number ?? undefined,
+  liked: false,
+  format: r.file_format,
+  fileSize: r.file_size,
+  source: r.source,
+  createdAt: r.created_at,
+  enrichedAt: r.enriched_at ?? undefined,
+});
+
+export const toMetadataMatch = (r: RawMetadataMatch): MetadataMatch => ({
+  acoustid: r.acoustid,
+  score: r.score,
+  recordingMbid: r.recording_mbid ?? undefined,
+  releaseGroupMbid: r.release_group_mbid ?? undefined,
+  title: r.title ?? undefined,
+  artist: r.artist ?? undefined,
+  album: r.album ?? undefined,
+  year: r.year ?? undefined,
+});
+
+export const toAlbum = (r: RawAlbum): Album => ({
+  id: r.id,
+  title: r.title,
+  artistId: r.artist_id,
+  artistName: r.artist_name,
+  // The album record carries no cover *URL*; `hasCover` says one exists, and the
+  // URL (which needs `?token=`) is built in components via `getAlbumCoverUrl`.
+  artUrl: undefined,
+  hasCover: r.has_cover,
+  year: r.year ?? undefined,
+  trackCount: r.track_count,
+  // AlbumOut has no aggregate duration; computed client-side from tracks when
+  // an album is opened.
+  totalDurationMs: 0,
+});
+
+export const toArtist = (r: RawArtist): Artist => ({
+  id: r.id,
+  name: r.name,
+  artUrl: undefined,
+  albumCount: r.album_count,
+  trackCount: r.track_count,
+});
+
+export const toPlaylist = (r: RawPlaylist): Playlist => ({
+  id: r.id,
+  name: r.name,
+  description: r.description ?? undefined,
+  ownerId: r.owner_id,
+  trackCount: r.track_count,
+  totalDurationMs: 0,
+  // No visibility concept on the backend yet — default private.
+  isPublic: false,
+  createdAt: r.created_at,
+  // PlaylistOut omits updated_at; mirror created_at until it's added.
+  updatedAt: r.created_at,
+});
+
+interface RawStorageStats {
+  total_tracks: number;
+  total_artists: number;
+  total_albums: number;
+  total_size: number;
+  total_duration_seconds: number;
+  largest_track_size: number;
+  earliest_added: string | null;
+  latest_added: string | null;
+  by_format: { file_format: string; track_count: number; total_size: number }[];
+  by_metadata_status: Record<string, number>;
+  by_source: Record<string, number>;
+  top_genres: { genre: string; track_count: number }[];
+  disk: { total: number; used: number; free: number } | null;
+}
+
+export type { RawStorageStats };
+
+export const toStorageStats = (r: RawStorageStats): StorageStats => ({
+  totalTracks: r.total_tracks,
+  totalArtists: r.total_artists,
+  totalAlbums: r.total_albums,
+  totalSize: r.total_size,
+  totalDurationSeconds: r.total_duration_seconds,
+  largestTrackSize: r.largest_track_size,
+  earliestAdded: r.earliest_added ?? undefined,
+  latestAdded: r.latest_added ?? undefined,
+  byFormat: r.by_format.map((f) => ({
+    fileFormat: f.file_format,
+    trackCount: f.track_count,
+    totalSize: f.total_size,
+  })),
+  byMetadataStatus: r.by_metadata_status,
+  bySource: r.by_source,
+  topGenres: r.top_genres.map((g) => ({
+    genre: g.genre,
+    trackCount: g.track_count,
+  })),
+  disk: r.disk ?? undefined,
+});
+
+// ---- downloads + external search ----
+
+const DOWNLOAD_STATUSES: readonly DownloadStatus[] = [
+  'queued',
+  'downloading',
+  'enriching',
+  'done',
+  'failed',
+];
+
+const toDownloadStatus = (raw: string): DownloadStatus =>
+  (DOWNLOAD_STATUSES as readonly string[]).includes(raw)
+    ? (raw as DownloadStatus)
+    : 'queued';
+
+export interface RawDownloadJob {
+  id: string;
+  source: string;
+  source_id: string | null;
+  query: string | null;
+  status: string;
+  progress: number;
+  error_message: string | null;
+  retry_count: number;
+  track_id: string | null;
+  created_at: string;
+  updated_at: string;
+}
+
+export const toDownloadJob = (r: RawDownloadJob): DownloadJob => ({
+  id: r.id,
+  source: r.source,
+  sourceId: r.source_id ?? undefined,
+  query: r.query ?? undefined,
+  status: toDownloadStatus(r.status),
+  progress: r.progress,
+  errorMessage: r.error_message ?? undefined,
+  trackId: r.track_id ?? undefined,
+  retryCount: r.retry_count,
+  createdAt: r.created_at,
+  updatedAt: r.updated_at,
+});
+
+export interface RawSearchResult {
+  source: string;
+  source_id: string;
+  title: string;
+  artist: string | null;
+  album: string | null;
+  duration_seconds: number | null;
+  thumbnail_url: string | null;
+}
+
+export const toSearchResult = (r: RawSearchResult): ExternalSearchResult => ({
+  source: r.source,
+  sourceId: r.source_id,
+  title: r.title,
+  artist: r.artist ?? undefined,
+  album: r.album ?? undefined,
+  durationMs:
+    r.duration_seconds != null ? r.duration_seconds * 1000 : undefined,
+  thumbnailUrl: r.thumbnail_url ?? undefined,
+});
+
+export interface RawSourceInfo {
+  name: string;
+  label: string;
+  kind: string;
+  available: boolean;
+}
+
+export const toSourceInfo = (r: RawSourceInfo): SourceInfo => ({
+  name: r.name,
+  label: r.label,
+  // Backend kinds are `indexable` | `fetch`; default unknowns to indexable
+  // (the conservative, non-searchable bucket).
+  kind: r.kind === 'fetch' ? 'fetch' : 'indexable',
+  available: r.available,
+});
+
+/**
+ * Translate the backend's `{items,total,limit,offset}` envelope into the UI's
+ * `{items,total,page,pageSize,hasMore}`, mapping each element.
+ */
+export const toPage = <R, T>(
+  raw: RawPaged<R>,
+  map: (r: R) => T,
+): PaginatedResponse<T> => {
+  const pageSize = raw.limit || raw.items.length || 1;
+  return {
+    items: raw.items.map(map),
+    total: raw.total,
+    page: Math.floor(raw.offset / pageSize) + 1,
+    pageSize,
+    hasMore: raw.offset + raw.items.length < raw.total,
+  };
+};

src/api/rehydrate.ts

@@ -0,0 +1,25 @@
+import { createAction } from '@reduxjs/toolkit';
+
+/*
+ * Tier 2 offline support contract. RTK Query can seed its cache from a
+ * persisted snapshot via `extractRehydrationInfo` (see `api/index.ts`). We use
+ * a single action whose payload is the previously-saved api slice state; the
+ * api reducer pulls `queries`/`mutations` out of it on startup so last-seen
+ * library data renders read-only while the backend is unreachable.
+ *
+ * The type string lives here (not in the store) so `api/index.ts` can match it
+ * without importing from the store layer (which would create a cycle).
+ */
+export const REHYDRATE_API = 'api/rehydrate';
+
+export interface RehydrateApiPayload {
+  queries: Record<string, unknown>;
+  mutations: Record<string, unknown>;
+  // RTKQ's invalidation slice reads `provided.tags`/`provided.keys` during
+  // rehydration (it does `Object.entries(provided.tags ?? {})`), so `provided`
+  // must be an object — a bare `{ queries, mutations }` makes it crash on
+  // `provided.tags` of undefined. Always present; empty objects are valid.
+  provided: { tags: Record<string, unknown>; keys: Record<string, unknown> };
+}
+
+export const rehydrateApi = createAction<RehydrateApiPayload>(REHYDRATE_API);

src/api/types.ts

@@ -1,5 +1,13 @@
 export type TrackAvailability = 'server' | 'downloading' | 'error' | 'missing';
 
+/**
+ * Metadata-enrichment state, distinct from file `availability`. `pending` = the
+ * worker hasn't finished (or hasn't started); `enriched` = identity found;
+ * `failed` = no match / a worker error (see `metadataError`); `manual` = user-
+ * edited and never auto-overwritten.
+ */
+export type MetadataStatus = 'pending' | 'enriched' | 'failed' | 'manual';
+
 export interface Track {
   id: string;
   title: string;
@@ -8,16 +16,26 @@ export interface Track {
   albumId: string;
   albumTitle: string;
   albumArtUrl?: string;
+  hasCover: boolean;
   durationMs: number;
   trackNumber?: number;
   discNumber?: number;
   year?: number;
   genre?: string;
   availability: TrackAvailability;
+  metadataStatus: MetadataStatus;
+  /** Human-readable reason the last enrichment run set `failed`; else undefined. */
+  metadataError?: string;
   fileSize?: number;
   format?: string;
   bitrate?: number;
   liked: boolean;
+  /** Where the track entered the library (e.g. `upload`, `local_folder`). */
+  source?: string;
+  /** ISO timestamp the track was added to the library. */
+  createdAt?: string;
+  /** ISO timestamp the last successful enrichment ran; undefined if never. */
+  enrichedAt?: string;
 }
 
 export interface Album {
@@ -26,6 +44,8 @@ export interface Album {
   artistId: string;
   artistName: string;
   artUrl?: string;
+  /** Whether the album has cover art served by `GET /albums/{id}/cover`. */
+  hasCover: boolean;
   year?: number;
   trackCount: number;
   totalDurationMs: number;
@@ -58,32 +78,102 @@ export interface PlaylistTrack extends Track {
   addedAt: string;
 }
 
+/** Lifecycle of a download job, mirroring the backend's `DownloadStatus`.
+ * `enriching` = file fetched, metadata pipeline running; `done` = imported. */
+export type DownloadStatus =
+  | 'queued'
+  | 'downloading'
+  | 'enriching'
+  | 'done'
+  | 'failed';
+
 export interface DownloadJob {
   id: string;
-  url: string;
-  title?: string;
-  artist?: string;
-  album?: string;
-  status: 'queued' | 'downloading' | 'processing' | 'done' | 'error';
+  /** Source backend the job pulls from (e.g. `youtube`). */
+  source: string;
+  /** Stable per-source id of the item (e.g. a YouTube videoId). */
+  sourceId?: string;
+  /** The free-text query the job was created from, for display. */
+  query?: string;
+  status: DownloadStatus;
+  /** Fraction complete, 0..1. */
   progress: number;
   errorMessage?: string;
+  /** Set once the download finishes and the library track exists. */
   trackId?: string;
+  retryCount: number;
   createdAt: string;
   updatedAt: string;
 }
 
+/** Result of POST /downloads. Either the item is already in the library
+ * (`alreadyInLibrary`, `trackId` set), or a job covers it (`job`). */
+export interface DownloadRequestResult {
+  alreadyInLibrary: boolean;
+  trackId?: string;
+  job?: DownloadJob;
+}
+
+/** One hit from an external (fetch) source — the §A4 discover screen. */
+export interface ExternalSearchResult {
+  source: string;
+  sourceId: string;
+  title: string;
+  artist?: string;
+  album?: string;
+  durationMs?: number;
+  thumbnailUrl?: string;
+}
+
+/** A registered source backend, from GET /sources. `kind`: `indexable` (a
+ * mounted folder) or `fetch` (searchable + downloadable, e.g. YouTube). */
+export interface SourceInfo {
+  name: string;
+  label: string;
+  kind: 'indexable' | 'fetch';
+  available: boolean;
+}
+
 export interface UploadResponse {
   track_id: string;
   title: string;
   already_exists: boolean;
 }
 
-export interface StorageStats {
-  totalBytes: number;
-  usedBytes: number;
+export interface StorageFormatBreakdown {
+  fileFormat: string;
   trackCount: number;
-  albumCount: number;
-  artistCount: number;
+  totalSize: number;
+}
+
+export interface StorageGenreCount {
+  genre: string;
+  trackCount: number;
+}
+
+/** Capacity of the volume backing the media store. Absent for object-store
+ * backends (S3), which have no fixed disk to report. */
+export interface StorageDiskUsage {
+  total: number;
+  used: number;
+  free: number;
+}
+
+export interface StorageStats {
+  totalTracks: number;
+  totalArtists: number;
+  totalAlbums: number;
+  /** Sum of every track's recorded file size (the library's footprint). */
+  totalSize: number;
+  totalDurationSeconds: number;
+  largestTrackSize: number;
+  earliestAdded?: string;
+  latestAdded?: string;
+  byFormat: StorageFormatBreakdown[];
+  byMetadataStatus: Record<string, number>;
+  bySource: Record<string, number>;
+  topGenres: StorageGenreCount[];
+  disk?: StorageDiskUsage;
 }
 
 export interface User {
@@ -98,7 +188,9 @@ export interface User {
 export interface AuthTokens {
   accessToken: string;
   refreshToken: string;
-  expiresIn: number;
+  // Optional: the backend's TokenResponse carries no TTL — expiry is driven by
+  // 401→refresh, not a client-side clock. Present only if a backend supplies it.
+  expiresIn?: number;
 }
 
 export interface LoginRequest {
@@ -111,6 +203,11 @@ export interface LoginResponse {
   tokens: AuthTokens;
 }
 
+export interface RegisterRequest {
+  username: string;
+  password: string;
+}
+
 export interface PaginatedResponse<T> {
   items: T[];
   total: number;
@@ -124,6 +221,8 @@ export interface LibraryFilters {
   genre?: string;
   artistId?: string;
   albumId?: string;
+  /** Filter by ingest origin, e.g. `upload`, `youtube`, `local`. */
+  source?: string;
   liked?: boolean;
   page?: number;
   pageSize?: number;
@@ -136,3 +235,26 @@ export interface ApiError {
   message: string;
   code?: string;
 }
+
+/** One AcoustID candidate from `GET /tracks/{id}/metadata/matches` (§A7). */
+export interface MetadataMatch {
+  acoustid: string;
+  /** Confidence 0..1. */
+  score: number;
+  recordingMbid?: string;
+  releaseGroupMbid?: string;
+  title?: string;
+  artist?: string;
+  album?: string;
+  year?: number;
+}
+
+/** Manual edits / an accepted match, sent to `PUT /tracks/{id}/metadata`. */
+export interface MetadataEdit {
+  title?: string;
+  artistName?: string;
+  albumTitle?: string;
+  year?: number;
+  genre?: string;
+  trackNumber?: number;
+}

src/components/common/ConnectionStatus.tsx

@@ -22,9 +22,15 @@ export function ConnectionStatus() {
   const status = useConnectionStatus();
   const baseUrl = getApiBaseUrl();
   const label = t(STATUS_KEY[status]);
+  // When the backend is unreachable the UI falls back to the persisted RTKQ
+  // cache (Tier 2), so flag that the data on screen is last-seen, not live.
+  const offline = status === 'disconnected' || status === 'error';
+  const tip = offline
+    ? `${label} · ${baseUrl} · ${t('conn.cached')}`
+    : `${label} · ${baseUrl}`;
 
   return (
-    <Tooltip content={`${label} · ${baseUrl}`}>
+    <Tooltip content={tip}>
       <Badge variant={STATUS_VARIANTS[status]} dot>
         {label}
       </Badge>

src/components/common/Icon.tsx

@@ -15,10 +15,12 @@ import {
   ArrowsClockwise,
   CheckCircle,
   Cloud,
+  CloudSlash,
   DotsSixVertical,
   GearSix,
   HardDrives,
   Heart,
+  Info,
   MagnifyingGlass,
   Pause,
   Play,
@@ -69,10 +71,12 @@ const ICONS = {
   'skip-forward': SkipForward,
   repeat: Repeat,
   heart: Heart,
+  info: Info,
   'thumbs-down': ThumbsDown,
   'speaker-high': SpeakerHigh,
   'speaker-x': SpeakerSimpleX,
   cloud: Cloud,
+  'cloud-slash': CloudSlash,
   'check-circle': CheckCircle,
   'warning-circle': WarningCircle,
   'sign-out': SignOut,

src/components/common/Marquee.tsx

@@ -0,0 +1,41 @@
+import { useLayoutEffect, useRef, useState, type CSSProperties } from 'react';
+
+/** Single-line text that ping-pong scrolls (like a news ticker) only when it
+ * overflows its container, otherwise renders as static clipped text. Keeps the
+ * queue panel from ever growing a horizontal scrollbar on long titles. */
+export function Marquee({
+  text,
+  className,
+}: {
+  text: string;
+  className?: string;
+}) {
+  const ref = useRef<HTMLSpanElement>(null);
+  const [shift, setShift] = useState(0);
+
+  useLayoutEffect(() => {
+    const el = ref.current;
+    if (!el) return;
+    const measure = () => {
+      const inner = el.firstElementChild as HTMLElement | null;
+      const overflow = (inner?.scrollWidth ?? 0) - el.clientWidth;
+      setShift(overflow > 1 ? overflow : 0);
+    };
+    measure();
+    const ro = new ResizeObserver(measure);
+    ro.observe(el);
+    return () => ro.disconnect();
+  }, [text]);
+
+  return (
+    <span
+      ref={ref}
+      className={`marquee${shift ? ' on' : ''}${className ? ` ${className}` : ''}`}
+      style={
+        shift ? ({ '--mq-shift': `-${shift}px` } as CSSProperties) : undefined
+      }
+    >
+      <span className="marquee-inner">{text}</span>
+    </span>
+  );
+}

src/components/common/PlayingIndicator.tsx

@@ -0,0 +1,22 @@
+/*
+ * "Hopping bars" equalizer indicator (YTM-style) shown next to the currently
+ * playing track. `animate` controls whether the bars bounce (playback active)
+ * or sit frozen at full height (paused). Reusable across track lists.
+ */
+interface Props {
+  animate?: boolean;
+  className?: string;
+}
+
+export function PlayingIndicator({ animate = true, className }: Props) {
+  return (
+    <span
+      className={`playing-bars${animate ? '' : ' paused'}${className ? ` ${className}` : ''}`}
+      aria-hidden="true"
+    >
+      <span />
+      <span />
+      <span />
+    </span>
+  );
+}

src/components/layout/AppShell.tsx

@@ -3,6 +3,7 @@ import { Suspense } from 'react';
 import { Sidebar } from './Sidebar';
 import { PersistentPlayer } from '../player/PersistentPlayer';
 import { QueuePanel } from '../player/QueuePanel';
+import { TrackInfoDrawer } from '../track/TrackInfoDrawer';
 import { LoadingSkeleton } from '../common/LoadingSkeleton';
 
 export function AppShell() {
@@ -31,6 +32,7 @@ export function AppShell() {
           </div>
         </main>
         <QueuePanel />
+        <TrackInfoDrawer />
       </div>
       <PersistentPlayer />
     </div>

src/components/layout/Sidebar.tsx

@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next';
 import { Icon, type IconName } from '../common/Icon';
 import { useAppDispatch } from '../../hooks/useAppDispatch';
 import { usePermissions, type Permission } from '../../hooks/usePermissions';
-import { useConnectionStatus } from '../../hooks/useConnectionStatus';
+import { useConnectionStatusSync } from '../../hooks/useConnectionStatus';
 import { logout } from '../../store/slices/auth';
 import { useGetPlaylistsQuery } from '../../api/endpoints/playlists';
 import { getActiveInstance } from '../../config/instances';
@@ -19,9 +19,24 @@ interface NavDef {
 
 const MAIN_NAV: NavDef[] = [
   { to: '/library', labelKey: 'nav.library', icon: 'vinyl-record' },
-  { to: '/discover', labelKey: 'nav.search', icon: 'magnifying-glass', perm: 'download' },
-  { to: '/downloads', labelKey: 'nav.downloads', icon: 'arrow-circle-down', perm: 'download' },
-  { to: '/upload', labelKey: 'nav.upload', icon: 'upload-simple', perm: 'upload' },
+  {
+    to: '/discover',
+    labelKey: 'nav.search',
+    icon: 'magnifying-glass',
+    perm: 'download',
+  },
+  {
+    to: '/downloads',
+    labelKey: 'nav.downloads',
+    icon: 'arrow-circle-down',
+    perm: 'download',
+  },
+  {
+    to: '/upload',
+    labelKey: 'nav.upload',
+    icon: 'upload-simple',
+    perm: 'upload',
+  },
   { to: '/storage', labelKey: 'nav.storage', icon: 'hard-drives' },
 ];
 
@@ -41,7 +56,7 @@ export function Sidebar() {
   const dispatch = useAppDispatch();
   const navigate = useNavigate();
   const { user, isAdmin, hasPermission } = usePermissions();
-  const status = useConnectionStatus();
+  const status = useConnectionStatusSync();
   const { data: playlists } = useGetPlaylistsQuery();
   const instance = getActiveInstance();
 

src/components/player/PersistentPlayer.tsx

@@ -8,14 +8,14 @@ import {
   resume,
   toggleMute,
   setVolume,
-  toggleShuffle,
-  setRepeat,
-  toggleNowPlaying,
   toggleQueue,
 } from '../../store/slices/player';
+import { openTrackInfo } from '../../store/slices/ui';
 import { useAudioPlayer } from '../../hooks/useAudioPlayer';
+import { useStreamCached } from '../../hooks/useStreamCached';
+import { useResolvedQueueEntry } from '../../hooks/useResolvedQueueEntry';
 import { formatDuration } from '../../lib/format';
-import { getCoverUrl } from '../../api/endpoints/streaming';
+import { getCoverUrl, getTrackCoverUrl } from '../../api/endpoints/streaming';
 
 export function PersistentPlayer() {
   const { t } = useTranslation();
@@ -23,47 +23,54 @@ export function PersistentPlayer() {
   const { seek, playNext, playPrev } = useAudioPlayer();
   const player = useAppSelector((s) => s.player);
   const queue = useAppSelector((s) => s.queue);
+  const token = useAppSelector((s) => s.auth.accessToken);
   const currentEntry = queue.entries[queue.currentIndex];
+  // Read through to the live Track cache so enrichment updates reach the player,
+  // not just the play-time snapshot frozen in the queue slice.
+  const current = useResolvedQueueEntry(currentEntry);
+  // Source indicator: cached → playing locally, otherwise streaming.
+  const cached = useStreamCached(currentEntry?.trackId);
 
   if (!currentEntry && !player.currentTrackId) {
     return <div className="player empty">{t('player.nothingPlaying')}</div>;
   }
 
-  const artUrl = getCoverUrl(currentEntry?.albumArtUrl);
-  const seedLabel = currentEntry?.albumTitle ?? currentEntry?.title ?? '';
-  const onStream = true;
+  const artUrl =
+    getCoverUrl(currentEntry?.albumArtUrl) ??
+    (token && current?.hasCover
+      ? getTrackCoverUrl(current.trackId, token, true)
+      : undefined);
+  const seedLabel = current?.albumTitle ?? current?.title ?? '';
+  const onStream = !cached;
+  const formatLabel = current?.format?.toUpperCase();
 
   return (
     <div className="player">
       <div
         className="pl-now"
-        onClick={() => dispatch(toggleNowPlaying())}
-        style={{ cursor: 'pointer' }}
+        onClick={() =>
+          currentEntry && dispatch(openTrackInfo(currentEntry.trackId))
+        }
+        style={{ cursor: currentEntry ? 'pointer' : 'default' }}
+        title={currentEntry ? t('trackInfo.open') : undefined}
       >
         <ArtTile seed={seedLabel} size={54} label={seedLabel} src={artUrl} />
         <div className="pl-now-tt">
-          <div className="t">{currentEntry?.title ?? '—'}</div>
-          <div className="a">{currentEntry?.artistName ?? ''}</div>
+          <div className="t">{current?.title ?? '—'}</div>
+          <div className="a">{current?.artistName ?? ''}</div>
           <div
             className="pl-srcbadge"
             style={{ color: onStream ? 'var(--fg-3)' : 'var(--lime)' }}
           >
             <Icon name={onStream ? 'cloud' : 'check-circle'} fill={!onStream} />
             {onStream ? t('player.streaming') : t('player.local')}
+            {formatLabel && ` · ${formatLabel}`}
           </div>
         </div>
       </div>
 
       <div className="pl-center">
         <div className="pl-transport">
-          <button
-            type="button"
-            className={`pl-tbtn${player.shuffle ? ' on' : ''}`}
-            onClick={() => dispatch(toggleShuffle())}
-            title={t('player.shuffle')}
-          >
-            <Icon name="shuffle" />
-          </button>
           <button
             type="button"
             className="pl-tbtn"
@@ -90,24 +97,6 @@ export function PersistentPlayer() {
           >
             <Icon name="skip-forward" fill />
           </button>
-          <button
-            type="button"
-            className={`pl-tbtn${player.repeat !== 'none' ? ' on' : ''}`}
-            onClick={() =>
-              dispatch(
-                setRepeat(
-                  player.repeat === 'none'
-                    ? 'all'
-                    : player.repeat === 'all'
-                      ? 'one'
-                      : 'none',
-                ),
-              )
-            }
-            title={t('player.repeat', { mode: player.repeat })}
-          >
-            <Icon name="repeat" />
-          </button>
         </div>
         <div className="pl-seek">
           <span className="pl-time">

src/components/player/QueuePanel.tsx

@@ -1,29 +1,72 @@
-import { Slider, Badge } from '@olly/modern-sk';
+import {
+  Slider,
+  Badge,
+  Menu,
+  MenuTrigger,
+  MenuContent,
+  MenuItem,
+  IconButton,
+} from '@olly/modern-sk';
 import { useTranslation } from 'react-i18next';
+import {
+  DndContext,
+  closestCenter,
+  PointerSensor,
+  KeyboardSensor,
+  useSensor,
+  useSensors,
+  type DragEndEvent,
+} from '@dnd-kit/core';
+import {
+  SortableContext,
+  useSortable,
+  verticalListSortingStrategy,
+  sortableKeyboardCoordinates,
+} from '@dnd-kit/sortable';
+import { CSS } from '@dnd-kit/utilities';
 import { Icon } from '../common/Icon';
 import { ArtTile } from '../common/ArtTile';
+import { Marquee } from '../common/Marquee';
+import { PlayingIndicator } from '../common/PlayingIndicator';
 import { useAppDispatch, useAppSelector } from '../../hooks/useAppDispatch';
 import {
   goToIndex,
   removeFromQueue,
+  moveInQueue,
   clearQueue,
+  toggleShuffle,
+  toggleLoop,
+  type QueueEntry,
 } from '../../store/slices/queue';
 import { toggleQueue } from '../../store/slices/player';
+import { openTrackInfo } from '../../store/slices/ui';
+import { useResolvedQueueEntry } from '../../hooks/useResolvedQueueEntry';
+import { getCoverUrl, getTrackCoverUrl } from '../../api/endpoints/streaming';
 
 export function QueuePanel() {
   const { t } = useTranslation();
   const dispatch = useAppDispatch();
   const queue = useAppSelector((s) => s.queue);
+  const isPlaying = useAppSelector((s) => s.player.isPlaying);
   const isOpen = useAppSelector((s) => s.player.isQueueOpen);
 
-  const now =
-    queue.currentIndex >= 0 ? queue.entries[queue.currentIndex] : undefined;
-  const upNext = queue.entries
-    .map((entry, index) => ({ entry, index }))
-    .filter(({ index }) => index > queue.currentIndex);
+  const hasEntries = queue.entries.length > 0;
   const isRadio = queue.source === 'radio';
   const sourceLabel = queue.sourceName ?? queue.source;
 
+  const sensors = useSensors(
+    useSensor(PointerSensor, { activationConstraint: { distance: 4 } }),
+    useSensor(KeyboardSensor, {
+      coordinateGetter: sortableKeyboardCoordinates,
+    }),
+  );
+
+  const handleDragEnd = (event: DragEndEvent) => {
+    const { active, over } = event;
+    if (!over || active.id === over.id) return;
+    dispatch(moveInQueue({ from: Number(active.id), to: Number(over.id) }));
+  };
+
   return (
     <aside className={`qd${isOpen ? '' : ' closed'}`} aria-hidden={!isOpen}>
       <div className="qd-inner">
@@ -31,6 +74,22 @@ export function QueuePanel() {
           <div className="row">
             <h3>{t('queue.title')}</h3>
             <div style={{ flex: 1 }} />
+            <button
+              type="button"
+              className={`iconbtn sm${queue.shuffle ? ' on' : ''}`}
+              onClick={() => dispatch(toggleShuffle())}
+              title={t('queue.shuffle')}
+            >
+              <Icon name="shuffle" />
+            </button>
+            <button
+              type="button"
+              className={`iconbtn sm${queue.loop ? ' on' : ''}`}
+              onClick={() => dispatch(toggleLoop())}
+              title={t('queue.loop')}
+            >
+              <Icon name="repeat" />
+            </button>
             <button
               type="button"
               className="iconbtn sm"
@@ -64,32 +123,19 @@ export function QueuePanel() {
         </div>
 
         <div className="qd-scroll">
-          {now ? (
+          {hasEntries ? (
             <>
-              <span
-                className="msk-label"
-                style={{ display: 'block', marginBottom: 8 }}
-              >
-                {t('queue.nowPlaying')}
-              </span>
-              <div className="qd-now">
-                <ArtTile
-                  seed={now.albumTitle}
-                  size={44}
-                  label={now.albumTitle}
-                />
-                <div className="qt">
-                  <div className="t">{now.title}</div>
-                  <div className="r">{now.artistName}</div>
-                </div>
-                <Icon name="cloud" style={{ color: 'var(--fg-3)' }} />
-              </div>
-
               {isRadio && (
                 <div className="qd-radio">
                   <div className="row">
                     <Icon name="radio" />
-                    <span style={{ fontSize: 13, fontWeight: 600, color: 'var(--fg-1)' }}>
+                    <span
+                      style={{
+                        fontSize: 13,
+                        fontWeight: 600,
+                        color: 'var(--fg-1)',
+                      }}
+                    >
                       {t('queue.radioActive')}
                     </span>
                     <div style={{ flex: 1 }} />
@@ -116,39 +162,36 @@ export function QueuePanel() {
               >
                 {t('queue.nextUp')}
               </span>
-              {upNext.length === 0 ? (
-                <div className="qd-empty">{t('queue.nothingNext')}</div>
-              ) : (
-                upNext.map(({ entry, index }) => (
-                  <div
+              <DndContext
+                sensors={sensors}
+                collisionDetection={closestCenter}
+                onDragEnd={handleDragEnd}
+              >
+                <SortableContext
+                  items={queue.entries.map((_, index) => String(index))}
+                  strategy={verticalListSortingStrategy}
+                >
+                  {queue.entries.map((entry, index) => (
+                    <QueueRow
                       key={`${entry.trackId}-${index}`}
-                    className="qrow"
-                    onDoubleClick={() => dispatch(goToIndex(index))}
-                    title={t('queue.doubleClickPlay')}
-                  >
-                    <span className="grip">
-                      <Icon name="dots-six-vertical" />
-                    </span>
-                    <ArtTile
-                      seed={entry.albumTitle}
-                      size={36}
-                      label={entry.albumTitle}
+                      id={String(index)}
+                      entry={entry}
+                      isCurrent={index === queue.currentIndex}
+                      isPlaying={isPlaying}
+                      onPlay={() => dispatch(goToIndex(index))}
+                      onMoveNext={() =>
+                        dispatch(
+                          moveInQueue({
+                            from: index,
+                            to: queue.currentIndex + 1,
+                          }),
+                        )
+                      }
+                      onRemove={() => dispatch(removeFromQueue(index))}
                     />
-                    <div className="qt">
-                      <div className="t">{entry.title}</div>
-                      <div className="r">{entry.artistName}</div>
-                    </div>
-                    <button
-                      type="button"
-                      className="iconbtn sm"
-                      onClick={() => dispatch(removeFromQueue(index))}
-                      title={t('queue.removeFromQueue')}
-                    >
-                      <Icon name="x" />
-                    </button>
-                  </div>
-                ))
-              )}
+                  ))}
+                </SortableContext>
+              </DndContext>
 
               {isRadio && (
                 <div className="qd-loadmore">{t('queue.loadingMore')}</div>
@@ -162,3 +205,102 @@ export function QueuePanel() {
     </aside>
   );
 }
+
+/** A queue row, resolving its display fields against the live Track cache so
+ * enrichment updates show. The currently-playing entry is outlined and shows
+ * a playing-bars indicator in place of the drag grip. */
+function QueueRow({
+  id,
+  entry,
+  isCurrent,
+  isPlaying,
+  onPlay,
+  onMoveNext,
+  onRemove,
+}: {
+  id: string;
+  entry: QueueEntry;
+  isCurrent: boolean;
+  isPlaying: boolean;
+  onPlay: () => void;
+  onMoveNext: () => void;
+  onRemove: () => void;
+}) {
+  const { t } = useTranslation();
+  const dispatch = useAppDispatch();
+  const token = useAppSelector((s) => s.auth.accessToken);
+  const resolved = useResolvedQueueEntry(entry);
+  const albumTitle = resolved?.albumTitle ?? entry.albumTitle;
+  const artUrl =
+    getCoverUrl(resolved?.albumArtUrl) ??
+    (token && resolved?.hasCover
+      ? getTrackCoverUrl(resolved.trackId, token, true)
+      : undefined);
+
+  const {
+    attributes,
+    listeners,
+    setNodeRef,
+    transform,
+    transition,
+    isDragging,
+  } = useSortable({ id });
+
+  const style = {
+    transform: CSS.Transform.toString(transform),
+    transition,
+    opacity: isDragging ? 0.5 : 1,
+  };
+
+  return (
+    <div
+      ref={setNodeRef}
+      style={style}
+      className={`qrow${isCurrent ? ' current' : ''}${isDragging ? ' dragging' : ''}`}
+      onDoubleClick={onPlay}
+      title={t('queue.doubleClickPlay')}
+    >
+      <span className="grip" {...attributes} {...listeners}>
+        <Icon name="dots-six-vertical" />
+      </span>
+      <div className="qart">
+        <ArtTile seed={albumTitle} size={36} label={albumTitle} src={artUrl} />
+        {isCurrent && (
+          <div className="cover-playing">
+            <PlayingIndicator animate={isPlaying} />
+          </div>
+        )}
+      </div>
+      <div className="qt">
+        <Marquee className="t" text={resolved?.title ?? entry.title} />
+        <Marquee
+          className="r"
+          text={resolved?.artistName ?? entry.artistName}
+        />
+      </div>
+      <Menu>
+        <MenuTrigger asChild>
+          <IconButton
+            variant="ghost"
+            size="sm"
+            aria-label={t('queue.menu.options')}
+          >
+            ⋯
+          </IconButton>
+        </MenuTrigger>
+        <MenuContent>
+          <MenuItem onSelect={onPlay}>{t('queue.menu.playNow')}</MenuItem>
+          {!isCurrent && (
+            <MenuItem onSelect={onMoveNext}>
+              {t('queue.menu.moveNext')}
+            </MenuItem>
+          )}
+          <MenuItem onSelect={() => dispatch(openTrackInfo(entry.trackId))}>
+            {t('queue.menu.info')}
+          </MenuItem>
+          <MenuItem onSelect={onRemove}>{t('queue.menu.remove')}</MenuItem>
+        </MenuContent>
+      </Menu>
+    </div>
+  );
+}

src/components/track/AvailabilityBadge.tsx

@@ -1,38 +1,88 @@
 import { Badge, Tooltip } from '@olly/modern-sk';
+import { Icon, type IconName } from '../common/Icon';
 import type { TrackAvailability } from '../../api/types';
 
+/** `TrackAvailability` plus a client-derived state: the backend reports
+ * `server`, but if it's unreachable and the track's audio is already in the
+ * offline cache, we know better — show `local` instead. */
+export type DisplayAvailability = TrackAvailability | 'local';
+
 interface Props {
-  availability: TrackAvailability;
+  availability: DisplayAvailability;
+  /** Render as a small icon + tooltip instead of a labelled badge — used in
+   * dense track lists (library, album, playlist). */
+  iconOnly?: boolean;
 }
 
+const COLOR_VAR: Record<Variant, string> = {
+  lime: 'var(--lime)',
+  ember: 'var(--ember)',
+  neutral: 'var(--fg-3)',
+  outline: 'var(--fg-3)',
+};
+
+type Variant = 'lime' | 'ember' | 'neutral' | 'outline';
+
 const CONFIG: Record<
-  TrackAvailability,
+  DisplayAvailability,
   {
     label: string;
-    variant: 'lime' | 'ember' | 'neutral' | 'outline';
+    variant: Variant;
+    icon: IconName;
+    spin?: boolean;
     tooltip: string;
   }
 > = {
   server: {
     label: 'On server',
     variant: 'lime',
+    icon: 'cloud',
     tooltip: 'File available on server',
   },
+  local: {
+    label: 'Local',
+    variant: 'lime',
+    icon: 'hard-drives',
+    tooltip: 'Cached on this device — playable offline',
+  },
   downloading: {
     label: 'Downloading',
     variant: 'neutral',
+    icon: 'arrows-clockwise',
+    spin: true,
     tooltip: 'Currently downloading',
   },
-  error: { label: 'Error', variant: 'ember', tooltip: 'Download failed' },
+  error: {
+    label: 'Error',
+    variant: 'ember',
+    icon: 'warning-circle',
+    tooltip: 'Download failed',
+  },
   missing: {
     label: 'Missing',
     variant: 'outline',
+    icon: 'cloud-slash',
     tooltip: 'File not found on server',
   },
 };
 
-export function AvailabilityBadge({ availability }: Props) {
+export function AvailabilityBadge({ availability, iconOnly }: Props) {
   const cfg = CONFIG[availability];
+
+  if (iconOnly) {
+    return (
+      <Tooltip content={cfg.tooltip}>
+        <span style={{ display: 'inline-flex' }}>
+          <Icon
+            name={cfg.icon}
+            className={cfg.spin ? 'spin' : undefined}
+            style={{ color: COLOR_VAR[cfg.variant], fontSize: 15 }}
+          />
+        </span>
+      </Tooltip>
+    );
+  }
+
   return (
     <Tooltip content={cfg.tooltip}>
       <Badge variant={cfg.variant} dot>

src/components/track/MetadataStatusBadge.tsx

@@ -0,0 +1,82 @@
+import { Badge, Spinner, Tooltip } from '@olly/modern-sk';
+import { useTranslation } from 'react-i18next';
+import { Icon, type IconName } from '../common/Icon';
+import type { MetadataStatus } from '../../api/types';
+
+interface Props {
+  status: MetadataStatus;
+  /** Reason shown in the tooltip for a `failed` status. */
+  error?: string;
+  /** When true, render nothing for the normal `enriched` state (keeps dense
+   * track lists quiet; the upload screen sets this false to confirm success). */
+  hideWhenEnriched?: boolean;
+  /** Render as a small icon + tooltip instead of a labelled badge — used in
+   * dense track lists (library, album, playlist). */
+  iconOnly?: boolean;
+}
+
+type Variant = 'lime' | 'ember' | 'neutral' | 'outline';
+
+const VARIANT: Record<MetadataStatus, Variant> = {
+  pending: 'neutral',
+  enriched: 'lime',
+  failed: 'ember',
+  manual: 'outline',
+};
+
+const COLOR_VAR: Record<Variant, string> = {
+  lime: 'var(--lime)',
+  ember: 'var(--ember)',
+  neutral: 'var(--fg-3)',
+  outline: 'var(--fg-3)',
+};
+
+const ICON: Record<Exclude<MetadataStatus, 'pending'>, IconName> = {
+  enriched: 'check-circle',
+  failed: 'warning-circle',
+  manual: 'push-pin',
+};
+
+/**
+ * Shows a track's metadata-enrichment state (distinct from file availability).
+ * `pending` carries a spinner; `failed` exposes the backend reason on hover.
+ */
+export function MetadataStatusBadge({
+  status,
+  error,
+  hideWhenEnriched = true,
+  iconOnly,
+}: Props) {
+  const { t } = useTranslation();
+  if (status === 'enriched' && hideWhenEnriched) return null;
+
+  const label = t(`metadata.status.${status}`);
+  const tooltip =
+    status === 'failed' && error ? error : t(`metadata.statusHint.${status}`);
+
+  if (iconOnly) {
+    return (
+      <Tooltip content={tooltip}>
+        <span style={{ display: 'inline-flex' }}>
+          {status === 'pending' ? (
+            <Spinner size="sm" />
+          ) : (
+            <Icon
+              name={ICON[status]}
+              style={{ color: COLOR_VAR[VARIANT[status]], fontSize: 15 }}
+            />
+          )}
+        </span>
+      </Tooltip>
+    );
+  }
+
+  return (
+    <Tooltip content={tooltip}>
+      <Badge variant={VARIANT[status]} dot={status !== 'pending'}>
+        {status === 'pending' ? <Spinner size="sm" /> : null}
+        {label}
+      </Badge>
+    </Tooltip>
+  );
+}

src/components/track/TrackContextMenu.tsx

@@ -10,6 +10,7 @@ import { useTranslation } from 'react-i18next';
 import { useAppDispatch } from '../../hooks/useAppDispatch';
 import { addToQueue, addNextInQueue } from '../../store/slices/queue';
 import { play } from '../../store/slices/player';
+import { openTrackInfo } from '../../store/slices/ui';
 import type { Track } from '../../api/types';
 
 interface Props {
@@ -42,21 +43,45 @@ export function TrackContextMenu({
   return (
     <Menu>
       <MenuTrigger asChild>
-        <IconButton variant="ghost" size="sm" aria-label={t('track.menu.options')}>
+        <IconButton
+          variant="ghost"
+          size="sm"
+          aria-label={t('track.menu.options')}
+        >
           ⋯
         </IconButton>
       </MenuTrigger>
       <MenuContent>
-        <MenuItem onSelect={() => { dispatch(play(track.id)); }}>
+        <MenuItem
+          onSelect={() => {
+            dispatch(play(track.id));
+          }}
+        >
           {t('track.menu.playNow')}
         </MenuItem>
-        <MenuItem onSelect={() => { dispatch(addNextInQueue(entry)); }}>
+        <MenuItem
+          onSelect={() => {
+            dispatch(addNextInQueue(entry));
+          }}
+        >
           {t('track.menu.playNext')}
         </MenuItem>
-        <MenuItem onSelect={() => { dispatch(addToQueue(entry)); }}>
+        <MenuItem
+          onSelect={() => {
+            dispatch(addToQueue(entry));
+          }}
+        >
           {t('track.menu.addToQueue')}
         </MenuItem>
         <MenuSeparator />
+        <MenuItem
+          onSelect={() => {
+            dispatch(openTrackInfo(track.id));
+          }}
+        >
+          {t('track.menu.info')}
+        </MenuItem>
+        <MenuSeparator />
         {onAddToPlaylist && (
           <MenuItem onSelect={() => onAddToPlaylist(track)}>
             {t('track.menu.addToPlaylist')}

src/components/track/TrackInfoDrawer.tsx

@@ -0,0 +1,319 @@
+import type { ReactNode } from 'react';
+import { Badge, Button } from '@olly/modern-sk';
+import { useTranslation } from 'react-i18next';
+import { Link, useNavigate } from 'react-router';
+import { skipToken } from '@reduxjs/toolkit/query';
+import { Icon } from '../common/Icon';
+import { ArtTile } from '../common/ArtTile';
+import { AvailabilityBadge } from './AvailabilityBadge';
+import { MetadataStatusBadge } from './MetadataStatusBadge';
+import { LoadingSkeleton } from '../common/LoadingSkeleton';
+import { ErrorState } from '../common/ErrorState';
+import { EmptyState } from '../common/EmptyState';
+import { useAppDispatch, useAppSelector } from '../../hooks/useAppDispatch';
+import { closeTrackInfo } from '../../store/slices/ui';
+import { play } from '../../store/slices/player';
+import { addToQueue } from '../../store/slices/queue';
+import {
+  useGetTrackQuery,
+  useGetAlbumQuery,
+} from '../../api/endpoints/library';
+import { getTrackCoverUrl } from '../../api/endpoints/streaming';
+import {
+  formatDuration,
+  formatFileSize,
+  formatDateTime,
+} from '../../lib/format';
+import type { Track } from '../../api/types';
+
+/**
+ * Right-side "Get Info"-style drawer for a single track. Rendered after the
+ * QueuePanel in AppShell so it sits to the *right* of the queue when both are
+ * open. Open state lives in `ui.trackInfoId`; it reads the live Track (and its
+ * album) from the RTKQ cache so enrichment updates stay in sync.
+ */
+export function TrackInfoDrawer() {
+  const trackId = useAppSelector((s) => s.ui.trackInfoId);
+  const isOpen = trackId !== null;
+
+  return (
+    <aside className={`tid${isOpen ? '' : ' closed'}`} aria-hidden={!isOpen}>
+      <div className="tid-inner">
+        {trackId ? <TrackInfoContent trackId={trackId} /> : null}
+      </div>
+    </aside>
+  );
+}
+
+function TrackInfoContent({ trackId }: { trackId: string }) {
+  const { t } = useTranslation();
+  const dispatch = useAppDispatch();
+  const navigate = useNavigate();
+  const token = useAppSelector((s) => s.auth.accessToken);
+
+  const {
+    data: track,
+    isLoading,
+    isError,
+    refetch,
+  } = useGetTrackQuery(trackId);
+  // Album record fills in fields the lean TrackOut omits (year especially).
+  const { data: album } = useGetAlbumQuery(track?.albumId ?? skipToken);
+
+  const close = () => dispatch(closeTrackInfo());
+
+  return (
+    <>
+      <div className="tid-head">
+        <h3>{t('trackInfo.title')}</h3>
+        <div style={{ flex: 1 }} />
+        <button
+          type="button"
+          className="iconbtn sm"
+          onClick={close}
+          title={t('trackInfo.close')}
+        >
+          <Icon name="x" />
+        </button>
+      </div>
+
+      <div className="tid-scroll">
+        {isLoading ? (
+          <LoadingSkeleton rows={6} />
+        ) : isError ? (
+          <ErrorState onRetry={refetch} />
+        ) : !track ? (
+          <EmptyState title={t('trackInfo.notFound')} />
+        ) : (
+          <TrackInfoBody
+            track={track}
+            albumYear={album?.year}
+            albumTrackCount={album?.trackCount}
+            coverUrl={
+              token
+                ? getTrackCoverUrl(track.id, token, track.hasCover)
+                : undefined
+            }
+            onPlay={() => dispatch(play(track.id))}
+            onQueue={() =>
+              dispatch(
+                addToQueue({
+                  trackId: track.id,
+                  title: track.title,
+                  artistName: track.artistName,
+                  albumTitle: track.albumTitle,
+                  durationMs: track.durationMs,
+                  albumArtUrl: track.albumArtUrl,
+                }),
+              )
+            }
+            onEdit={() => {
+              navigate(`/tracks/${track.id}/metadata`);
+            }}
+          />
+        )}
+      </div>
+    </>
+  );
+}
+
+function TrackInfoBody({
+  track,
+  albumYear,
+  albumTrackCount,
+  coverUrl,
+  onPlay,
+  onQueue,
+  onEdit,
+}: {
+  track: Track;
+  albumYear?: number;
+  albumTrackCount?: number;
+  coverUrl?: string;
+  onPlay: () => void;
+  onQueue: () => void;
+  onEdit: () => void;
+}) {
+  const { t } = useTranslation();
+  const seedLabel = track.albumTitle || track.title;
+  const year = track.year ?? albumYear;
+
+  return (
+    <>
+      <div className="tid-cover">
+        {coverUrl ? (
+          <img src={coverUrl} alt={track.albumTitle} />
+        ) : (
+          <ArtTile seed={seedLabel} size={256} label={seedLabel} radius={12} />
+        )}
+      </div>
+
+      <h2 className="tid-title">{track.title}</h2>
+      <Link className="tid-sub" to={`/artists/${track.artistId}`}>
+        {track.artistName}
+      </Link>
+      {track.albumId && (
+        <Link className="tid-sub tid-album" to={`/albums/${track.albumId}`}>
+          <Icon name="vinyl-record" />
+          {track.albumTitle}
+        </Link>
+      )}
+
+      <div className="tid-actions">
+        <Button variant="primary" size="sm" onClick={onPlay}>
+          <Icon name="play" fill /> {t('trackInfo.play')}
+        </Button>
+        <Button variant="ghost" size="sm" onClick={onQueue}>
+          <Icon name="queue" /> {t('trackInfo.addToQueue')}
+        </Button>
+        <Button variant="ghost" size="sm" onClick={onEdit}>
+          {t('trackInfo.editMetadata')}
+        </Button>
+      </div>
+
+      <InfoSection title={t('trackInfo.sections.status')}>
+        <div className="tid-status">
+          <AvailabilityBadge availability={track.availability} />
+          <MetadataStatusBadge
+            status={track.metadataStatus}
+            error={track.metadataError}
+            hideWhenEnriched={false}
+          />
+          {track.liked && (
+            <Badge variant="lime" dot>
+              {t('trackInfo.liked')}
+            </Badge>
+          )}
+        </div>
+        {track.metadataStatus === 'failed' && track.metadataError && (
+          <p className="tid-error">{track.metadataError}</p>
+        )}
+      </InfoSection>
+
+      <InfoSection title={t('trackInfo.sections.general')}>
+        <InfoRow
+          label={t('trackInfo.fields.artist')}
+          value={track.artistName}
+        />
+        <InfoRow
+          label={t('trackInfo.fields.album')}
+          value={track.albumTitle || undefined}
+        />
+        <InfoRow
+          label={t('trackInfo.fields.trackNumber')}
+          value={
+            track.trackNumber !== undefined
+              ? albumTrackCount
+                ? t('trackInfo.trackOf', {
+                    n: track.trackNumber,
+                    total: albumTrackCount,
+                  })
+                : String(track.trackNumber)
+              : undefined
+          }
+        />
+        <InfoRow
+          label={t('trackInfo.fields.disc')}
+          value={
+            track.discNumber !== undefined
+              ? String(track.discNumber)
+              : undefined
+          }
+        />
+        <InfoRow
+          label={t('trackInfo.fields.year')}
+          value={year !== undefined ? String(year) : undefined}
+        />
+        <InfoRow label={t('trackInfo.fields.genre')} value={track.genre} />
+        <InfoRow
+          label={t('trackInfo.fields.duration')}
+          value={formatDuration(track.durationMs)}
+        />
+      </InfoSection>
+
+      <InfoSection title={t('trackInfo.sections.file')}>
+        <InfoRow
+          label={t('trackInfo.fields.format')}
+          value={track.format?.toUpperCase()}
+        />
+        <InfoRow
+          label={t('trackInfo.fields.bitrate')}
+          value={
+            track.bitrate !== undefined
+              ? t('trackInfo.kbps', { n: track.bitrate })
+              : undefined
+          }
+        />
+        <InfoRow
+          label={t('trackInfo.fields.size')}
+          value={
+            track.fileSize !== undefined
+              ? formatFileSize(track.fileSize)
+              : undefined
+          }
+        />
+        <InfoRow
+          label={t('trackInfo.fields.source')}
+          value={track.source}
+          mono
+        />
+        <InfoRow
+          label={t('trackInfo.fields.added')}
+          value={formatDateTime(track.createdAt)}
+        />
+        <InfoRow
+          label={t('trackInfo.fields.enriched')}
+          value={formatDateTime(track.enrichedAt)}
+        />
+      </InfoSection>
+
+      <InfoSection title={t('trackInfo.sections.identifiers')}>
+        <InfoRow label={t('trackInfo.fields.trackId')} value={track.id} mono />
+        <InfoRow
+          label={t('trackInfo.fields.albumId')}
+          value={track.albumId || undefined}
+          mono
+        />
+        <InfoRow
+          label={t('trackInfo.fields.artistId')}
+          value={track.artistId}
+          mono
+        />
+      </InfoSection>
+    </>
+  );
+}
+
+function InfoSection({
+  title,
+  children,
+}: {
+  title: string;
+  children: ReactNode;
+}) {
+  return (
+    <section className="tid-section">
+      <span className="msk-label tid-section-label">{title}</span>
+      {children}
+    </section>
+  );
+}
+
+/** A label/value row; renders nothing when the value is empty (Finder-style). */
+function InfoRow({
+  label,
+  value,
+  mono,
+}: {
+  label: string;
+  value?: string;
+  mono?: boolean;
+}) {
+  if (!value) return null;
+  return (
+    <div className="tid-row">
+      <span className="tid-row-k">{label}</span>
+      <span className={`tid-row-v${mono ? ' mono' : ''}`}>{value}</span>
+    </div>
+  );
+}

src/components/track/TrackRow.tsx

@@ -1,16 +1,26 @@
 import { Row } from '@olly/modern-sk';
+import { useTranslation } from 'react-i18next';
 import { TrackContextMenu } from './TrackContextMenu';
 import { AvailabilityBadge } from './AvailabilityBadge';
+import { MetadataStatusBadge } from './MetadataStatusBadge';
+import { Icon } from '../common/Icon';
+import { PlayingIndicator } from '../common/PlayingIndicator';
 import { formatDuration } from '../../lib/format';
 import { useAppDispatch, useAppSelector } from '../../hooks/useAppDispatch';
-import { play } from '../../store/slices/player';
+import { useIsOffline } from '../../hooks/useConnectionStatus';
+import { useStreamCached } from '../../hooks/useStreamCached';
+import { playNow } from '../../store/slices/queue';
 import type { Track } from '../../api/types';
-import { getCoverUrl } from '../../api/endpoints/streaming';
+import { getCoverUrl, getTrackCoverUrl } from '../../api/endpoints/streaming';
 
 interface Props {
   track: Track;
   index?: number;
   showAlbum?: boolean;
+  /** Hide cover art and show the track's album position instead — used on
+   * the album detail page, where the album cover is already shown once in
+   * the header and per-track art would be redundant. */
+  hideArt?: boolean;
   onAddToPlaylist?: (track: Track) => void;
   onEditMetadata?: (track: Track) => void;
   onDelete?: (track: Track) => void;
@@ -20,29 +30,60 @@ export function TrackRow({
   track,
   index,
   showAlbum = false,
+  hideArt = false,
   onAddToPlaylist,
   onEditMetadata,
   onDelete,
 }: Props) {
+  const { t } = useTranslation();
   const dispatch = useAppDispatch();
   const currentTrackId = useAppSelector((s) => s.player.currentTrackId);
   const isPlaying = useAppSelector((s) => s.player.isPlaying);
+  const token = useAppSelector((s) => s.auth.accessToken);
   const isActive = currentTrackId === track.id;
-  const artUrl = getCoverUrl(track.albumArtUrl);
+  // Prefer an explicit album art URL; otherwise serve the track's own cover
+  // (needs the token in the query string — `<img>` can't send a header).
+  const artUrl =
+    getCoverUrl(track.albumArtUrl) ??
+    (token ? getTrackCoverUrl(track.id, token, track.hasCover) : undefined);
+
+  // The backend reports `server`, but if it's unreachable and this track's
+  // audio is already in the offline cache, show "Local" instead.
+  const offline = useIsOffline();
+  const cached = useStreamCached(offline ? track.id : undefined);
+  const displayAvailability =
+    track.availability === 'server' && offline && cached
+      ? 'local'
+      : track.availability;
+
+  const handlePlayNow = () => {
+    dispatch(
+      playNow({
+        trackId: track.id,
+        title: track.title,
+        artistName: track.artistName,
+        albumTitle: track.albumTitle,
+        durationMs: track.durationMs,
+        albumArtUrl: track.albumArtUrl,
+      }),
+    );
+  };
 
   return (
     <Row
       selected={isActive}
-      onDoubleClick={() => dispatch(play(track.id))}
       style={{
         display: 'grid',
-        gridTemplateColumns: '2rem 2.5rem 1fr auto auto',
+        gridTemplateColumns: hideArt
+          ? '2.5rem 1fr auto auto'
+          : '2rem 2.5rem 1fr auto auto',
         gap: '0.75rem',
         alignItems: 'center',
         padding: '0.375rem 0.75rem',
         cursor: 'default',
       }}
     >
+      {!hideArt && (
         <span
           style={{
             fontSize: '0.75rem',
@@ -52,7 +93,24 @@ export function TrackRow({
         >
           {isActive && isPlaying ? '▶' : index !== undefined ? index + 1 : ''}
         </span>
-      {artUrl ? (
+      )}
+      <div className="track-art">
+        {hideArt ? (
+          <div
+            style={{
+              width: 36,
+              height: 36,
+              display: 'flex',
+              alignItems: 'center',
+              justifyContent: 'center',
+              fontSize: '1.0625rem',
+              fontWeight: 600,
+              color: isActive ? 'var(--color-accent)' : 'var(--color-text-3)',
+            }}
+          >
+            {track.trackNumber ?? (index !== undefined ? index + 1 : '')}
+          </div>
+        ) : artUrl ? (
           <img
             src={artUrl}
             alt=""
@@ -70,6 +128,21 @@ export function TrackRow({
             }}
           />
         )}
+        {isActive && (
+          <div className="cover-playing">
+            <PlayingIndicator animate={isPlaying} />
+          </div>
+        )}
+        <button
+          type="button"
+          className="track-art-play"
+          onClick={handlePlayNow}
+          aria-label={t('track.menu.playNow')}
+          title={t('track.menu.playNow')}
+        >
+          <Icon name="play" fill />
+        </button>
+      </div>
       <div style={{ minWidth: 0 }}>
         <div
           style={{
@@ -95,7 +168,14 @@ export function TrackRow({
           {showAlbum && ` · ${track.albumTitle}`}
         </div>
       </div>
-      <AvailabilityBadge availability={track.availability} />
+      <div style={{ display: 'flex', alignItems: 'center', gap: '0.5rem' }}>
+        <MetadataStatusBadge
+          status={track.metadataStatus}
+          error={track.metadataError}
+          iconOnly
+        />
+        <AvailabilityBadge availability={displayAvailability} iconOnly />
+      </div>
       <div style={{ display: 'flex', alignItems: 'center', gap: '0.5rem' }}>
         <span
           style={{

src/config/env.ts

@@ -1,2 +1,41 @@
+/**
+ * Default backend base URL — the operator-set fallback used when no specific
+ * instance is active. Resolution order:
+ *
+ *   1. window.__APP_CONFIG__.apiBaseUrl  — runtime, injected by the container
+ *      at start from $PUBLIC_API_BASE_URL (see public/config.js). Lets one
+ *      prebuilt image point at any backend origin without rebuilding.
+ *   2. import.meta.env.PUBLIC_API_BASE_URL — build-time default (rsbuild inlines
+ *      PUBLIC_* vars). Used in local dev and as a baked fallback.
+ *   3. '/api/v1' — same-origin relative path (works behind a reverse proxy).
+ *
+ * The user's chosen instance still wins over all of these — see
+ * runtime-config.ts / instances.ts.
+ */
+function runtimeApiBaseUrl(): string | undefined {
+  if (typeof window === 'undefined') return undefined;
+  const value = window.__APP_CONFIG__?.apiBaseUrl;
+  return value ? value : undefined;
+}
+
 export const DEFAULT_API_BASE_URL =
-  import.meta.env.PUBLIC_API_BASE_URL ?? '/api/v1';
+  runtimeApiBaseUrl() ?? import.meta.env.PUBLIC_API_BASE_URL ?? '/api/v1';
+
+/**
+ * Whether the public sign-up UI is shown. Same precedence as the base URL:
+ * runtime operator config (injected into `window.__APP_CONFIG__` at container
+ * start) wins over the build-time `PUBLIC_ENABLE_REGISTRATION` env, which
+ * defaults to enabled. This only gates the *UI*; the backend independently
+ * enforces `ALLOW_REGISTRATION` and is the real authority.
+ */
+function parseFlag(value: string | undefined): boolean | undefined {
+  if (value == null || value === '') return undefined;
+  return value !== 'false' && value !== '0';
+}
+
+export const REGISTRATION_ENABLED: boolean =
+  (typeof window !== 'undefined'
+    ? window.__APP_CONFIG__?.enableRegistration
+    : undefined) ??
+  parseFlag(import.meta.env.PUBLIC_ENABLE_REGISTRATION) ??
+  true;

src/config/instances.ts

@@ -29,8 +29,13 @@ const ACTIVE_KEY = 'mcma:activeInstance';
 const LEGACY_URL_KEY = 'mcma_api_base_url';
 const LEGACY_AUTH_KEY = 'mcma_auth';
 
+// The UI always talks to the `/api/v1` contract, so users only enter the
+// origin (and optional reverse-proxy prefix). We append the contract path
+// here, the single choke point for both the base URL and the instance id, so
+// `domain.com`, `domain.com/`, and `domain.com/api/v1` all converge.
 function normalizeUrl(url: string): string {
-  return url.trim().replace(/\/+$/, '');
+  const trimmed = url.trim().replace(/\/+$/, '');
+  return /\/api\/v1$/.test(trimmed) ? trimmed : `${trimmed}/api/v1`;
 }
 
 /** Stable, readable id from a base URL — also serves as the storage namespace. */
@@ -93,6 +98,11 @@ export function upsertInstance(url: string, name?: string): Instance {
   return inst;
 }
 
+/** Clear a backend's stored session without forgetting the instance itself. */
+export function clearInstanceAuth(id: string): void {
+  localStorage.removeItem(scopedKey('auth', id));
+}
+
 /** Remove a backend and wipe every scoped key it owns. */
 export function removeInstance(id: string): void {
   writeRegistry(readRegistry().filter((i) => i.id !== id));

src/env.d.ts

@@ -1,7 +1,17 @@
 /// <reference types="@rsbuild/core/types" />
 interface ImportMetaEnv {
   readonly PUBLIC_API_BASE_URL?: string;
+  readonly PUBLIC_ENABLE_REGISTRATION?: string;
 }
 interface ImportMeta {
   readonly env: ImportMetaEnv;
 }
+
+// Runtime operator config injected by /config.js before the app bundle loads
+// (written from $PUBLIC_API_BASE_URL at container start). See src/config/env.ts.
+interface Window {
+  __APP_CONFIG__?: {
+    apiBaseUrl?: string;
+    enableRegistration?: boolean;
+  };
+}

src/features/album-detail/AlbumDetailPage.tsx

@@ -1,6 +1,6 @@
 import { useParams, useNavigate } from 'react-router';
 import { useTranslation } from 'react-i18next';
-import { ScrollArea, IconButton, Button } from '@olly/modern-sk';
+import { ScrollArea, IconButton, Button, Callout } from '@olly/modern-sk';
 import {
   useGetAlbumQuery,
   useGetAlbumTracksQuery,
@@ -9,29 +9,56 @@ import { TrackRow } from '../../components/track/TrackRow';
 import { LoadingSkeleton } from '../../components/common/LoadingSkeleton';
 import { ErrorState } from '../../components/common/ErrorState';
 import { EmptyState } from '../../components/common/EmptyState';
-import { useAppDispatch } from '../../hooks/useAppDispatch';
+import { useAppDispatch, useAppSelector } from '../../hooks/useAppDispatch';
+import { useIsOffline } from '../../hooks/useConnectionStatus';
+import {
+  selectLocalAlbums,
+  selectLocalTracks,
+} from '../../store/selectors/localLibrary';
 import { setQueue } from '../../store/slices/queue';
 import { formatDuration } from '../../lib/format';
-import { getCoverUrl } from '../../api/endpoints/streaming';
+import { getCoverUrl, getTrackCoverUrl } from '../../api/endpoints/streaming';
 
 export function AlbumDetailPage() {
   const { t } = useTranslation();
   const { albumId } = useParams<{ albumId: string }>();
   const navigate = useNavigate();
   const dispatch = useAppDispatch();
+  const token = useAppSelector((s) => s.auth.accessToken);
 
   const albumQuery = useGetAlbumQuery(albumId ?? '', { skip: !albumId });
   const tracksQuery = useGetAlbumTracksQuery(albumId ?? '', { skip: !albumId });
 
-  if (albumQuery.isLoading || tracksQuery.isLoading) {
+  // Offline fallback: resolve the album + its tracks from the locally-cached
+  // library when the backend is unreachable (same approach as LibraryPage).
+  const offline = useIsOffline();
+  const localAlbums = useAppSelector(selectLocalAlbums);
+  const localTracks = useAppSelector(selectLocalTracks);
+
+  const album =
+    albumQuery.data ??
+    (offline ? localAlbums.find((a) => a.id === albumId) : undefined);
+  const tracks =
+    tracksQuery.data ??
+    (offline ? localTracks.filter((tr) => tr.albumId === albumId) : []);
+
+  if (!album) {
+    if (albumQuery.isLoading && !offline) {
       return (
         <div style={{ padding: '1.5rem' }}>
           <LoadingSkeleton rows={10} />
         </div>
       );
     }
-
-  if (albumQuery.isError) {
+    if (offline) {
+      return (
+        <EmptyState
+          icon="💿"
+          title={t('album.offline.title')}
+          description={t('album.offline.description')}
+        />
+      );
+    }
     return (
       <ErrorState
         message={t('album.error')}
@@ -39,10 +66,13 @@ export function AlbumDetailPage() {
       />
     );
   }
-
-  const album = albumQuery.data;
-  const tracks = tracksQuery.data ?? [];
-  const artUrl = getCoverUrl(album?.artUrl);
+  // The album record itself carries no cover; fall back to a track's cover.
+  const coverTrack = tracks.find((t) => t.hasCover);
+  const artUrl =
+    getCoverUrl(album?.artUrl) ??
+    (token && coverTrack
+      ? getTrackCoverUrl(coverTrack.id, token, true)
+      : undefined);
 
   const handlePlayAll = () => {
     if (!tracks.length || !album) return;
@@ -65,6 +95,11 @@ export function AlbumDetailPage() {
 
   return (
     <div style={{ display: 'flex', flexDirection: 'column', height: '100%' }}>
+      {offline && (
+        <div style={{ padding: '0.75rem 1.5rem 0', flexShrink: 0 }}>
+          <Callout variant="info">{t('common.offlineBanner')}</Callout>
+        </div>
+      )}
       <div
         style={{
           padding: '1.25rem 1.5rem',
@@ -161,16 +196,17 @@ export function AlbumDetailPage() {
       </div>
 
       <ScrollArea style={{ flex: 1 }}>
-        {tracksQuery.isLoading && <LoadingSkeleton rows={10} />}
-        {tracksQuery.isError && (
+        {tracks.length === 0 && !offline && tracksQuery.isLoading && (
+          <LoadingSkeleton rows={10} />
+        )}
+        {tracks.length === 0 && !offline && tracksQuery.isError && (
           <ErrorState
             message={t('album.tracksError')}
             onRetry={() => tracksQuery.refetch()}
           />
         )}
-        {!tracksQuery.isLoading &&
-          !tracksQuery.isError &&
-          tracks.length === 0 && (
+        {tracks.length === 0 &&
+          (offline || (!tracksQuery.isLoading && !tracksQuery.isError)) && (
             <EmptyState
               icon="♫"
               title={t('album.empty.title')}
@@ -178,7 +214,7 @@ export function AlbumDetailPage() {
             />
           )}
         {tracks.map((track, i) => (
-          <TrackRow key={track.id} track={track} index={i} />
+          <TrackRow key={track.id} track={track} index={i} hideArt />
         ))}
       </ScrollArea>
     </div>

src/features/artist-detail/ArtistDetailPage.tsx

@@ -1,8 +1,307 @@
+import { useParams, useNavigate } from 'react-router';
 import { useTranslation } from 'react-i18next';
-import { Placeholder } from '../../components/common/Placeholder';
+import { ScrollArea, IconButton, Button, Card, Callout } from '@olly/modern-sk';
+import {
+  useGetArtistQuery,
+  useGetArtistAlbumsQuery,
+  useGetArtistTracksQuery,
+} from '../../api/endpoints/library';
+import { TrackRow } from '../../components/track/TrackRow';
+import { ArtTile } from '../../components/common/ArtTile';
+import { LoadingSkeleton } from '../../components/common/LoadingSkeleton';
+import { ErrorState } from '../../components/common/ErrorState';
+import { EmptyState } from '../../components/common/EmptyState';
+import { useAppDispatch, useAppSelector } from '../../hooks/useAppDispatch';
+import { useIsOffline } from '../../hooks/useConnectionStatus';
+import {
+  selectLocalArtists,
+  selectLocalAlbums,
+  selectLocalTracks,
+} from '../../store/selectors/localLibrary';
+import { setQueue } from '../../store/slices/queue';
+import { formatDuration } from '../../lib/format';
+import { getCoverUrl, getAlbumCoverUrl } from '../../api/endpoints/streaming';
+import type { Album } from '../../api/types';
 
-/** `/artists/:artistId` — A3 artist detail (discography + similar). Scaffold only. */
 export function ArtistDetailPage() {
   const { t } = useTranslation();
-  return <Placeholder title={t('pages.artist')} />;
+  const { artistId } = useParams<{ artistId: string }>();
+  const navigate = useNavigate();
+  const dispatch = useAppDispatch();
+
+  const artistQuery = useGetArtistQuery(artistId ?? '', { skip: !artistId });
+  const albumsQuery = useGetArtistAlbumsQuery(artistId ?? '', {
+    skip: !artistId,
+  });
+  const tracksQuery = useGetArtistTracksQuery(artistId ?? '', {
+    skip: !artistId,
+  });
+
+  // Offline fallback: resolve the artist + their albums/tracks from the
+  // locally-cached library when the backend is unreachable.
+  const offline = useIsOffline();
+  const localArtists = useAppSelector(selectLocalArtists);
+  const localAlbums = useAppSelector(selectLocalAlbums);
+  const localTracks = useAppSelector(selectLocalTracks);
+
+  const artist =
+    artistQuery.data ??
+    (offline ? localArtists.find((a) => a.id === artistId) : undefined);
+  const albums =
+    albumsQuery.data ??
+    (offline ? localAlbums.filter((a) => a.artistId === artistId) : []);
+  const tracks =
+    tracksQuery.data ??
+    (offline ? localTracks.filter((tr) => tr.artistId === artistId) : []);
+
+  if (!artist) {
+    if (artistQuery.isLoading && !offline) {
+      return (
+        <div style={{ padding: '1.5rem' }}>
+          <LoadingSkeleton rows={10} />
+        </div>
+      );
+    }
+    if (offline) {
+      return (
+        <EmptyState
+          icon="🎤"
+          title={t('artist.offline.title')}
+          description={t('artist.offline.description')}
+        />
+      );
+    }
+    return (
+      <ErrorState
+        message={t('artist.error')}
+        onRetry={() => artistQuery.refetch()}
+      />
+    );
+  }
+
+  const handlePlayAll = () => {
+    if (!tracks.length) return;
+    dispatch(
+      setQueue({
+        entries: tracks.map((tr) => ({
+          trackId: tr.id,
+          title: tr.title,
+          artistName: tr.artistName,
+          albumTitle: tr.albumTitle,
+          durationMs: tr.durationMs,
+          albumArtUrl: tr.albumArtUrl,
+        })),
+        source: 'artist',
+        sourceId: artist.id,
+        sourceName: artist.name,
+      }),
+    );
+  };
+
+  return (
+    <div style={{ display: 'flex', flexDirection: 'column', height: '100%' }}>
+      {offline && (
+        <div style={{ padding: '0.75rem 1.5rem 0', flexShrink: 0 }}>
+          <Callout variant="info">{t('common.offlineBanner')}</Callout>
+        </div>
+      )}
+      <div
+        style={{
+          padding: '1.25rem 1.5rem',
+          borderBottom: '1px solid var(--color-border)',
+          display: 'flex',
+          alignItems: 'center',
+          gap: '1rem',
+          flexShrink: 0,
+        }}
+      >
+        <IconButton
+          variant="ghost"
+          size="sm"
+          onClick={() => navigate(-1)}
+          aria-label={t('common.back')}
+        >
+          ←
+        </IconButton>
+        <div
+          style={{
+            display: 'flex',
+            gap: '1.5rem',
+            alignItems: 'center',
+            flex: 1,
+          }}
+        >
+          <ArtTile seed={artist.id} label={artist.name} size={96} radius={48} />
+          <div>
+            <p
+              style={{
+                margin: 0,
+                fontSize: '0.75rem',
+                color: 'var(--color-text-3)',
+                textTransform: 'uppercase',
+                letterSpacing: '0.05em',
+              }}
+            >
+              {t('artist.type')}
+            </p>
+            <h1
+              style={{
+                margin: '0.25rem 0',
+                fontSize: '1.5rem',
+                fontWeight: 700,
+              }}
+            >
+              {artist.name}
+            </h1>
+            <p
+              style={{
+                margin: 0,
+                color: 'var(--color-text-2)',
+                fontSize: '0.875rem',
+              }}
+            >
+              {t('artist.meta', {
+                albumCount: artist.albumCount,
+                trackCount: artist.trackCount,
+              })}
+            </p>
+          </div>
+        </div>
+        <Button
+          variant="primary"
+          onClick={handlePlayAll}
+          disabled={!tracks.length}
+        >
+          {t('artist.play')}
+        </Button>
+      </div>
+
+      <ScrollArea style={{ flex: 1 }}>
+        {/* Discography */}
+        <section style={{ padding: '1.25rem 1.5rem 0' }}>
+          <h2
+            style={{ margin: '0 0 0.75rem', fontSize: '1rem', fontWeight: 600 }}
+          >
+            {t('artist.albums')}
+          </h2>
+          {albums.length === 0 && !offline && albumsQuery.isLoading && (
+            <LoadingSkeleton rows={3} height={72} />
+          )}
+          {albums.length === 0 && !offline && albumsQuery.isError && (
+            <ErrorState onRetry={() => albumsQuery.refetch()} />
+          )}
+          {albums.length === 0 &&
+            (offline || (!albumsQuery.isLoading && !albumsQuery.isError)) && (
+              <p style={{ color: 'var(--color-text-3)', fontSize: '0.875rem' }}>
+                {t('artist.noAlbums')}
+              </p>
+            )}
+          {albums.length > 0 && (
+            <div
+              style={{
+                display: 'grid',
+                gridTemplateColumns: 'repeat(auto-fill, minmax(9rem, 1fr))',
+                gap: '1rem',
+              }}
+            >
+              {albums.map((album) => (
+                <AlbumCard
+                  key={album.id}
+                  album={album}
+                  onClick={() => void navigate(`/albums/${album.id}`)}
+                />
+              ))}
+            </div>
+          )}
+        </section>
+
+        {/* All tracks */}
+        <section style={{ padding: '1.5rem 0 0.5rem' }}>
+          <h2
+            style={{
+              margin: '0 1.5rem 0.5rem',
+              fontSize: '1rem',
+              fontWeight: 600,
+            }}
+          >
+            {t('artist.tracks')}
+          </h2>
+          {tracks.length === 0 && !offline && tracksQuery.isLoading && (
+            <LoadingSkeleton rows={6} />
+          )}
+          {tracks.length === 0 && !offline && tracksQuery.isError && (
+            <ErrorState onRetry={() => tracksQuery.refetch()} />
+          )}
+          {tracks.length === 0 &&
+            (offline || (!tracksQuery.isLoading && !tracksQuery.isError)) && (
+              <EmptyState
+                icon="♫"
+                title={t('artist.empty.title')}
+                description={t('artist.empty.description')}
+              />
+            )}
+          {tracks.map((track, i) => (
+            <TrackRow key={track.id} track={track} index={i} showAlbum />
+          ))}
+        </section>
+      </ScrollArea>
+    </div>
+  );
+}
+
+function AlbumCard({ album, onClick }: { album: Album; onClick: () => void }) {
+  const { t } = useTranslation();
+  const token = useAppSelector((s) => s.auth.accessToken);
+  const artUrl =
+    getCoverUrl(album.artUrl) ??
+    (token ? getAlbumCoverUrl(album.id, token, album.hasCover) : undefined);
+  return (
+    <Card
+      onClick={onClick}
+      style={{
+        cursor: 'pointer',
+        padding: '0.75rem',
+        display: 'flex',
+        flexDirection: 'column',
+        gap: '0.5rem',
+      }}
+    >
+      {artUrl ? (
+        <img
+          src={artUrl}
+          alt={album.title}
+          style={{
+            width: '100%',
+            aspectRatio: '1',
+            objectFit: 'cover',
+            borderRadius: 6,
+          }}
+        />
+      ) : (
+        <div style={{ width: '100%', aspectRatio: '1' }}>
+          <ArtTile seed={album.id} label={album.title} size={144} radius={6} />
+        </div>
+      )}
+      <div>
+        <div
+          style={{
+            fontWeight: 600,
+            fontSize: '0.8125rem',
+            overflow: 'hidden',
+            textOverflow: 'ellipsis',
+            whiteSpace: 'nowrap',
+          }}
+        >
+          {album.title}
+        </div>
+        <div style={{ fontSize: '0.6875rem', color: 'var(--color-text-3)' }}>
+          {album.year ? `${album.year} · ` : ''}
+          {t('library.albumCard.tracksDuration', {
+            count: album.trackCount,
+            duration: formatDuration(album.totalDurationMs),
+          })}
+        </div>
+      </div>
+    </Card>
+  );
 }

src/features/connect/ConnectPage.tsx

@@ -1,18 +1,191 @@
 import { useState } from 'react';
 import { useNavigate } from 'react-router';
 import { useTranslation } from 'react-i18next';
-import { Card, TextField, Button, Callout, Badge } from '@olly/modern-sk';
+import type { FetchBaseQueryError } from '@reduxjs/toolkit/query';
+import {
+  Card,
+  TextField,
+  Button,
+  Callout,
+  Badge,
+  Dialog,
+  IconButton,
+} from '@olly/modern-sk';
 import { Icon } from '../../components/common/Icon';
 import { useAppDispatch } from '../../hooks/useAppDispatch';
+import { useConnectionStatus } from '../../hooks/useConnectionStatus';
 import { setTokens, setUser } from '../../store/slices/auth';
-import { setApiBaseUrl } from '../../config/runtime-config';
+import {
+  useLoginMutation,
+  useRegisterMutation,
+} from '../../api/endpoints/auth';
+import { REGISTRATION_ENABLED } from '../../config/env';
 import {
   listInstances,
   getActiveInstanceId,
   setActiveInstanceId,
   removeInstance,
+  clearInstanceAuth,
+  upsertInstance,
+  type Instance,
 } from '../../config/instances';
-import type { User } from '../../api/types';
+
+type Mode = 'login' | 'register';
+
+const HEALTH_VARIANTS = {
+  connected: 'lime',
+  connecting: 'neutral',
+  disconnected: 'ember',
+  error: 'ember',
+} as const;
+
+const HEALTH_KEY = {
+  connected: 'conn.connected',
+  connecting: 'conn.connecting',
+  disconnected: 'conn.disconnected',
+  error: 'conn.error',
+} as const;
+
+/** Map an RTKQ login failure to a user-facing i18n key. */
+function resolveLoginError(err: unknown): string {
+  const e = err as FetchBaseQueryError | undefined;
+  if (e && 'status' in e) {
+    if (e.status === 'FETCH_ERROR') return 'connect.errors.unreachable';
+    if (e.status === 401) return 'connect.errors.badCredentials';
+  }
+  return 'connect.errors.generic';
+}
+
+/** Map an RTKQ register failure to a user-facing i18n key. */
+function resolveRegisterError(err: unknown): string {
+  const e = err as FetchBaseQueryError | undefined;
+  if (e && 'status' in e) {
+    if (e.status === 'FETCH_ERROR') return 'connect.errors.unreachable';
+    if (e.status === 409) return 'connect.errors.usernameTaken';
+    if (e.status === 422) return 'connect.errors.passwordTooShort';
+    if (e.status === 403) return 'connect.errors.registrationDisabled';
+  }
+  return 'connect.errors.registerFailed';
+}
+
+function InstanceRow({
+  inst,
+  selected,
+  onSelect,
+  onLogout,
+  onRemove,
+}: {
+  inst: Instance;
+  selected: boolean;
+  onSelect: () => void;
+  onLogout: () => void;
+  onRemove: () => void;
+}) {
+  const { t } = useTranslation();
+  const status = useConnectionStatus(inst.baseUrl);
+  const [dialogOpen, setDialogOpen] = useState(false);
+
+  return (
+    <div
+      style={{
+        display: 'flex',
+        alignItems: 'center',
+        gap: '0.625rem',
+        padding: '0.375rem 0',
+      }}
+    >
+      <Badge variant={HEALTH_VARIANTS[status]} dot>
+        {t(HEALTH_KEY[status])}
+      </Badge>
+      <div style={{ minWidth: 0, flex: 1 }}>
+        <div
+          style={{
+            fontSize: '0.875rem',
+            fontWeight: 600,
+            color: 'var(--color-text-1)',
+            overflow: 'hidden',
+            textOverflow: 'ellipsis',
+            whiteSpace: 'nowrap',
+          }}
+        >
+          {inst.name}
+        </div>
+        <div
+          style={{
+            fontSize: '0.75rem',
+            color: 'var(--color-text-3)',
+            overflow: 'hidden',
+            textOverflow: 'ellipsis',
+            whiteSpace: 'nowrap',
+          }}
+        >
+          {inst.baseUrl}
+        </div>
+      </div>
+      {selected ? (
+        <Badge variant="outline">{t('connect.domains.selected')}</Badge>
+      ) : (
+        <Button variant="ghost" size="sm" onClick={onSelect}>
+          {t('connect.domains.use')}
+        </Button>
+      )}
+      <Dialog
+        open={dialogOpen}
+        onOpenChange={setDialogOpen}
+        title={t('connect.removeDialog.title')}
+        description={t('connect.removeDialog.description', {
+          name: inst.name,
+        })}
+        trigger={
+          <button
+            type="button"
+            className="iconbtn sm"
+            title={t('connect.domains.forgetTitle')}
+          >
+            <Icon name="trash" />
+          </button>
+        }
+        footer={
+          <div
+            style={{
+              display: 'flex',
+              justifyContent: 'flex-end',
+              gap: '0.5rem',
+            }}
+          >
+            <Button
+              variant="ghost"
+              size="sm"
+              onClick={() => setDialogOpen(false)}
+            >
+              {t('connect.removeDialog.cancel')}
+            </Button>
+            <Button
+              variant="ghost"
+              size="sm"
+              onClick={() => {
+                setDialogOpen(false);
+                onLogout();
+              }}
+            >
+              {t('connect.removeDialog.logout')}
+            </Button>
+            <Button
+              variant="ember"
+              size="sm"
+              onClick={() => {
+                setDialogOpen(false);
+                onRemove();
+              }}
+            >
+              {t('connect.removeDialog.removeAndLogout')}
+            </Button>
+          </div>
+        }
+      />
+    </div>
+  );
+}
 
 export function ConnectPage() {
   const { t } = useTranslation();
@@ -21,41 +194,80 @@ export function ConnectPage() {
 
   const [rev, setRev] = useState(0);
   const instances = listInstances();
-  const activeId = getActiveInstanceId();
 
-  const [apiUrl, setApiUrl] = useState('https://');
+  const [selectedId, setSelectedId] = useState<string | null>(() =>
+    getActiveInstanceId(),
+  );
+  const selectedInstance = instances.find((i) => i.id === selectedId) ?? null;
+  const [instanceAddShown, setInstanceAddShown] = useState(false);
+
+  const [addUrl, setAddUrl] = useState('');
+
+  const [mode, setMode] = useState<Mode>('login');
   const [username, setUsername] = useState('');
   const [password, setPassword] = useState('');
+  const [error, setError] = useState<string | null>(null);
 
-  const switchTo = (id: string) => {
+  const [login, { isLoading: isLoggingIn }] = useLoginMutation();
+  const [register, { isLoading: isRegistering }] = useRegisterMutation();
+  const isLoading = isLoggingIn || isRegistering;
+
+  const switchMode = (next: Mode) => {
+    setMode(next);
+    setError(null);
+  };
+
+  // Switching the active instance and reloading lets the app pick the saved
+  // session for that instance back up (if any); if it has none, ProtectedRoute
+  // bounces back here and `selectedId` defaults to it, surfacing the login card.
+  const selectInstance = (id: string) => {
     setActiveInstanceId(id);
     window.location.assign('/');
   };
 
-  const forget = (id: string) => {
-    removeInstance(id);
+  const handleAdd = (e: React.FormEvent) => {
+    e.preventDefault();
+    const url = addUrl.trim();
+    if (!url || url === 'https://') return;
+    const inst = upsertInstance(url);
+    setActiveInstanceId(inst.id);
+    setAddUrl('https://');
+    setSelectedId(inst.id);
     setRev((r) => r + 1);
   };
 
-  const handleSubmit = (e: React.FormEvent) => {
-    e.preventDefault();
-    setApiBaseUrl(apiUrl);
-
-    const fakeUser: User = {
-      id: 'dev-user',
-      username: username || 'dev',
-      role: 'admin',
-      createdAt: new Date().toISOString(),
+  const handleLogout = (id: string) => {
+    clearInstanceAuth(id);
+    setRev((r) => r + 1);
   };
-    dispatch(
-      setTokens({
-        accessToken: 'dev-token',
-        refreshToken: 'dev-refresh',
-        expiresIn: 3600,
-      }),
-    );
-    dispatch(setUser(fakeUser));
+
+  const handleRemove = (id: string) => {
+    removeInstance(id);
+    if (selectedId === id) setSelectedId(getActiveInstanceId());
+    setRev((r) => r + 1);
+  };
+
+  const handleSubmit = async (e: React.FormEvent) => {
+    e.preventDefault();
+    if (!selectedInstance) return;
+    setError(null);
+
+    try {
+      const action =
+        mode === 'register'
+          ? register({ username, password })
+          : login({ username, password });
+      const { user, tokens } = await action.unwrap();
+      dispatch(setTokens(tokens));
+      dispatch(setUser(user));
       void navigate('/');
+    } catch (err) {
+      setError(
+        mode === 'register'
+          ? resolveRegisterError(err)
+          : resolveLoginError(err),
+      );
+    }
   };
 
   const labelStyle: React.CSSProperties = {
@@ -100,7 +312,6 @@ export function ConnectPage() {
           <Icon name="vinyl-record" fill /> MCMA
         </h1>
 
-        {instances.length > 0 && (
         <Card>
           <div
             style={{
@@ -110,82 +321,57 @@ export function ConnectPage() {
               gap: '0.5rem',
             }}
           >
+            {instances.length > 0 && (
+              <>
                 <span className="msk-label" style={{ marginBottom: '0.25rem' }}>
-                {t('connect.savedInstances')}
+                  {t('connect.domains.title')}
                 </span>
                 {instances.map((inst) => (
-                <div
+                  <InstanceRow
                     key={inst.id}
+                    inst={inst}
+                    selected={inst.id === selectedId}
+                    onSelect={() => selectInstance(inst.id)}
+                    onLogout={() => handleLogout(inst.id)}
+                    onRemove={() => handleRemove(inst.id)}
+                  />
+                ))}
+              </>
+            )}
+            <form
+              onSubmit={handleAdd}
               style={{
                 display: 'flex',
-                    alignItems: 'center',
-                    gap: '0.625rem',
-                    padding: '0.375rem 0',
+                gap: '0.5rem',
+                marginTop: instances.length > 0 ? '0.5rem' : 0,
               }}
             >
-                  <span
-                    className={`led ${inst.id === activeId ? 'online' : 'offline'}`}
-                    style={{
-                      width: 8,
-                      height: 8,
-                      borderRadius: '50%',
-                      background:
-                        inst.id === activeId ? 'var(--lime)' : 'var(--fg-3)',
-                      boxShadow:
-                        inst.id === activeId ? '0 0 6px var(--lime)' : 'none',
-                      flexShrink: 0,
-                    }}
+              {instanceAddShown ? (
+                <>
+                  <TextField
+                    value={addUrl}
+                    onChange={(e) => setAddUrl(e.target.value)}
+                    placeholder={t('connect.domains.addPlaceholder')}
+                    style={{ flex: 1 }}
                   />
-                  <div style={{ minWidth: 0, flex: 1 }}>
-                    <div
-                      style={{
-                        fontSize: '0.875rem',
-                        fontWeight: 600,
-                        color: 'var(--color-text-1)',
-                        overflow: 'hidden',
-                        textOverflow: 'ellipsis',
-                        whiteSpace: 'nowrap',
-                      }}
-                    >
-                      {inst.name}
-                    </div>
-                    <div
-                      style={{
-                        fontSize: '0.75rem',
-                        color: 'var(--color-text-3)',
-                        overflow: 'hidden',
-                        textOverflow: 'ellipsis',
-                        whiteSpace: 'nowrap',
-                      }}
-                    >
-                      {inst.baseUrl}
-                    </div>
-                  </div>
-                  {inst.id === activeId ? (
-                    <Badge variant="lime">{t('connect.active')}</Badge>
+                  <IconButton type="submit" variant="primary">
+                    <Icon name="plus" />
+                  </IconButton>
+                </>
               ) : (
                 <Button
+                  onClick={() => setInstanceAddShown(true)}
+                  style={{ width: '100%' }}
                   variant="ghost"
-                      size="sm"
-                      onClick={() => switchTo(inst.id)}
                 >
-                      {t('connect.use')}
+                  <Icon name="plus" /> {t('connect.domains.addButton')}
                 </Button>
               )}
-                  <button
-                    type="button"
-                    className="iconbtn sm"
-                    onClick={() => forget(inst.id)}
-                    title={t('connect.forgetTitle')}
-                  >
-                    <Icon name="trash" />
-                  </button>
-                </div>
-              ))}
+            </form>
           </div>
         </Card>
-        )}
 
+        {selectedInstance && (
           <Card>
             <form
               onSubmit={handleSubmit}
@@ -196,18 +382,15 @@ export function ConnectPage() {
                 padding: '1.5rem',
               }}
             >
-            <span className="msk-label">{t('connect.form.title')}</span>
+              <span className="msk-label">
+                {mode === 'register'
+                  ? t('connect.login.registerTitle', {
+                      name: selectedInstance.name,
+                    })
+                  : t('connect.login.title', { name: selectedInstance.name })}
+              </span>
               <div>
-              <label style={labelStyle}>{t('connect.form.serverUrl')}</label>
-              <TextField
-                value={apiUrl}
-                onChange={(e) => setApiUrl(e.target.value)}
-                placeholder="https://your-server.example.com/api/v1"
-                required
-              />
-            </div>
-            <div>
-              <label style={labelStyle}>{t('connect.form.username')}</label>
+                <label style={labelStyle}>{t('connect.login.username')}</label>
                 <TextField
                   value={username}
                   onChange={(e) => setUsername(e.target.value)}
@@ -217,28 +400,84 @@ export function ConnectPage() {
                 />
               </div>
               <div>
-              <label style={labelStyle}>{t('connect.form.password')}</label>
+                <label style={labelStyle}>{t('connect.login.password')}</label>
                 <TextField
                   type="password"
                   value={password}
                   onChange={(e) => setPassword(e.target.value)}
                   placeholder="password"
-                autoComplete="current-password"
+                  autoComplete={
+                    mode === 'register' ? 'new-password' : 'current-password'
+                  }
                   required
                 />
+                {mode === 'register' && (
+                  <span
+                    style={{
+                      display: 'block',
+                      fontSize: '0.75rem',
+                      color: 'var(--color-text-3)',
+                      marginTop: '0.375rem',
+                    }}
+                  >
+                    {t('connect.login.passwordHint')}
+                  </span>
+                )}
               </div>
-            <Callout variant="warning">
-              {t('connect.form.stubNote')}
-            </Callout>
+              {error && <Callout variant="danger">{t(error)}</Callout>}
               <Button
                 type="submit"
                 variant="primary"
+                disabled={isLoading}
                 style={{ marginTop: '0.5rem' }}
               >
-              {t('connect.form.submit')}
+                {isLoading
+                  ? mode === 'register'
+                    ? t('connect.login.registering')
+                    : t('connect.login.submitting')
+                  : mode === 'register'
+                    ? t('connect.login.registerSubmit')
+                    : t('connect.login.submit')}
               </Button>
+
+              {REGISTRATION_ENABLED && (
+                <div
+                  style={{
+                    textAlign: 'center',
+                    fontSize: '0.8125rem',
+                    color: 'var(--color-text-3)',
+                  }}
+                >
+                  {mode === 'register' ? (
+                    <>
+                      {t('connect.login.haveAccount')}{' '}
+                      <Button
+                        type="button"
+                        variant="ghost"
+                        size="sm"
+                        onClick={() => switchMode('login')}
+                      >
+                        {t('connect.login.signInLink')}
+                      </Button>
+                    </>
+                  ) : (
+                    <>
+                      {t('connect.login.noAccount')}{' '}
+                      <Button
+                        type="button"
+                        variant="ghost"
+                        size="sm"
+                        onClick={() => switchMode('register')}
+                      >
+                        {t('connect.login.registerLink')}
+                      </Button>
+                    </>
+                  )}
+                </div>
+              )}
             </form>
           </Card>
+        )}
       </div>
     </div>
   );

src/features/downloads-manager/DownloadsManagerPage.tsx

@@ -1,13 +1,275 @@
+import { useEffect, useState } from 'react';
+import { useNavigate } from 'react-router';
 import { useTranslation } from 'react-i18next';
-import { Window } from '@olly/modern-sk';
+import {
+  Badge,
+  Button,
+  Callout,
+  Progress,
+  ScrollArea,
+  Spinner,
+} from '@olly/modern-sk';
+import {
+  useCancelDownloadMutation,
+  useGetDownloadsQuery,
+  useRetryDownloadMutation,
+} from '../../api/endpoints/downloads';
+import { Icon } from '../../components/common/Icon';
+import { EmptyState } from '../../components/common/EmptyState';
+import { ErrorState } from '../../components/common/ErrorState';
+import { LoadingSkeleton } from '../../components/common/LoadingSkeleton';
+import { formatDateTime } from '../../lib/format';
+import type { DownloadJob, DownloadStatus } from '../../api/types';
 
+const ACTIVE: readonly DownloadStatus[] = [
+  'queued',
+  'downloading',
+  'enriching',
+];
+const isActive = (s: DownloadStatus) => ACTIVE.includes(s);
+
+const STATUS_BADGE: Record<
+  DownloadStatus,
+  { variant: 'lime' | 'ember' | 'neutral' | 'outline'; key: string }
+> = {
+  queued: { variant: 'neutral', key: 'downloads.status.queued' },
+  downloading: { variant: 'neutral', key: 'downloads.status.downloading' },
+  enriching: { variant: 'outline', key: 'downloads.status.enriching' },
+  done: { variant: 'lime', key: 'downloads.status.done' },
+  failed: { variant: 'ember', key: 'downloads.status.failed' },
+};
+
+/** `/downloads` — A5 download manager: active queue, progress, errors, retries. */
 export function DownloadsManagerPage() {
   const { t } = useTranslation();
+
+  // Poll while anything is in flight; idle pages stop polling (tag invalidation
+  // from a new download still refetches and re-arms the interval).
+  const [pollMs, setPollMs] = useState(2000);
+  const { data, isLoading, isError, refetch } = useGetDownloadsQuery(
+    undefined,
+    {
+      pollingInterval: pollMs,
+    },
+  );
+
+  useEffect(() => {
+    const anyActive = data?.items.some((j) => isActive(j.status)) ?? false;
+    setPollMs(anyActive ? 1500 : 0);
+  }, [data]);
+
+  const jobs = data?.items ?? [];
+  const active = jobs.filter((j) => isActive(j.status));
+  const finished = jobs.filter((j) => !isActive(j.status));
+  const failedCount = jobs.filter((j) => j.status === 'failed').length;
+
   return (
-    <div style={{ padding: '1.5rem' }}>
-      <Window title={t('pages.downloads')}>
-        <p style={{ color: 'var(--color-text-2)' }}>{t('common.comingSoon')}</p>
-      </Window>
+    <div style={{ display: 'flex', flexDirection: 'column', height: '100%' }}>
+      <header
+        style={{
+          padding: '1.25rem 1.5rem',
+          borderBottom: '1px solid var(--color-border)',
+          flexShrink: 0,
+          display: 'flex',
+          alignItems: 'baseline',
+          justifyContent: 'space-between',
+          gap: '1rem',
+        }}
+      >
+        <div>
+          <h2 style={{ margin: 0, fontSize: '1.125rem', fontWeight: 700 }}>
+            {t('downloads.title')}
+          </h2>
+          <p
+            style={{
+              margin: '0.25rem 0 0',
+              fontSize: '0.8125rem',
+              color: 'var(--color-text-3)',
+            }}
+          >
+            {t('downloads.subtitle')}
+          </p>
+        </div>
+        {active.length > 0 && (
+          <Badge variant="neutral">
+            <Spinner size="sm" />{' '}
+            {t('downloads.activeCount', { count: active.length })}
+          </Badge>
+        )}
+      </header>
+
+      <ScrollArea style={{ flex: 1 }}>
+        <div
+          style={{
+            padding: '1.5rem',
+            maxWidth: 880,
+            margin: '0 auto',
+            display: 'flex',
+            flexDirection: 'column',
+            gap: '1.25rem',
+          }}
+        >
+          {isLoading && <LoadingSkeleton rows={5} height={64} />}
+          {isError && (
+            <ErrorState
+              message={t('downloads.loadError')}
+              onRetry={() => refetch()}
+            />
+          )}
+
+          {data && jobs.length === 0 && (
+            <EmptyState
+              icon={<Icon name="arrow-circle-down" />}
+              title={t('downloads.emptyTitle')}
+              description={t('downloads.emptyDesc')}
+            />
+          )}
+
+          {failedCount > 0 && (
+            <Callout variant="warning">
+              {t('downloads.failedBanner', { count: failedCount })}
+            </Callout>
+          )}
+
+          {active.length > 0 && (
+            <Section title={t('downloads.sectionActive')}>
+              {active.map((job) => (
+                <JobRow key={job.id} job={job} />
+              ))}
+            </Section>
+          )}
+
+          {finished.length > 0 && (
+            <Section title={t('downloads.sectionHistory')}>
+              {finished.map((job) => (
+                <JobRow key={job.id} job={job} />
+              ))}
+            </Section>
+          )}
+        </div>
+      </ScrollArea>
+    </div>
+  );
+}
+
+function Section({
+  title,
+  children,
+}: {
+  title: string;
+  children: React.ReactNode;
+}) {
+  return (
+    <section
+      style={{ display: 'flex', flexDirection: 'column', gap: '0.5rem' }}
+    >
+      <span
+        style={{
+          fontWeight: 600,
+          fontSize: '0.8125rem',
+          color: 'var(--color-text-2)',
+          textTransform: 'uppercase',
+          letterSpacing: '0.04em',
+        }}
+      >
+        {title}
+      </span>
+      {children}
+    </section>
+  );
+}
+
+function JobRow({ job }: { job: DownloadJob }) {
+  const { t } = useTranslation();
+  const navigate = useNavigate();
+  const [cancel, { isLoading: cancelling }] = useCancelDownloadMutation();
+  const [retry, { isLoading: retrying }] = useRetryDownloadMutation();
+
+  const badge = STATUS_BADGE[job.status];
+  const label = job.query || job.sourceId || job.source;
+  const added = formatDateTime(job.createdAt);
+
+  return (
+    <div
+      style={{
+        display: 'flex',
+        flexDirection: 'column',
+        gap: '0.5rem',
+        padding: '0.75rem',
+        border: '1px solid var(--color-border)',
+        borderRadius: 8,
+        background: 'var(--color-surface-1)',
+      }}
+    >
+      <div style={{ display: 'flex', alignItems: 'center', gap: '0.75rem' }}>
+        <div style={{ flex: 1, minWidth: 0 }}>
+          <div
+            style={{
+              fontSize: '0.9375rem',
+              fontWeight: 600,
+              overflow: 'hidden',
+              textOverflow: 'ellipsis',
+              whiteSpace: 'nowrap',
+            }}
+            title={label}
+          >
+            {label}
+          </div>
+          <div style={{ fontSize: '0.75rem', color: 'var(--color-text-3)' }}>
+            {job.source}
+            {job.retryCount > 0 &&
+              ` · ${t('downloads.attempt', { count: job.retryCount + 1 })}`}
+            {added && ` · ${added}`}
+          </div>
+        </div>
+
+        <Badge variant={badge.variant} dot>
+          {t(badge.key)}
+        </Badge>
+
+        {job.status === 'done' && job.trackId && (
+          <Button
+            variant="ghost"
+            size="sm"
+            type="button"
+            onClick={() => void navigate(`/tracks/${job.trackId}/metadata`)}
+          >
+            {t('downloads.open')}
+          </Button>
+        )}
+        {job.status === 'failed' && (
+          <Button
+            variant="ghost"
+            size="sm"
+            type="button"
+            disabled={retrying}
+            onClick={() => void retry(job.id)}
+          >
+            <Icon name="arrows-clockwise" /> {t('downloads.retry')}
+          </Button>
+        )}
+        {isActive(job.status) && (
+          <Button
+            variant="ghost"
+            size="sm"
+            type="button"
+            disabled={cancelling}
+            onClick={() => void cancel(job.id)}
+            title={t('downloads.cancel')}
+          >
+            <Icon name="x" />
+          </Button>
+        )}
+      </div>
+
+      {job.status === 'downloading' && (
+        <Progress value={Math.round(job.progress * 100)} />
+      )}
+      {job.status === 'failed' && job.errorMessage && (
+        <div style={{ fontSize: '0.75rem', color: 'var(--color-text-3)' }}>
+          {job.errorMessage}
+        </div>
+      )}
     </div>
   );
 }

src/features/library/LibraryPage.tsx

@@ -1,13 +1,14 @@
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
 import { useNavigate } from 'react-router';
 import { useTranslation } from 'react-i18next';
 import {
   Tabs,
   TabsList,
   TabsContent,
-  SearchField,
   ScrollArea,
   Card,
+  TextField,
+  Callout,
 } from '@olly/modern-sk';
 import {
   useGetTracksQuery,
@@ -18,11 +19,32 @@ import { TrackRow } from '../../components/track/TrackRow';
 import { LoadingSkeleton } from '../../components/common/LoadingSkeleton';
 import { EmptyState } from '../../components/common/EmptyState';
 import { ErrorState } from '../../components/common/ErrorState';
-import { useAppDispatch } from '../../hooks/useAppDispatch';
+import { useAppDispatch, useAppSelector } from '../../hooks/useAppDispatch';
+import { useIsOffline } from '../../hooks/useConnectionStatus';
+import {
+  selectLocalTracks,
+  selectLocalAlbums,
+  selectLocalArtists,
+} from '../../store/selectors/localLibrary';
 import { setQueue } from '../../store/slices/queue';
 import type { Track, Album, Artist } from '../../api/types';
-import { getCoverUrl } from '../../api/endpoints/streaming';
+import { getCoverUrl, getAlbumCoverUrl } from '../../api/endpoints/streaming';
 import { formatDuration } from '../../lib/format';
+import { useDebounce } from 'use-debounce';
+
+/** Case-insensitive substring match used for client-side search while offline
+ * (the server can't run the query, so we filter the locally-cached library). */
+function matchTrack(tr: Track, q: string): boolean {
+  return (
+    tr.title.toLowerCase().includes(q) ||
+    tr.artistName.toLowerCase().includes(q) ||
+    tr.albumTitle.toLowerCase().includes(q)
+  );
+}
+const matchAlbum = (a: Album, q: string): boolean =>
+  a.title.toLowerCase().includes(q) || a.artistName.toLowerCase().includes(q);
+const matchArtist = (a: Artist, q: string): boolean =>
+  a.name.toLowerCase().includes(q);
 
 export function LibraryPage() {
   const { t } = useTranslation();
@@ -30,10 +52,63 @@ export function LibraryPage() {
   const dispatch = useAppDispatch();
   const [tab, setTab] = useState('tracks');
   const [search, setSearch] = useState('');
+  const [debouncedSearch] = useDebounce(search, 300);
 
-  const tracksQuery = useGetTracksQuery(search ? { search } : undefined);
-  const albumsQuery = useGetAlbumsQuery(search ? { search } : undefined);
-  const artistsQuery = useGetArtistsQuery(search ? { search } : undefined);
+  // Poll while any listed track is still being enriched, then stop. Enrichment
+  // runs asynchronously in a worker after import/upload; without this the row
+  // stays stuck on "Identifying metadata…" until something else invalidates the
+  // Track tag. Cleared to 0 once nothing is pending (and while offline).
+  const [tracksPollMs, setTracksPollMs] = useState(0);
+  const tracksQuery = useGetTracksQuery(
+    debouncedSearch ? { search } : undefined,
+    { pollingInterval: tracksPollMs },
+  );
+  const albumsQuery = useGetAlbumsQuery(
+    debouncedSearch ? { search } : undefined,
+  );
+  const artistsQuery = useGetArtistsQuery(
+    debouncedSearch ? { search } : undefined,
+  );
+
+  // Offline fallback: when the backend is unreachable, compose the library from
+  // whatever the RTKQ cache holds locally (rehydrated last-seen + this session),
+  // filtering client-side since the server can't run the search.
+  const offline = useIsOffline();
+  const localTracks = useAppSelector(selectLocalTracks);
+  const localAlbums = useAppSelector(selectLocalAlbums);
+  const localArtists = useAppSelector(selectLocalArtists);
+  const q = debouncedSearch.trim().toLowerCase();
+
+  const anyPending =
+    !offline &&
+    (tracksQuery.data?.items.some((tr) => tr.metadataStatus === 'pending') ??
+      false);
+  useEffect(() => {
+    setTracksPollMs(anyPending ? 4000 : 0);
+  }, [anyPending]);
+
+  // Live server data wins; offline we fall back to the locally-composed list.
+  const tracksToShow =
+    tracksQuery.data?.items ??
+    (offline
+      ? q
+        ? localTracks.filter((tr) => matchTrack(tr, q))
+        : localTracks
+      : undefined);
+  const albumsToShow =
+    albumsQuery.data?.items ??
+    (offline
+      ? q
+        ? localAlbums.filter((a) => matchAlbum(a, q))
+        : localAlbums
+      : undefined);
+  const artistsToShow =
+    artistsQuery.data?.items ??
+    (offline
+      ? q
+        ? localArtists.filter((a) => matchArtist(a, q))
+        : localArtists
+      : undefined);
 
   const handlePlayAll = (tracks: Track[]) => {
     dispatch(
@@ -68,15 +143,20 @@ export function LibraryPage() {
           {t('library.title')}
         </h2>
         <div style={{ flex: 1, maxWidth: '20rem' }}>
-          <SearchField
+          <TextField
             value={search}
             onChange={(e) => setSearch(e.target.value)}
             placeholder={t('library.searchPlaceholder')}
-            icon="⌕"
           />
         </div>
       </div>
 
+      {offline && (
+        <div style={{ padding: '0.75rem 1.5rem 0', flexShrink: 0 }}>
+          <Callout variant="info">{t('library.offline.banner')}</Callout>
+        </div>
+      )}
+
       <Tabs
         value={tab}
         onValueChange={setTab}
@@ -105,22 +185,28 @@ export function LibraryPage() {
 
         <TabsContent value="tracks" style={{ flex: 1, overflow: 'hidden' }}>
           <ScrollArea style={{ height: '100%' }}>
-            {tracksQuery.isLoading && <LoadingSkeleton rows={12} />}
-            {tracksQuery.isError && (
+            {!tracksToShow && tracksQuery.isLoading && (
+              <LoadingSkeleton rows={12} />
+            )}
+            {!tracksToShow && !offline && tracksQuery.isError && (
               <ErrorState onRetry={() => tracksQuery.refetch()} />
             )}
-            {tracksQuery.data && tracksQuery.data.items.length === 0 && (
+            {tracksToShow && tracksToShow.length === 0 && (
               <EmptyState
                 icon="♫"
-                title={t('library.empty.tracks.title')}
-                description={t('library.empty.tracks.description')}
+                title={t(
+                  offline
+                    ? 'library.offline.emptyTitle'
+                    : 'library.empty.tracks.title',
+                )}
+                description={t(
+                  offline
+                    ? 'library.offline.emptyDesc'
+                    : 'library.empty.tracks.description',
+                )}
               />
             )}
-            {tracksQuery.data &&
-              tracksQuery.data.items.length > 0 &&
-              (() => {
-                const data = tracksQuery.data!;
-                return (
+            {tracksToShow && tracksToShow.length > 0 && (
               <div>
                 <div
                   style={{
@@ -132,7 +218,7 @@ export function LibraryPage() {
                   }}
                 >
                   <button
-                        onClick={() => handlePlayAll(data.items)}
+                    onClick={() => handlePlayAll(tracksToShow)}
                     style={{
                       background: 'none',
                       border: 'none',
@@ -142,37 +228,41 @@ export function LibraryPage() {
                       fontWeight: 500,
                     }}
                   >
-                        {t('library.playAll', { count: data.total })}
+                    {t('library.playAll', { count: tracksToShow.length })}
                   </button>
                 </div>
-                    {data.items.map((track, i) => (
-                      <TrackRow
-                        key={track.id}
-                        track={track}
-                        index={i}
-                        showAlbum
-                      />
+                {tracksToShow.map((track, i) => (
+                  <TrackRow key={track.id} track={track} index={i} showAlbum />
                 ))}
               </div>
-                );
-              })()}
+            )}
           </ScrollArea>
         </TabsContent>
 
         <TabsContent value="albums" style={{ flex: 1, overflow: 'hidden' }}>
           <ScrollArea style={{ height: '100%' }}>
-            {albumsQuery.isLoading && <LoadingSkeleton rows={8} height={72} />}
-            {albumsQuery.isError && (
+            {!albumsToShow && albumsQuery.isLoading && (
+              <LoadingSkeleton rows={8} height={72} />
+            )}
+            {!albumsToShow && !offline && albumsQuery.isError && (
               <ErrorState onRetry={() => albumsQuery.refetch()} />
             )}
-            {albumsQuery.data && albumsQuery.data.items.length === 0 && (
+            {albumsToShow && albumsToShow.length === 0 && (
               <EmptyState
                 icon="💿"
-                title={t('library.empty.albums.title')}
-                description={t('library.empty.albums.description')}
+                title={t(
+                  offline
+                    ? 'library.offline.emptyTitle'
+                    : 'library.empty.albums.title',
+                )}
+                description={t(
+                  offline
+                    ? 'library.offline.emptyDesc'
+                    : 'library.empty.albums.description',
+                )}
               />
             )}
-            {albumsQuery.data && (
+            {albumsToShow && albumsToShow.length > 0 && (
               <div
                 style={{
                   display: 'grid',
@@ -181,7 +271,7 @@ export function LibraryPage() {
                   padding: '1.25rem 1.5rem',
                 }}
               >
-                {albumsQuery.data.items.map((album) => (
+                {albumsToShow.map((album) => (
                   <AlbumCard
                     key={album.id}
                     album={album}
@@ -195,21 +285,35 @@ export function LibraryPage() {
 
         <TabsContent value="artists" style={{ flex: 1, overflow: 'hidden' }}>
           <ScrollArea style={{ height: '100%' }}>
-            {artistsQuery.isLoading && <LoadingSkeleton rows={8} />}
-            {artistsQuery.isError && (
+            {!artistsToShow && artistsQuery.isLoading && (
+              <LoadingSkeleton rows={8} />
+            )}
+            {!artistsToShow && !offline && artistsQuery.isError && (
               <ErrorState onRetry={() => artistsQuery.refetch()} />
             )}
-            {artistsQuery.data && artistsQuery.data.items.length === 0 && (
+            {artistsToShow && artistsToShow.length === 0 && (
               <EmptyState
                 icon="🎤"
-                title={t('library.empty.artists.title')}
-                description={t('library.empty.artists.description')}
+                title={t(
+                  offline
+                    ? 'library.offline.emptyTitle'
+                    : 'library.empty.artists.title',
+                )}
+                description={t(
+                  offline
+                    ? 'library.offline.emptyDesc'
+                    : 'library.empty.artists.description',
+                )}
               />
             )}
-            {artistsQuery.data && (
+            {artistsToShow && artistsToShow.length > 0 && (
               <div style={{ padding: '0.5rem 0' }}>
-                {artistsQuery.data.items.map((artist) => (
-                  <ArtistRow key={artist.id} artist={artist} />
+                {artistsToShow.map((artist) => (
+                  <ArtistRow
+                    key={artist.id}
+                    artist={artist}
+                    onClick={() => void navigate(`/artists/${artist.id}`)}
+                  />
                 ))}
               </div>
             )}
@@ -222,7 +326,12 @@ export function LibraryPage() {
 
 function AlbumCard({ album, onClick }: { album: Album; onClick: () => void }) {
   const { t } = useTranslation();
-  const artUrl = getCoverUrl(album.artUrl);
+  const token = useAppSelector((s) => s.auth.accessToken);
+  // The album record has no cover URL; build one from `hasCover` (served by
+  // GET /albums/{id}/cover, token in the query — <img> can't send a header).
+  const artUrl =
+    getCoverUrl(album.artUrl) ??
+    (token ? getAlbumCoverUrl(album.id, token, album.hasCover) : undefined);
   return (
     <Card
       onClick={onClick}
@@ -295,15 +404,23 @@ function AlbumCard({ album, onClick }: { album: Album; onClick: () => void }) {
   );
 }
 
-function ArtistRow({ artist }: { artist: Artist }) {
+function ArtistRow({
+  artist,
+  onClick,
+}: {
+  artist: Artist;
+  onClick: () => void;
+}) {
   const { t } = useTranslation();
   return (
     <div
+      onClick={onClick}
       style={{
         display: 'flex',
         alignItems: 'center',
         gap: '0.75rem',
         padding: '0.5rem 1.5rem',
+        cursor: 'pointer',
       }}
     >
       <div

src/features/metadata-editor/MetadataEditorPage.tsx

@@ -1,4 +1,25 @@
+import { useEffect, useState } from 'react';
+import { useParams, useNavigate } from 'react-router';
 import { useTranslation } from 'react-i18next';
+import {
+  Badge,
+  Button,
+  Callout,
+  Card,
+  IconButton,
+  ScrollArea,
+  Spinner,
+  TextField,
+} from '@olly/modern-sk';
+import {
+  useApplyMetadataMutation,
+  useEnrichTrackMutation,
+  useGetTrackQuery,
+  useLazyGetMetadataMatchesQuery,
+} from '../../api/endpoints/library';
+import type { MetadataMatch } from '../../api/types';
+import { LoadingSkeleton } from '../../components/common/LoadingSkeleton';
+import { ErrorState } from '../../components/common/ErrorState';
 import { Placeholder } from '../../components/common/Placeholder';
 
 interface Props {
@@ -6,13 +27,565 @@ interface Props {
   batch?: boolean;
 }
 
+/** Editable fields, kept as strings while in the form — parsed on save. */
+interface FormState {
+  title: string;
+  artistName: string;
+  albumTitle: string;
+  year: string;
+  genre: string;
+  trackNumber: string;
+}
+
+const EMPTY_FORM: FormState = {
+  title: '',
+  artistName: '',
+  albumTitle: '',
+  year: '',
+  genre: '',
+  trackNumber: '',
+};
+
+const labelStyle: React.CSSProperties = {
+  display: 'block',
+  fontSize: '0.8125rem',
+  fontWeight: 500,
+  marginBottom: '0.375rem',
+  color: 'var(--color-text-2)',
+};
+
+function fieldStyle(): React.CSSProperties {
+  return { width: '100%' };
+}
+
 /**
- * `/tracks/:trackId/metadata` (single) and `/metadata/batch` (bulk) — A7
- * metadata editor with auto-enrichment / diff view. Scaffold only.
+ * `/tracks/:trackId/metadata` — A7 metadata editor: manual edits + AcoustID
+ * match picker with a current-vs-proposed diff. `/metadata/batch` is deferred.
  */
 export function MetadataEditorPage({ batch = false }: Props) {
   const { t } = useTranslation();
+
+  if (batch) {
+    return <Placeholder title={t('pages.metadataBatch')} />;
+  }
+
+  return <SingleTrackEditor />;
+}
+
+function SingleTrackEditor() {
+  const { t } = useTranslation();
+  const navigate = useNavigate();
+  const { trackId } = useParams<{ trackId: string }>();
+
+  const trackQuery = useGetTrackQuery(trackId ?? '', { skip: !trackId });
+  const [findMatches, matchesResult] = useLazyGetMetadataMatchesQuery();
+  const [applyMetadata, applyResult] = useApplyMetadataMutation();
+  const [enrichTrack, enrichResult] = useEnrichTrackMutation();
+
+  const [form, setForm] = useState<FormState>(EMPTY_FORM);
+  const [initialized, setInitialized] = useState(false);
+  const [selectedMatch, setSelectedMatch] = useState<MetadataMatch | null>(
+    null,
+  );
+
+  // Seed the form from the loaded track exactly once — afterwards it's the
+  // user's edit buffer and shouldn't be clobbered by refetches.
+  useEffect(() => {
+    if (initialized || !trackQuery.data) return;
+    const track = trackQuery.data;
+    setForm({
+      title: track.title,
+      artistName: track.artistName,
+      albumTitle: track.albumTitle,
+      year: track.year != null ? String(track.year) : '',
+      genre: track.genre ?? '',
+      trackNumber: track.trackNumber != null ? String(track.trackNumber) : '',
+    });
+    setInitialized(true);
+  }, [initialized, trackQuery.data]);
+
+  if (!trackId) {
+    return <ErrorState message={t('metadataEditor.error')} />;
+  }
+
+  if (trackQuery.isLoading || !initialized) {
     return (
-    <Placeholder title={batch ? t('pages.metadataBatch') : t('pages.metadata')} />
+      <div style={{ padding: '1.5rem' }}>
+        <LoadingSkeleton rows={6} />
+      </div>
+    );
+  }
+
+  if (trackQuery.isError || !trackQuery.data) {
+    return (
+      <ErrorState
+        message={t('metadataEditor.error')}
+        onRetry={() => trackQuery.refetch()}
+      />
+    );
+  }
+
+  const track = trackQuery.data;
+
+  const updateField = (key: keyof FormState) => (value: string) =>
+    setForm((prev) => ({ ...prev, [key]: value }));
+
+  const applyMatch = (match: MetadataMatch) => {
+    setForm((prev) => ({
+      ...prev,
+      title: match.title ?? prev.title,
+      artistName: match.artist ?? prev.artistName,
+      albumTitle: match.album ?? prev.albumTitle,
+      year: match.year != null ? String(match.year) : prev.year,
+    }));
+    setSelectedMatch(null);
+  };
+
+  const handleSave = async () => {
+    await applyMetadata({
+      trackId,
+      edit: {
+        title: form.title.trim() || undefined,
+        artistName: form.artistName.trim() || undefined,
+        albumTitle: form.albumTitle.trim() || undefined,
+        year: form.year.trim() ? Number(form.year) : undefined,
+        genre: form.genre.trim() || undefined,
+        trackNumber: form.trackNumber.trim()
+          ? Number(form.trackNumber)
+          : undefined,
+      },
+    }).unwrap();
+  };
+
+  return (
+    <div style={{ display: 'flex', flexDirection: 'column', height: '100%' }}>
+      <div
+        style={{
+          padding: '1.25rem 1.5rem',
+          borderBottom: '1px solid var(--color-border)',
+          display: 'flex',
+          alignItems: 'center',
+          gap: '1rem',
+          flexShrink: 0,
+        }}
+      >
+        <IconButton
+          variant="ghost"
+          size="sm"
+          onClick={() => navigate(-1)}
+          aria-label={t('common.back')}
+        >
+          ←
+        </IconButton>
+        <div style={{ flex: 1, minWidth: 0 }}>
+          <h2 style={{ margin: 0, fontSize: '1.125rem', fontWeight: 700 }}>
+            {t('pages.metadata')}
+          </h2>
+          <p
+            style={{
+              margin: '0.125rem 0 0',
+              fontSize: '0.8125rem',
+              color: 'var(--color-text-3)',
+              overflow: 'hidden',
+              textOverflow: 'ellipsis',
+              whiteSpace: 'nowrap',
+            }}
+          >
+            {track.artistName} · {track.title}
+          </p>
+        </div>
+      </div>
+
+      <ScrollArea style={{ flex: 1 }}>
+        <div
+          style={{
+            padding: '1.5rem',
+            display: 'flex',
+            flexDirection: 'column',
+            gap: '1.25rem',
+            maxWidth: 640,
+          }}
+        >
+          {applyResult.isSuccess && (
+            <Callout variant="success">{t('metadataEditor.saved')}</Callout>
+          )}
+          {applyResult.isError && (
+            <Callout variant="danger">{t('metadataEditor.saveError')}</Callout>
+          )}
+
+          <Card>
+            <div
+              style={{
+                padding: '1.25rem',
+                display: 'flex',
+                flexDirection: 'column',
+                gap: '1rem',
+              }}
+            >
+              <div>
+                <label style={labelStyle}>
+                  {t('metadataEditor.fields.title')}
+                </label>
+                <TextField
+                  style={fieldStyle()}
+                  value={form.title}
+                  onChange={(e) => updateField('title')(e.target.value)}
+                />
+              </div>
+              <div>
+                <label style={labelStyle}>
+                  {t('metadataEditor.fields.artist')}
+                </label>
+                <TextField
+                  style={fieldStyle()}
+                  value={form.artistName}
+                  onChange={(e) => updateField('artistName')(e.target.value)}
+                />
+              </div>
+              <div>
+                <label style={labelStyle}>
+                  {t('metadataEditor.fields.album')}
+                </label>
+                <TextField
+                  style={fieldStyle()}
+                  value={form.albumTitle}
+                  onChange={(e) => updateField('albumTitle')(e.target.value)}
+                />
+              </div>
+              <div style={{ display: 'flex', gap: '1rem' }}>
+                <div style={{ flex: 1 }}>
+                  <label style={labelStyle}>
+                    {t('metadataEditor.fields.year')}
+                  </label>
+                  <TextField
+                    style={fieldStyle()}
+                    type="number"
+                    value={form.year}
+                    onChange={(e) => updateField('year')(e.target.value)}
+                  />
+                </div>
+                <div style={{ flex: 1 }}>
+                  <label style={labelStyle}>
+                    {t('metadataEditor.fields.trackNumber')}
+                  </label>
+                  <TextField
+                    style={fieldStyle()}
+                    type="number"
+                    value={form.trackNumber}
+                    onChange={(e) => updateField('trackNumber')(e.target.value)}
+                  />
+                </div>
+              </div>
+              <div>
+                <label style={labelStyle}>
+                  {t('metadataEditor.fields.genre')}
+                </label>
+                <TextField
+                  style={fieldStyle()}
+                  value={form.genre}
+                  onChange={(e) => updateField('genre')(e.target.value)}
+                />
+              </div>
+
+              <div
+                style={{
+                  display: 'flex',
+                  gap: '0.5rem',
+                  justifyContent: 'flex-end',
+                }}
+              >
+                <Button
+                  variant="primary"
+                  onClick={() => void handleSave()}
+                  disabled={applyResult.isLoading}
+                >
+                  {applyResult.isLoading ? (
+                    <Spinner size="sm" />
+                  ) : (
+                    t('metadataEditor.save')
+                  )}
+                </Button>
+              </div>
+            </div>
+          </Card>
+
+          <Card>
+            <div
+              style={{
+                padding: '1.25rem',
+                display: 'flex',
+                flexDirection: 'column',
+                gap: '1rem',
+              }}
+            >
+              <div
+                style={{
+                  display: 'flex',
+                  alignItems: 'center',
+                  justifyContent: 'space-between',
+                  gap: '0.75rem',
+                }}
+              >
+                <div>
+                  <div style={{ fontWeight: 600, fontSize: '0.9375rem' }}>
+                    {t('metadataEditor.autoEnrich.title')}
+                  </div>
+                  <div
+                    style={{
+                      fontSize: '0.8125rem',
+                      color: 'var(--color-text-3)',
+                    }}
+                  >
+                    {t('metadataEditor.autoEnrich.hint')}
+                  </div>
+                </div>
+                <div style={{ display: 'flex', gap: '0.5rem', flexShrink: 0 }}>
+                  <Button
+                    variant="ghost"
+                    size="sm"
+                    onClick={() => void enrichTrack(trackId)}
+                    disabled={enrichResult.isLoading}
+                  >
+                    {enrichResult.isLoading ? (
+                      <Spinner size="sm" />
+                    ) : (
+                      t('metadataEditor.autoEnrich.reEnrich')
+                    )}
+                  </Button>
+                  <Button
+                    variant="primary"
+                    size="sm"
+                    onClick={() => void findMatches(trackId)}
+                    disabled={matchesResult.isFetching}
+                  >
+                    {matchesResult.isFetching ? (
+                      <Spinner size="sm" />
+                    ) : (
+                      t('metadataEditor.autoEnrich.findMatches')
+                    )}
+                  </Button>
+                </div>
+              </div>
+
+              {enrichResult.isSuccess && (
+                <Callout variant="info">
+                  {t('metadataEditor.autoEnrich.enqueued')}
+                </Callout>
+              )}
+
+              {matchesResult.isError && (
+                <Callout variant="danger">
+                  {t('metadataEditor.autoEnrich.error')}
+                </Callout>
+              )}
+
+              {matchesResult.isSuccess &&
+                matchesResult.data &&
+                (matchesResult.data.length === 0 ? (
+                  <Callout variant="warning">
+                    {t('metadataEditor.autoEnrich.noMatches')}
+                  </Callout>
+                ) : (
+                  <div
+                    style={{
+                      display: 'flex',
+                      flexDirection: 'column',
+                      gap: '0.5rem',
+                    }}
+                  >
+                    {matchesResult.data.map((match) => (
+                      <MatchRow
+                        key={match.acoustid}
+                        match={match}
+                        onUse={() => setSelectedMatch(match)}
+                      />
+                    ))}
+                  </div>
+                ))}
+
+              {selectedMatch && (
+                <DiffView
+                  current={form}
+                  proposed={selectedMatch}
+                  onApply={() => applyMatch(selectedMatch)}
+                  onCancel={() => setSelectedMatch(null)}
+                />
+              )}
+            </div>
+          </Card>
+        </div>
+      </ScrollArea>
+    </div>
+  );
+}
+
+function MatchRow({
+  match,
+  onUse,
+}: {
+  match: MetadataMatch;
+  onUse: () => void;
+}) {
+  const { t } = useTranslation();
+  const pct = Math.round(match.score * 100);
+  return (
+    <div
+      style={{
+        display: 'flex',
+        alignItems: 'center',
+        gap: '0.75rem',
+        padding: '0.625rem 0.75rem',
+        border: '1px solid var(--color-border)',
+        borderRadius: 8,
+        background: 'var(--color-surface-1)',
+      }}
+    >
+      <Badge variant={pct >= 80 ? 'lime' : pct >= 50 ? 'outline' : 'neutral'}>
+        {pct}%
+      </Badge>
+      <div style={{ flex: 1, minWidth: 0 }}>
+        <div
+          style={{
+            fontSize: '0.875rem',
+            fontWeight: 500,
+            overflow: 'hidden',
+            textOverflow: 'ellipsis',
+            whiteSpace: 'nowrap',
+          }}
+        >
+          {match.title ?? t('metadataEditor.matches.unknownTitle')}
+        </div>
+        <div
+          style={{
+            fontSize: '0.8125rem',
+            color: 'var(--color-text-3)',
+            overflow: 'hidden',
+            textOverflow: 'ellipsis',
+            whiteSpace: 'nowrap',
+          }}
+        >
+          {[match.artist, match.album, match.year]
+            .filter((v) => v !== undefined && v !== null && v !== '')
+            .join(' · ')}
+        </div>
+      </div>
+      <Button variant="ghost" size="sm" onClick={onUse}>
+        {t('metadataEditor.matches.use')}
+      </Button>
+    </div>
+  );
+}
+
+interface DiffRowDef {
+  key: 'title' | 'artistName' | 'albumTitle' | 'year';
+  label: string;
+  current: string;
+  proposed?: string;
+}
+
+function DiffView({
+  current,
+  proposed,
+  onApply,
+  onCancel,
+}: {
+  current: FormState;
+  proposed: MetadataMatch;
+  onApply: () => void;
+  onCancel: () => void;
+}) {
+  const { t } = useTranslation();
+
+  const rows: DiffRowDef[] = [
+    {
+      key: 'title',
+      label: t('metadataEditor.fields.title'),
+      current: current.title,
+      proposed: proposed.title,
+    },
+    {
+      key: 'artistName',
+      label: t('metadataEditor.fields.artist'),
+      current: current.artistName,
+      proposed: proposed.artist,
+    },
+    {
+      key: 'albumTitle',
+      label: t('metadataEditor.fields.album'),
+      current: current.albumTitle,
+      proposed: proposed.album,
+    },
+    {
+      key: 'year',
+      label: t('metadataEditor.fields.year'),
+      current: current.year,
+      proposed: proposed.year != null ? String(proposed.year) : undefined,
+    },
+  ];
+
+  const changed = rows.filter(
+    (row) => row.proposed !== undefined && row.proposed !== row.current,
+  );
+
+  return (
+    <div
+      style={{
+        border: '1px solid var(--color-border)',
+        borderRadius: 8,
+        padding: '0.875rem 1rem',
+        display: 'flex',
+        flexDirection: 'column',
+        gap: '0.625rem',
+        background: 'var(--color-surface-1)',
+      }}
+    >
+      <div style={{ fontWeight: 600, fontSize: '0.875rem' }}>
+        {t('metadataEditor.diff.title')}
+      </div>
+      {changed.length === 0 ? (
+        <div style={{ fontSize: '0.8125rem', color: 'var(--color-text-3)' }}>
+          {t('metadataEditor.diff.noChanges')}
+        </div>
+      ) : (
+        <div
+          style={{ display: 'flex', flexDirection: 'column', gap: '0.375rem' }}
+        >
+          {changed.map((row) => (
+            <div key={row.key} style={{ fontSize: '0.8125rem' }}>
+              <span style={{ color: 'var(--color-text-3)' }}>
+                {row.label}:{' '}
+              </span>
+              <span
+                style={{
+                  textDecoration: 'line-through',
+                  color: 'var(--color-text-3)',
+                }}
+              >
+                {row.current || '—'}
+              </span>
+              {' → '}
+              <span style={{ color: 'var(--color-accent)', fontWeight: 600 }}>
+                {row.proposed || '—'}
+              </span>
+            </div>
+          ))}
+        </div>
+      )}
+      <div
+        style={{ display: 'flex', gap: '0.5rem', justifyContent: 'flex-end' }}
+      >
+        <Button variant="ghost" size="sm" onClick={onCancel}>
+          {t('metadataEditor.diff.cancel')}
+        </Button>
+        <Button
+          variant="primary"
+          size="sm"
+          onClick={onApply}
+          disabled={changed.length === 0}
+        >
+          {t('metadataEditor.diff.apply')}
+        </Button>
+      </div>
+    </div>
   );
 }

src/features/search-download/SearchDownloadPage.tsx

@@ -1,13 +1,358 @@
+import { useState } from 'react';
+import { useNavigate } from 'react-router';
 import { useTranslation } from 'react-i18next';
-import { Window } from '@olly/modern-sk';
+import {
+  Badge,
+  Button,
+  Callout,
+  ScrollArea,
+  SearchField,
+  SegmentedControl,
+  Spinner,
+} from '@olly/modern-sk';
+import {
+  useGetSourcesQuery,
+  useLazySearchExternalQuery,
+} from '../../api/endpoints/search';
+import { useCreateDownloadMutation } from '../../api/endpoints/downloads';
+import { Icon } from '../../components/common/Icon';
+import { EmptyState } from '../../components/common/EmptyState';
+import { ErrorState } from '../../components/common/ErrorState';
+import { LoadingSkeleton } from '../../components/common/LoadingSkeleton';
+import { formatDuration } from '../../lib/format';
+import type { ExternalSearchResult } from '../../api/types';
 
+const ALL = '__all__';
+
+/** Per-result download outcome, keyed by `${source}:${sourceId}`. */
+type RowState = 'idle' | 'pending' | 'queued' | 'inLibrary' | 'error';
+
+const rowKey = (r: ExternalSearchResult) => `${r.source}:${r.sourceId}`;
+
+/** `/discover` — A4: search external sources and download into the library. */
 export function SearchDownloadPage() {
   const { t } = useTranslation();
+  const navigate = useNavigate();
+
+  const sourcesQuery = useGetSourcesQuery();
+  const fetchSources = (sourcesQuery.data ?? []).filter(
+    (s) => s.kind === 'fetch',
+  );
+  const hasFetchSource = fetchSources.length > 0;
+
+  const [term, setTerm] = useState('');
+  const [source, setSource] = useState(ALL);
+  const [search, result] = useLazySearchExternalQuery();
+  const [createDownload] = useCreateDownloadMutation();
+
+  const [rowStates, setRowStates] = useState<Record<string, RowState>>({});
+  const [queuedAny, setQueuedAny] = useState(false);
+
+  const runSearch = (q: string) => {
+    if (!q) return;
+    setRowStates({});
+    void search({ q, source: source === ALL ? undefined : source, limit: 25 });
+  };
+
+  const onSubmit = (e: React.FormEvent) => {
+    e.preventDefault();
+    runSearch(term.trim());
+  };
+
+  const download = async (r: ExternalSearchResult) => {
+    const key = rowKey(r);
+    setRowStates((s) => ({ ...s, [key]: 'pending' }));
+    try {
+      const res = await createDownload({
+        source: r.source,
+        sourceId: r.sourceId,
+        query: term.trim() || undefined,
+      }).unwrap();
+      setRowStates((s) => ({
+        ...s,
+        [key]: res.alreadyInLibrary ? 'inLibrary' : 'queued',
+      }));
+      if (!res.alreadyInLibrary) setQueuedAny(true);
+    } catch {
+      setRowStates((s) => ({ ...s, [key]: 'error' }));
+    }
+  };
+
+  const pickerItems = [
+    { value: ALL, label: t('discover.allSources') },
+    ...fetchSources.map((s) => ({ value: s.name, label: s.label })),
+  ];
+
   return (
-    <div style={{ padding: '1.5rem' }}>
-      <Window title={t('pages.search')}>
-        <p style={{ color: 'var(--color-text-2)' }}>{t('common.comingSoon')}</p>
-      </Window>
+    <div style={{ display: 'flex', flexDirection: 'column', height: '100%' }}>
+      <header
+        style={{
+          padding: '1.25rem 1.5rem',
+          borderBottom: '1px solid var(--color-border)',
+          flexShrink: 0,
+          display: 'flex',
+          flexDirection: 'column',
+          gap: '0.875rem',
+        }}
+      >
+        <div
+          style={{
+            display: 'flex',
+            alignItems: 'baseline',
+            justifyContent: 'space-between',
+            gap: '1rem',
+          }}
+        >
+          <div>
+            <h2 style={{ margin: 0, fontSize: '1.125rem', fontWeight: 700 }}>
+              {t('discover.title')}
+            </h2>
+            <p
+              style={{
+                margin: '0.25rem 0 0',
+                fontSize: '0.8125rem',
+                color: 'var(--color-text-3)',
+              }}
+            >
+              {t('discover.subtitle')}
+            </p>
+          </div>
+          {queuedAny && (
+            <Button
+              variant="ghost"
+              size="sm"
+              type="button"
+              onClick={() => void navigate('/downloads')}
+            >
+              <Icon name="arrow-circle-down" /> {t('discover.viewDownloads')}
+            </Button>
+          )}
+        </div>
+
+        <form
+          onSubmit={onSubmit}
+          style={{ display: 'flex', gap: '0.625rem', alignItems: 'center' }}
+        >
+          <div style={{ flex: 1 }}>
+            <SearchField
+              icon={<Icon name="magnifying-glass" />}
+              placeholder={t('discover.searchPlaceholder')}
+              value={term}
+              onChange={(e) => setTerm(e.target.value)}
+              disabled={!hasFetchSource}
+            />
+          </div>
+          <Button
+            variant="primary"
+            type="submit"
+            disabled={!hasFetchSource || !term.trim()}
+          >
+            {t('discover.searchButton')}
+          </Button>
+        </form>
+
+        {fetchSources.length > 1 && (
+          <SegmentedControl
+            value={source}
+            onValueChange={setSource}
+            items={pickerItems}
+          />
+        )}
+      </header>
+
+      <ScrollArea style={{ flex: 1 }}>
+        <div style={{ padding: '1.5rem', maxWidth: 880, margin: '0 auto' }}>
+          {!sourcesQuery.isLoading && !hasFetchSource && (
+            <Callout variant="warning">{t('discover.noSources')}</Callout>
+          )}
+
+          {result.isFetching && <LoadingSkeleton rows={6} height={64} />}
+
+          {result.isError && !result.isFetching && (
+            <ErrorState
+              message={t('discover.searchError')}
+              onRetry={() => runSearch(term.trim())}
+            />
+          )}
+
+          {!result.isFetching &&
+            !result.isError &&
+            result.data &&
+            result.data.results.length === 0 && (
+              <EmptyState
+                icon={<Icon name="magnifying-glass" />}
+                title={t('discover.emptyTitle')}
+                description={t('discover.emptyDesc')}
+              />
+            )}
+
+          {result.isUninitialized && hasFetchSource && (
+            <EmptyState
+              icon={<Icon name="magnifying-glass" />}
+              title={t('discover.startTitle')}
+              description={t('discover.startDesc')}
+            />
+          )}
+
+          {!result.isFetching &&
+            result.data &&
+            result.data.results.length > 0 && (
+              <div
+                style={{
+                  display: 'flex',
+                  flexDirection: 'column',
+                  gap: '0.5rem',
+                }}
+              >
+                {result.data.results.map((r) => (
+                  <ResultRow
+                    key={rowKey(r)}
+                    result={r}
+                    state={rowStates[rowKey(r)] ?? 'idle'}
+                    onDownload={() => void download(r)}
+                  />
+                ))}
+              </div>
+            )}
+        </div>
+      </ScrollArea>
+    </div>
+  );
+}
+
+function ResultRow({
+  result,
+  state,
+  onDownload,
+}: {
+  result: ExternalSearchResult;
+  state: RowState;
+  onDownload: () => void;
+}) {
+  const { t } = useTranslation();
+  return (
+    <div
+      style={{
+        display: 'flex',
+        alignItems: 'center',
+        gap: '0.875rem',
+        padding: '0.625rem 0.75rem',
+        border: '1px solid var(--color-border)',
+        borderRadius: 8,
+        background: 'var(--color-surface-1)',
+      }}
+    >
+      <Thumb url={result.thumbnailUrl} />
+
+      <div style={{ flex: 1, minWidth: 0 }}>
+        <div
+          style={{
+            fontSize: '0.9375rem',
+            fontWeight: 600,
+            overflow: 'hidden',
+            textOverflow: 'ellipsis',
+            whiteSpace: 'nowrap',
+          }}
+          title={result.title}
+        >
+          {result.title}
+        </div>
+        <div
+          style={{
+            fontSize: '0.8125rem',
+            color: 'var(--color-text-3)',
+            overflow: 'hidden',
+            textOverflow: 'ellipsis',
+            whiteSpace: 'nowrap',
+          }}
+        >
+          {[result.artist, result.album].filter(Boolean).join(' · ') ||
+            result.source}
+        </div>
+      </div>
+
+      {result.durationMs != null && (
+        <span
+          style={{
+            fontSize: '0.8125rem',
+            color: 'var(--color-text-3)',
+            fontVariantNumeric: 'tabular-nums',
+          }}
+        >
+          {formatDuration(result.durationMs)}
+        </span>
+      )}
+
+      <DownloadControl state={state} onDownload={onDownload} t={t} />
+    </div>
+  );
+}
+
+function DownloadControl({
+  state,
+  onDownload,
+  t,
+}: {
+  state: RowState;
+  onDownload: () => void;
+  t: (k: string) => string;
+}) {
+  if (state === 'inLibrary') {
+    return (
+      <Badge variant="outline" dot>
+        {t('discover.inLibrary')}
+      </Badge>
+    );
+  }
+  if (state === 'queued') {
+    return (
+      <Badge variant="lime" dot>
+        {t('discover.queued')}
+      </Badge>
+    );
+  }
+  if (state === 'pending') {
+    return (
+      <Button variant="ghost" size="sm" type="button" disabled>
+        <Spinner size="sm" />
+      </Button>
+    );
+  }
+  return (
+    <Button variant="primary" size="sm" type="button" onClick={onDownload}>
+      <Icon name="arrow-circle-down" />
+      {state === 'error' ? t('discover.retryDownload') : t('discover.download')}
+    </Button>
+  );
+}
+
+function Thumb({ url }: { url?: string }) {
+  return (
+    <div
+      style={{
+        width: 44,
+        height: 44,
+        borderRadius: 6,
+        flexShrink: 0,
+        overflow: 'hidden',
+        background: 'var(--color-surface-2)',
+        display: 'flex',
+        alignItems: 'center',
+        justifyContent: 'center',
+        color: 'var(--color-text-3)',
+      }}
+    >
+      {url ? (
+        <img
+          src={url}
+          alt=""
+          width={44}
+          height={44}
+          style={{ objectFit: 'cover', width: '100%', height: '100%' }}
+        />
+      ) : (
+        <Icon name="vinyl-record" />
+      )}
     </div>
   );
 }

src/features/settings/panels.tsx

@@ -4,7 +4,13 @@ import { Window, SegmentedControl, useTheme } from '@olly/modern-sk';
 import { SUPPORTED_LANGUAGES, setLanguage } from '../../i18n';
 
 /** Labelled settings row: caption on the left, control on the right. */
-function SettingRow({ label, children }: { label: string; children: ReactNode }) {
+function SettingRow({
+  label,
+  children,
+}: {
+  label: string;
+  children: ReactNode;
+}) {
   return (
     <div style={{ display: 'flex', alignItems: 'center', gap: '1rem' }}>
       <span

src/features/storage/StoragePage.tsx

@@ -1,13 +1,679 @@
+import type { ReactNode } from 'react';
 import { useTranslation } from 'react-i18next';
-import { Window } from '@olly/modern-sk';
+import { Window, Card, Badge, Callout } from '@olly/modern-sk';
+import { useGetStorageStatsQuery } from '../../api/endpoints/storage';
+import { LoadingSkeleton } from '../../components/common/LoadingSkeleton';
+import { EmptyState } from '../../components/common/EmptyState';
+import { ErrorState } from '../../components/common/ErrorState';
+import { Icon, type IconName } from '../../components/common/Icon';
+import { useAppSelector } from '../../hooks/useAppDispatch';
+import { useIsOffline } from '../../hooks/useConnectionStatus';
+import { useAudioCacheStats } from '../../hooks/useAudioCacheStats';
+import {
+  selectLocalTracks,
+  selectLocalAlbums,
+  selectLocalArtists,
+} from '../../store/selectors/localLibrary';
+import type { AudioCacheStats } from '../../lib/sw';
+import {
+  formatFileSize,
+  formatCount,
+  formatLongDuration,
+  formatDateTime,
+} from '../../lib/format';
+import type { StorageStats } from '../../api/types';
+
+// modern-sk Badge variants we map metadata-health buckets onto.
+const STATUS_VARIANT: Record<string, 'lime' | 'ember' | 'neutral' | 'outline'> =
+  {
+    enriched: 'lime',
+    manual: 'outline',
+    pending: 'neutral',
+    failed: 'ember',
+  };
 
 export function StoragePage() {
   const { t } = useTranslation();
+  const { data, isLoading, isError, refetch } = useGetStorageStatsQuery();
+  const offline = useIsOffline();
+
+  // Tier-3 audio cache + the locally-cached library metadata = "this device".
+  const audio = useAudioCacheStats();
+  const localTracks = useAppSelector(selectLocalTracks);
+  const localAlbums = useAppSelector(selectLocalAlbums);
+  const localArtists = useAppSelector(selectLocalArtists);
+
   return (
-    <div style={{ padding: '1.5rem' }}>
+    <div style={{ padding: '1.5rem', maxWidth: 1100, margin: '0 auto' }}>
       <Window title={t('pages.storage')}>
-        <p style={{ color: 'var(--color-text-2)' }}>{t('common.comingSoon')}</p>
+        <p style={{ color: 'var(--color-text-2)', marginTop: 0 }}>
+          {t('storage.subtitle')}
+        </p>
+
+        <div
+          style={{ display: 'flex', flexDirection: 'column', gap: '1.5rem' }}
+        >
+          {/* ── On this device (local + cached) ───────────────────────── */}
+          <div>
+            <SectionTitle icon="hard-drives">
+              {t('storage.device')}
+            </SectionTitle>
+            <div style={{ marginTop: '0.75rem' }}>
+              <LocalStoragePanel
+                audio={audio}
+                trackCount={localTracks.length}
+                albumCount={localAlbums.length}
+                artistCount={localArtists.length}
+              />
+            </div>
+          </div>
+
+          {/* ── On the server (remote) ────────────────────────────────── */}
+          <div>
+            <SectionTitle icon="cloud">{t('storage.server')}</SectionTitle>
+            <div style={{ marginTop: '0.75rem' }}>
+              {isLoading && <LoadingSkeleton rows={6} height={72} />}
+              {isError && offline && (
+                <Callout variant="info">
+                  {t('storage.serverUnreachable')}
+                </Callout>
+              )}
+              {isError && !offline && (
+                <ErrorState
+                  message={t('common.error')}
+                  onRetry={() => refetch()}
+                />
+              )}
+              {data && data.totalTracks === 0 && (
+                <EmptyState
+                  icon={<Icon name="hard-drives" />}
+                  title={t('storage.emptyTitle')}
+                  description={t('storage.emptyDesc')}
+                />
+              )}
+              {data && data.totalTracks > 0 && (
+                <StorageDashboard stats={data} />
+              )}
+            </div>
+          </div>
+        </div>
       </Window>
     </div>
   );
 }
+
+/** "On this device": the SW audio cache (downloaded audio) + the offline
+ * library metadata we can browse without the server. */
+function LocalStoragePanel({
+  audio,
+  trackCount,
+  albumCount,
+  artistCount,
+}: {
+  audio: AudioCacheStats | null;
+  trackCount: number;
+  albumCount: number;
+  artistCount: number;
+}) {
+  const { t } = useTranslation();
+  return (
+    <div
+      style={{
+        display: 'grid',
+        gridTemplateColumns: 'repeat(auto-fit, minmax(260px, 1fr))',
+        gap: '1rem',
+      }}
+    >
+      <Card style={{ padding: '1.25rem' }}>
+        <SectionTitle icon="arrow-circle-down">
+          {t('storage.audioCache')}
+        </SectionTitle>
+        {audio ? (
+          <>
+            <div
+              style={{
+                height: 12,
+                borderRadius: 999,
+                overflow: 'hidden',
+                background: 'var(--color-surface-3)',
+                marginTop: '0.75rem',
+              }}
+            >
+              <div
+                style={{
+                  width: `${audio.maxBytes > 0 ? Math.min((audio.bytes / audio.maxBytes) * 100, 100) : 0}%`,
+                  height: '100%',
+                  background: 'var(--color-accent)',
+                  transition: 'width 0.5s ease',
+                }}
+              />
+            </div>
+            <div
+              style={{
+                marginTop: '0.6rem',
+                fontSize: '0.85rem',
+                color: 'var(--color-text-2)',
+              }}
+            >
+              {t('storage.audioCacheUsage', {
+                used: formatFileSize(audio.bytes),
+                max: formatFileSize(audio.maxBytes),
+              })}
+            </div>
+            <div
+              style={{
+                marginTop: '0.25rem',
+                fontSize: '0.8rem',
+                color: 'var(--color-text-3)',
+              }}
+            >
+              {t('storage.cachedTracks', { n: audio.count })}
+            </div>
+          </>
+        ) : (
+          <p
+            style={{
+              margin: '0.75rem 0 0',
+              fontSize: '0.85rem',
+              color: 'var(--color-text-3)',
+            }}
+          >
+            {t('storage.audioCacheUnavailable')}
+          </p>
+        )}
+      </Card>
+
+      <Card style={{ padding: '1.25rem' }}>
+        <SectionTitle icon="vinyl-record">
+          {t('storage.offlineLibrary')}
+        </SectionTitle>
+        <p
+          style={{
+            margin: '0.75rem 0 0',
+            fontSize: '1.5rem',
+            fontWeight: 600,
+            color: 'var(--color-text-1)',
+            lineHeight: 1.1,
+          }}
+        >
+          {formatCount(trackCount)}
+        </p>
+        <div
+          style={{
+            marginTop: '0.35rem',
+            fontSize: '0.8rem',
+            color: 'var(--color-text-2)',
+          }}
+        >
+          {t('storage.offlineLibraryMeta', {
+            tracks: formatCount(trackCount),
+            albums: formatCount(albumCount),
+            artists: formatCount(artistCount),
+          })}
+        </div>
+      </Card>
+    </div>
+  );
+}
+
+function StorageDashboard({ stats }: { stats: StorageStats }) {
+  const { t } = useTranslation();
+  const avgSize = Math.round(stats.totalSize / Math.max(stats.totalTracks, 1));
+
+  return (
+    <div style={{ display: 'flex', flexDirection: 'column', gap: '1.5rem' }}>
+      {stats.disk && (
+        <DiskGauge disk={stats.disk} libraryBytes={stats.totalSize} />
+      )}
+
+      <div
+        style={{
+          display: 'grid',
+          gridTemplateColumns: 'repeat(auto-fit, minmax(150px, 1fr))',
+          gap: '0.75rem',
+        }}
+      >
+        <StatTile
+          icon="vinyl-record"
+          label={t('storage.tracks')}
+          value={formatCount(stats.totalTracks)}
+        />
+        <StatTile
+          icon="vinyl-record"
+          label={t('storage.artists')}
+          value={formatCount(stats.totalArtists)}
+        />
+        <StatTile
+          icon="vinyl-record"
+          label={t('storage.albums')}
+          value={formatCount(stats.totalAlbums)}
+        />
+        <StatTile
+          icon="play"
+          label={t('storage.playtime')}
+          value={formatLongDuration(stats.totalDurationSeconds)}
+        />
+        <StatTile
+          icon="hard-drives"
+          label={t('storage.footprint')}
+          value={formatFileSize(stats.totalSize)}
+        />
+        <StatTile
+          icon="hard-drives"
+          label={t('storage.avgTrackSize')}
+          value={formatFileSize(avgSize)}
+        />
+      </div>
+
+      {stats.byFormat.length > 0 && <FormatBars stats={stats} />}
+
+      <div
+        style={{
+          display: 'grid',
+          gridTemplateColumns: 'repeat(auto-fit, minmax(260px, 1fr))',
+          gap: '1rem',
+        }}
+      >
+        <MetadataHealth stats={stats} />
+        <Sources stats={stats} />
+      </div>
+
+      {stats.topGenres.length > 0 && <TopGenres stats={stats} />}
+
+      <FunFacts stats={stats} avgSize={avgSize} />
+    </div>
+  );
+}
+
+function DiskGauge({
+  disk,
+  libraryBytes,
+}: {
+  disk: NonNullable<StorageStats['disk']>;
+  libraryBytes: number;
+}) {
+  const { t } = useTranslation();
+  const pct = (n: number) => (disk.total > 0 ? (n / disk.total) * 100 : 0);
+  // The library is a slice of "used"; the rest of used is everything else on
+  // the volume. Clamp so a slightly-stale library total never overflows.
+  const libShare = Math.min(libraryBytes, disk.used);
+  const otherUsed = Math.max(disk.used - libShare, 0);
+  const libPercentOfDisk = pct(libraryBytes).toFixed(1);
+
+  return (
+    <Card style={{ padding: '1.25rem' }}>
+      <SectionTitle icon="hard-drives">{t('storage.disk')}</SectionTitle>
+      <div
+        style={{
+          display: 'flex',
+          height: 16,
+          borderRadius: 999,
+          overflow: 'hidden',
+          background: 'var(--color-surface-3)',
+          marginTop: '0.75rem',
+        }}
+      >
+        <div
+          style={{
+            width: `${pct(libShare)}%`,
+            background: 'var(--color-accent)',
+            transition: 'width 0.5s ease',
+          }}
+        />
+        <div
+          style={{
+            width: `${pct(otherUsed)}%`,
+            background: 'var(--color-text-3)',
+            opacity: 0.5,
+          }}
+        />
+      </div>
+      <div
+        style={{
+          display: 'flex',
+          justifyContent: 'space-between',
+          flexWrap: 'wrap',
+          gap: '0.5rem',
+          marginTop: '0.6rem',
+          fontSize: '0.85rem',
+          color: 'var(--color-text-2)',
+        }}
+      >
+        <span>
+          <Dot color="var(--color-accent)" /> {formatFileSize(libraryBytes)}{' '}
+          {t('storage.footprint').toLowerCase()}
+        </span>
+        <span>
+          {t('storage.diskUsage', {
+            used: formatFileSize(disk.used),
+            total: formatFileSize(disk.total),
+          })}
+        </span>
+        <span>
+          {t('storage.diskFree', { free: formatFileSize(disk.free) })}
+        </span>
+      </div>
+      <p
+        style={{
+          margin: '0.5rem 0 0',
+          fontSize: '0.8rem',
+          color: 'var(--color-text-3)',
+        }}
+      >
+        {t('storage.diskLibraryShare', { percent: libPercentOfDisk })}
+      </p>
+    </Card>
+  );
+}
+
+function FormatBars({ stats }: { stats: StorageStats }) {
+  const { t } = useTranslation();
+  const max = Math.max(...stats.byFormat.map((f) => f.totalSize), 1);
+  return (
+    <Card style={{ padding: '1.25rem' }}>
+      <SectionTitle icon="vinyl-record">{t('storage.formats')}</SectionTitle>
+      <div
+        style={{
+          display: 'flex',
+          flexDirection: 'column',
+          gap: '0.7rem',
+          marginTop: '0.75rem',
+        }}
+      >
+        {stats.byFormat.map((f) => (
+          <div key={f.fileFormat}>
+            <div
+              style={{
+                display: 'flex',
+                justifyContent: 'space-between',
+                fontSize: '0.85rem',
+                marginBottom: '0.25rem',
+              }}
+            >
+              <span
+                style={{
+                  textTransform: 'uppercase',
+                  letterSpacing: '0.04em',
+                  color: 'var(--color-text-1)',
+                }}
+              >
+                {f.fileFormat}
+              </span>
+              <span style={{ color: 'var(--color-text-2)' }}>
+                {formatCount(f.trackCount)} · {formatFileSize(f.totalSize)}
+              </span>
+            </div>
+            <div
+              style={{
+                height: 8,
+                borderRadius: 999,
+                background: 'var(--color-surface-3)',
+                overflow: 'hidden',
+              }}
+            >
+              <div
+                style={{
+                  width: `${(f.totalSize / max) * 100}%`,
+                  height: '100%',
+                  background: 'var(--color-accent)',
+                  transition: 'width 0.5s ease',
+                }}
+              />
+            </div>
+          </div>
+        ))}
+      </div>
+    </Card>
+  );
+}
+
+function MetadataHealth({ stats }: { stats: StorageStats }) {
+  const { t } = useTranslation();
+  const entries = Object.entries(stats.byMetadataStatus).filter(
+    ([, n]) => n > 0,
+  );
+  return (
+    <Card style={{ padding: '1.25rem' }}>
+      <SectionTitle icon="check-circle">
+        {t('storage.metadataHealth')}
+      </SectionTitle>
+      <div
+        style={{
+          display: 'flex',
+          flexWrap: 'wrap',
+          gap: '0.5rem',
+          marginTop: '0.75rem',
+        }}
+      >
+        {entries.map(([status, count]) => (
+          <Badge key={status} variant={STATUS_VARIANT[status] ?? 'neutral'}>
+            {t(`storage.status.${status}`, { defaultValue: status })} ·{' '}
+            {formatCount(count)}
+          </Badge>
+        ))}
+      </div>
+    </Card>
+  );
+}
+
+function Sources({ stats }: { stats: StorageStats }) {
+  const { t } = useTranslation();
+  const entries = Object.entries(stats.bySource).sort((a, b) => b[1] - a[1]);
+  return (
+    <Card style={{ padding: '1.25rem' }}>
+      <SectionTitle icon="arrow-circle-down">
+        {t('storage.sources')}
+      </SectionTitle>
+      <div
+        style={{
+          display: 'flex',
+          flexDirection: 'column',
+          gap: '0.4rem',
+          marginTop: '0.75rem',
+        }}
+      >
+        {entries.map(([source, count]) => (
+          <div
+            key={source}
+            style={{
+              display: 'flex',
+              justifyContent: 'space-between',
+              fontSize: '0.9rem',
+              textTransform: 'capitalize',
+            }}
+          >
+            <span style={{ color: 'var(--color-text-1)' }}>{source}</span>
+            <span style={{ color: 'var(--color-text-2)' }}>
+              {formatCount(count)}
+            </span>
+          </div>
+        ))}
+      </div>
+    </Card>
+  );
+}
+
+function TopGenres({ stats }: { stats: StorageStats }) {
+  const { t } = useTranslation();
+  const max = Math.max(...stats.topGenres.map((g) => g.trackCount), 1);
+  return (
+    <Card style={{ padding: '1.25rem' }}>
+      <SectionTitle icon="vinyl-record">{t('storage.topGenres')}</SectionTitle>
+      <div
+        style={{
+          display: 'flex',
+          flexWrap: 'wrap',
+          gap: '0.5rem',
+          marginTop: '0.75rem',
+        }}
+      >
+        {stats.topGenres.map((g) => {
+          // Scale chip emphasis by popularity for a tag-cloud feel.
+          const weight = 0.55 + (g.trackCount / max) * 0.45;
+          return (
+            <span
+              key={g.genre}
+              style={{
+                padding: '0.3rem 0.7rem',
+                borderRadius: 999,
+                border: '1px solid var(--color-border)',
+                background: `color-mix(in srgb, var(--color-accent) ${Math.round(
+                  weight * 18,
+                )}%, transparent)`,
+                fontSize: '0.85rem',
+                color: 'var(--color-text-1)',
+              }}
+            >
+              {g.genre}{' '}
+              <span style={{ color: 'var(--color-text-3)' }}>
+                {formatCount(g.trackCount)}
+              </span>
+            </span>
+          );
+        })}
+      </div>
+    </Card>
+  );
+}
+
+function FunFacts({
+  stats,
+  avgSize,
+}: {
+  stats: StorageStats;
+  avgSize: number;
+}) {
+  const { t } = useTranslation();
+  const facts: string[] = [];
+  if (stats.totalDurationSeconds > 0)
+    facts.push(
+      t('storage.factPlaytime', {
+        duration: formatLongDuration(stats.totalDurationSeconds),
+      }),
+    );
+  facts.push(
+    t('storage.factFootprint', {
+      size: formatFileSize(stats.totalSize),
+      tracks: formatCount(stats.totalTracks),
+    }),
+  );
+  if (stats.topGenres[0])
+    facts.push(
+      t('storage.factGenre', {
+        genre: stats.topGenres[0].genre,
+        count: stats.topGenres[0].trackCount,
+      }),
+    );
+  facts.push(t('storage.factAvg', { size: formatFileSize(avgSize) }));
+  const since = formatDateTime(stats.earliestAdded);
+  if (since) facts.push(t('storage.factSince', { date: since }));
+
+  return (
+    <Card style={{ padding: '1.25rem' }}>
+      <SectionTitle icon="info">{t('storage.funFacts')}</SectionTitle>
+      <ul
+        style={{
+          margin: '0.75rem 0 0',
+          paddingLeft: '1.1rem',
+          display: 'flex',
+          flexDirection: 'column',
+          gap: '0.4rem',
+          color: 'var(--color-text-2)',
+          fontSize: '0.9rem',
+        }}
+      >
+        {facts.map((f) => (
+          <li key={f}>{f}</li>
+        ))}
+      </ul>
+    </Card>
+  );
+}
+
+// -- small shared bits --------------------------------------------------------
+
+function StatTile({
+  icon,
+  label,
+  value,
+}: {
+  icon: IconName;
+  label: string;
+  value: string;
+}) {
+  return (
+    <Card
+      style={{
+        padding: '1rem',
+        display: 'flex',
+        flexDirection: 'column',
+        gap: '0.35rem',
+      }}
+    >
+      <span
+        style={{
+          color: 'var(--color-accent)',
+          fontSize: '1.1rem',
+          opacity: 0.9,
+        }}
+      >
+        <Icon name={icon} />
+      </span>
+      <span
+        style={{
+          fontSize: '1.5rem',
+          fontWeight: 600,
+          color: 'var(--color-text-1)',
+          lineHeight: 1.1,
+        }}
+      >
+        {value}
+      </span>
+      <span style={{ fontSize: '0.8rem', color: 'var(--color-text-2)' }}>
+        {label}
+      </span>
+    </Card>
+  );
+}
+
+function SectionTitle({
+  icon,
+  children,
+}: {
+  icon: IconName;
+  children: ReactNode;
+}) {
+  return (
+    <h3
+      style={{
+        margin: 0,
+        display: 'flex',
+        alignItems: 'center',
+        gap: '0.5rem',
+        fontSize: '0.95rem',
+        fontWeight: 600,
+        color: 'var(--color-text-1)',
+      }}
+    >
+      <span style={{ color: 'var(--color-accent)' }}>
+        <Icon name={icon} />
+      </span>
+      {children}
+    </h3>
+  );
+}
+
+function Dot({ color }: { color: string }) {
+  return (
+    <span
+      style={{
+        display: 'inline-block',
+        width: 8,
+        height: 8,
+        borderRadius: 999,
+        background: color,
+        marginRight: 2,
+      }}
+    />
+  );
+}

src/features/upload/UploadPage.tsx

@@ -1,4 +1,4 @@
-import { useRef, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
 import { useNavigate } from 'react-router';
 import { useTranslation } from 'react-i18next';
 import { Badge, Button, Callout, ScrollArea, Spinner } from '@olly/modern-sk';
@@ -6,6 +6,23 @@ import {
   buildUploadFormData,
   useUploadTrackMutation,
 } from '../../api/endpoints/upload';
+import {
+  useGetTrackQuery,
+  useGetTracksQuery,
+} from '../../api/endpoints/library';
+import { MetadataStatusBadge } from '../../components/track/MetadataStatusBadge';
+import { TrackRow } from '../../components/track/TrackRow';
+import { LoadingSkeleton } from '../../components/common/LoadingSkeleton';
+import { ErrorState } from '../../components/common/ErrorState';
+
+/** A8 "Recently uploaded": server-backed list (source=upload, newest first) so
+ * it survives a page refresh — unlike the transient client-side queue above. */
+const RECENT_UPLOADS = {
+  source: 'upload',
+  sortBy: 'dateAdded',
+  sortOrder: 'desc',
+  pageSize: 20,
+} as const;
 
 /** Pure client-side state — this is a transient upload queue, never server data. */
 type ItemStatus = 'queued' | 'uploading' | 'done' | 'duplicate' | 'error';
@@ -23,7 +40,10 @@ const MAX_CONCURRENCY = 3;
 
 function extractError(err: unknown): string {
   if (typeof err === 'object' && err !== null) {
-    const e = err as { data?: { message?: string; detail?: string }; error?: string };
+    const e = err as {
+      data?: { message?: string; detail?: string };
+      error?: string;
+    };
     return e.data?.message ?? e.data?.detail ?? e.error ?? 'Upload failed';
   }
   return 'Upload failed';
@@ -38,18 +58,27 @@ export function UploadPage() {
   const [items, setItems] = useState<QueueItem[]>([]);
   const [dragging, setDragging] = useState(false);
 
+  // Persisted view of past uploads. Auto-refreshes after each upload because the
+  // upload mutation invalidates the `Track` tag this query provides.
+  const recentQuery = useGetTracksQuery(RECENT_UPLOADS);
+
   const inputRef = useRef<HTMLInputElement>(null);
   const idCounter = useRef(0);
   const activeCount = useRef(0);
   const pending = useRef<QueueItem[]>([]);
 
   const patchItem = (id: string, patch: Partial<QueueItem>) =>
-    setItems((prev) => prev.map((it) => (it.id === id ? { ...it, ...patch } : it)));
+    setItems((prev) =>
+      prev.map((it) => (it.id === id ? { ...it, ...patch } : it)),
+    );
 
   // Ref-based concurrency pump: refs (not state) so it is safe to call from
   // async callbacks without stale closures over the queue.
   const pump = () => {
-    while (activeCount.current < MAX_CONCURRENCY && pending.current.length > 0) {
+    while (
+      activeCount.current < MAX_CONCURRENCY &&
+      pending.current.length > 0
+    ) {
       const item = pending.current.shift()!;
       activeCount.current += 1;
       patchItem(item.id, { status: 'uploading', error: undefined });
@@ -161,7 +190,9 @@ export function UploadPage() {
           >
             <div style={{ fontSize: '2rem' }}>⬆</div>
             <div style={{ fontWeight: 600 }}>{t('upload.dropzone.title')}</div>
-            <div style={{ fontSize: '0.8125rem', color: 'var(--color-text-3)' }}>
+            <div
+              style={{ fontSize: '0.8125rem', color: 'var(--color-text-3)' }}
+            >
               {t('upload.dropzone.hint')}
             </div>
             <Button variant="primary" size="sm" type="button">
@@ -181,7 +212,11 @@ export function UploadPage() {
 
           {items.length > 0 && (
             <div
-              style={{ display: 'flex', flexDirection: 'column', gap: '0.5rem' }}
+              style={{
+                display: 'flex',
+                flexDirection: 'column',
+                gap: '0.5rem',
+              }}
             >
               <div
                 style={{
@@ -226,6 +261,32 @@ export function UploadPage() {
               ))}
             </div>
           )}
+
+          <section
+            style={{ display: 'flex', flexDirection: 'column', gap: '0.5rem' }}
+          >
+            <span style={{ fontWeight: 600, fontSize: '0.875rem' }}>
+              {t('upload.recent.title')}
+            </span>
+            {recentQuery.isLoading && <LoadingSkeleton rows={4} />}
+            {recentQuery.isError && (
+              <ErrorState onRetry={() => recentQuery.refetch()} />
+            )}
+            {recentQuery.data && recentQuery.data.items.length === 0 && (
+              <p
+                style={{
+                  margin: 0,
+                  fontSize: '0.8125rem',
+                  color: 'var(--color-text-3)',
+                }}
+              >
+                {t('upload.recent.empty')}
+              </p>
+            )}
+            {recentQuery.data?.items.map((track, i) => (
+              <TrackRow key={track.id} track={track} index={i} showAlbum />
+            ))}
+          </section>
         </div>
       </ScrollArea>
     </div>
@@ -273,11 +334,7 @@ function UploadRow({
             {item.error}
           </div>
         )}
-        {done && (
-          <div style={{ fontSize: '0.75rem', color: 'var(--color-text-3)' }}>
-            {t('upload.unknownArtist')}
-          </div>
-        )}
+        {done && item.trackId && <EnrichmentStatus trackId={item.trackId} />}
       </div>
 
       <StatusBadge status={item.status} />
@@ -301,6 +358,59 @@ function UploadRow({
   );
 }
 
+/**
+ * Polls a just-uploaded track until enrichment settles, then shows the outcome.
+ * Metadata enrichment runs asynchronously in a worker after the upload response
+ * returns, so without polling the row would never reflect the resolved title/
+ * artist or a failure reason. Polling stops (interval → 0) once the status
+ * leaves `pending`.
+ */
+function EnrichmentStatus({ trackId }: { trackId: string }) {
+  const { t } = useTranslation();
+  const [pollMs, setPollMs] = useState(2500);
+  const { data } = useGetTrackQuery(trackId, { pollingInterval: pollMs });
+
+  useEffect(() => {
+    if (data && data.metadataStatus !== 'pending') setPollMs(0);
+  }, [data]);
+
+  const status = data?.metadataStatus ?? 'pending';
+  const resolved =
+    data && data.metadataStatus === 'enriched'
+      ? `${data.artistName} · ${data.title}`
+      : t(`metadata.statusHint.${status}`);
+
+  return (
+    <div
+      style={{
+        display: 'flex',
+        alignItems: 'center',
+        gap: '0.5rem',
+        marginTop: '0.25rem',
+      }}
+    >
+      <MetadataStatusBadge
+        status={status}
+        error={data?.metadataError}
+        hideWhenEnriched={false}
+      />
+      <span
+        style={{
+          fontSize: '0.75rem',
+          color: 'var(--color-text-3)',
+          overflow: 'hidden',
+          textOverflow: 'ellipsis',
+          whiteSpace: 'nowrap',
+        }}
+      >
+        {status === 'failed' && data?.metadataError
+          ? data.metadataError
+          : resolved}
+      </span>
+    </div>
+  );
+}
+
 function StatusBadge({ status }: { status: ItemStatus }) {
   const { t } = useTranslation();
   if (status === 'uploading') {

src/hooks/useAudioCacheStats.ts

@@ -0,0 +1,22 @@
+import { useEffect, useState } from 'react';
+import { getAudioCacheStats, type AudioCacheStats } from '../lib/sw';
+
+/**
+ * Loads the service-worker audio offline cache stats (Tier 3 — the audio
+ * actually stored on *this device*). Returns `null` until resolved, or when no
+ * controlling service worker is present (insecure origin, first load, …).
+ * `bump` forces a re-read after the cache is mutated (e.g. cleared).
+ */
+export function useAudioCacheStats(bump = 0): AudioCacheStats | null {
+  const [stats, setStats] = useState<AudioCacheStats | null>(null);
+  useEffect(() => {
+    let cancelled = false;
+    void getAudioCacheStats().then((s) => {
+      if (!cancelled) setStats(s);
+    });
+    return () => {
+      cancelled = true;
+    };
+  }, [bump]);
+  return stats;
+}

src/hooks/useAudioPlayer.ts

@@ -27,6 +27,10 @@ export function useAudioPlayer() {
   const queue = useAppSelector((s) => s.queue);
   const accessToken = useAppSelector((s) => s.auth.accessToken);
   const isSetup = useRef(false);
+  // `ended` is registered once below; read the latest loop flag through a ref
+  // so the listener doesn't need to be re-bound on every queue change.
+  const loopRef = useRef(queue.loop);
+  loopRef.current = queue.loop;
 
   useEffect(() => {
     if (isSetup.current) return;
@@ -41,7 +45,12 @@ export function useAudioPlayer() {
       dispatch(setDuration(audio.duration || 0));
     });
     audio.addEventListener('ended', () => {
+      if (loopRef.current) {
+        audio.currentTime = 0;
+        void audio.play();
+      } else {
         dispatch(nextTrack());
+      }
     });
     audio.addEventListener('pause', () => {
       dispatch(pause());

src/hooks/useConnectionStatus.ts

@@ -1,9 +1,16 @@
 import { useState, useEffect } from 'react';
 import { getApiBaseUrl } from '../config/runtime-config';
+import { useAppDispatch, useAppSelector } from './useAppDispatch';
+import {
+  setConnectionStatus,
+  type ConnectionStatus,
+} from '../store/slices/connection';
 
-type ConnectionStatus = 'connected' | 'connecting' | 'disconnected' | 'error';
+export type { ConnectionStatus };
 
-export function useConnectionStatus() {
+/** Pings `${baseUrl}/health` (defaults to the active instance's base URL). */
+export function useConnectionStatus(baseUrl?: string) {
+  const url = baseUrl ?? getApiBaseUrl();
   const [status, setStatus] = useState<ConnectionStatus>('connecting');
 
   useEffect(() => {
@@ -13,7 +20,7 @@ export function useConnectionStatus() {
       if (cancelled) return;
       setStatus('connecting');
       try {
-        const res = await fetch(`${getApiBaseUrl()}/health`, {
+        const res = await fetch(`${url}/health`, {
           signal: AbortSignal.timeout(5000),
         });
         if (!cancelled) setStatus(res.ok ? 'connected' : 'error');
@@ -30,7 +37,30 @@ export function useConnectionStatus() {
       cancelled = true;
       clearInterval(interval);
     };
-  }, []);
+  }, [url]);
 
   return status;
 }
+
+/**
+ * Like `useConnectionStatus`, but also mirrors the result into the
+ * `connection` slice so other components can read the active instance's
+ * reachability via `useIsOffline` without running their own poller.
+ * Mount once (in `Sidebar`, which lives for the app's whole lifetime).
+ */
+export function useConnectionStatusSync(): ConnectionStatus {
+  const status = useConnectionStatus();
+  const dispatch = useAppDispatch();
+
+  useEffect(() => {
+    dispatch(setConnectionStatus(status));
+  }, [status, dispatch]);
+
+  return status;
+}
+
+/** Whether the active backend instance is currently unreachable. */
+export function useIsOffline(): boolean {
+  const status = useAppSelector((s) => s.connection.status);
+  return status === 'disconnected' || status === 'error';
+}

src/hooks/useResolvedQueueEntry.ts

@@ -0,0 +1,41 @@
+import { skipToken } from '@reduxjs/toolkit/query';
+import { useGetTrackQuery } from '../api/endpoints/library';
+import type { QueueEntry } from '../store/slices/queue';
+
+export interface ResolvedQueueEntry {
+  trackId: string;
+  title: string;
+  artistName: string;
+  albumTitle: string;
+  durationMs: number;
+  hasCover: boolean;
+  albumArtUrl?: string;
+  format?: string;
+}
+
+/**
+ * Merge a queue entry's play-time snapshot with the live `Track` cache.
+ *
+ * The queue slice stores denormalized display fields (title/artist/…) captured
+ * when a track was queued, so they go stale after metadata enrichment updates
+ * the track. This reads through to the RTKQ `Track` cache — invalidated by the
+ * same tags that refresh the library — and prefers its fresh values, falling
+ * back to the snapshot for instant render and offline. Returns undefined when
+ * there is no current entry.
+ */
+export function useResolvedQueueEntry(
+  entry: QueueEntry | undefined,
+): ResolvedQueueEntry | undefined {
+  const { data } = useGetTrackQuery(entry?.trackId ?? skipToken);
+  if (!entry) return undefined;
+  return {
+    trackId: entry.trackId,
+    title: data?.title ?? entry.title,
+    artistName: data?.artistName ?? entry.artistName,
+    albumTitle: data?.albumTitle ?? entry.albumTitle,
+    durationMs: data?.durationMs ?? entry.durationMs,
+    hasCover: data?.hasCover ?? false,
+    albumArtUrl: data?.albumArtUrl ?? entry.albumArtUrl,
+    format: data?.format,
+  };
+}

src/hooks/useStreamCached.ts

@@ -0,0 +1,30 @@
+import { useEffect, useState } from 'react';
+import { useAppSelector } from './useAppDispatch';
+import { isStreamCached } from '../lib/sw';
+import { getStreamUrl } from '../api/endpoints/streaming';
+
+/**
+ * Whether the given track is available from the offline audio cache (Tier 3).
+ * Drives the player-bar source indicator (local vs streaming). Returns false
+ * until the service worker is controlling and confirms a hit.
+ */
+export function useStreamCached(trackId: string | undefined): boolean {
+  const token = useAppSelector((s) => s.auth.accessToken);
+  const [cached, setCached] = useState(false);
+
+  useEffect(() => {
+    if (!trackId || !token) {
+      setCached(false);
+      return;
+    }
+    let active = true;
+    void isStreamCached(getStreamUrl(trackId, token)).then((hit) => {
+      if (active) setCached(hit);
+    });
+    return () => {
+      active = false;
+    };
+  }, [trackId, token]);
+
+  return cached;
+}

src/i18n/locales/en.ts

@@ -17,6 +17,7 @@ const en = {
     disconnected: 'Offline',
     error: 'Unreachable',
     manage: 'Connection — manage instances',
+    cached: 'Showing last-seen data',
   },
   user: {
     online: 'online',
@@ -24,18 +25,46 @@ const en = {
     signOut: 'Sign out',
   },
   connect: {
-    savedInstances: 'Saved instances',
-    active: 'active',
+    domains: {
+      title: 'Saved instances',
+      addPlaceholder: 'https://your-server.example.com',
+      addButton: 'Add instance',
+      selected: 'Selected',
       use: 'Use',
-    forgetTitle: 'Forget this instance',
-    form: {
-      title: 'Connect to a backend',
-      serverUrl: 'Server URL',
+      forgetTitle: 'Remove this instance',
+    },
+    removeDialog: {
+      title: 'Remove cached data?',
+      description:
+        'This removes "{{name}}" from your saved instances and clears its cached data on this device.',
+      cancel: 'Cancel',
+      logout: 'Just log out',
+      removeAndLogout: 'Remove data & log out',
+    },
+    login: {
+      title: 'Log in to {{name}}',
+      registerTitle: 'Sign up for {{name}}',
       username: 'Username',
       password: 'Password',
-      submit: 'Connect',
-      stubNote:
-        'Stub mode — backend not wired. Connect signs in with a fake admin session, scoped to this instance.',
+      passwordHint: 'At least 8 characters.',
+      submit: 'Log in',
+      submitting: 'Logging in…',
+      registerSubmit: 'Sign up',
+      registering: 'Signing up…',
+      noAccount: "Don't have an account?",
+      registerLink: 'Sign up',
+      haveAccount: 'Already have an account?',
+      signInLink: 'Log in',
+    },
+    errors: {
+      unreachable:
+        "Can't reach this server. Check the URL and that it's online.",
+      badCredentials: 'Incorrect username or password.',
+      generic: 'Sign-in failed. Please try again.',
+      usernameTaken: 'That username is already taken.',
+      passwordTooShort: 'Password must be at least 8 characters.',
+      registrationDisabled: 'Registration is disabled on this server.',
+      registerFailed: 'Could not create the account. Please try again.',
     },
   },
   library: {
@@ -68,6 +97,13 @@ const en = {
     artistRow: {
       meta: '{{albumCount}} albums · {{trackCount}} tracks',
     },
+    offline: {
+      banner:
+        "You're offline — showing the library available locally. It may be incomplete and is read-only until the server is back.",
+      emptyTitle: 'Nothing available offline',
+      emptyDesc:
+        'No library data is cached on this device yet. Connect to the server once to browse offline.',
+    },
   },
   album: {
     type: 'Album',
@@ -78,6 +114,28 @@ const en = {
       title: 'No tracks',
       description: 'This album has no tracks.',
     },
+    offline: {
+      title: 'Album not available offline',
+      description: "You're offline and this album isn't cached on this device.",
+    },
+  },
+  artist: {
+    type: 'Artist',
+    play: '▶ Play all',
+    error: 'Failed to load artist',
+    meta: '{{albumCount}} albums · {{trackCount}} tracks',
+    albums: 'Albums',
+    tracks: 'Tracks',
+    noAlbums: 'No albums yet.',
+    empty: {
+      title: 'No tracks',
+      description: 'This artist has no tracks.',
+    },
+    offline: {
+      title: 'Artist not available offline',
+      description:
+        "You're offline and this artist isn't cached on this device.",
+    },
   },
   playlist: {
     type: 'Playlist',
@@ -91,27 +149,25 @@ const en = {
   },
   player: {
     nothingPlaying: 'Nothing playing',
-    shuffle: 'Shuffle',
     previous: 'Previous',
     next: 'Next',
     pause: 'Pause',
     play: 'Play',
-    repeat: 'Repeat: {{mode}}',
-    streaming: 'Streaming · 320 kbps',
-    local: 'Local · FLAC',
+    streaming: 'Streaming',
+    local: 'Local',
     queue: 'Play queue',
     mute: 'Mute',
     unmute: 'Unmute',
   },
   queue: {
     title: 'Play queue',
+    shuffle: 'Shuffle queue',
+    loop: 'Repeat current track',
     clear: 'Clear queue',
     close: 'Close',
     from: 'From {{source}}',
     radio: 'Radio · {{source}}',
-    nowPlaying: 'Now playing',
     nextUp: 'Next up',
-    nothingNext: 'Nothing queued next',
     empty: 'Queue is empty',
     radioActive: 'Radio active',
     mixing: '∞ mixing',
@@ -120,6 +176,13 @@ const en = {
     loadingMore: 'Loading more from radio…',
     doubleClickPlay: 'Double-click to play',
     removeFromQueue: 'Remove from queue',
+    menu: {
+      options: 'Track options',
+      playNow: 'Play now',
+      moveNext: 'Move next',
+      info: 'Track info',
+      remove: 'Remove from queue',
+    },
   },
   track: {
     menu: {
@@ -127,17 +190,103 @@ const en = {
       playNow: 'Play now',
       playNext: 'Play next',
       addToQueue: 'Add to queue',
+      info: 'Track info',
       addToPlaylist: 'Add to playlist…',
       editMetadata: 'Edit metadata',
       download: 'Download',
       delete: 'Delete',
     },
   },
+  trackInfo: {
+    title: 'Track info',
+    open: 'View track info',
+    close: 'Close',
+    notFound: 'Track not found',
+    play: 'Play',
+    addToQueue: 'Queue',
+    editMetadata: 'Edit metadata',
+    liked: 'Liked',
+    trackOf: 'No. {{n}} of {{total}}',
+    kbps: '{{n}} kbps',
+    sections: {
+      status: 'Status',
+      general: 'General',
+      file: 'File',
+      identifiers: 'Identifiers',
+    },
+    fields: {
+      artist: 'Artist',
+      album: 'Album',
+      trackNumber: 'Track',
+      disc: 'Disc',
+      year: 'Year',
+      genre: 'Genre',
+      duration: 'Duration',
+      format: 'Format',
+      bitrate: 'Bitrate',
+      size: 'Size',
+      source: 'Source',
+      added: 'Added',
+      enriched: 'Enriched',
+      trackId: 'Track ID',
+      albumId: 'Album ID',
+      artistId: 'Artist ID',
+    },
+  },
   common: {
     error: 'Something went wrong',
     retry: 'Retry',
     comingSoon: 'Coming soon',
     back: 'Back',
+    offlineBanner:
+      "You're offline — showing locally available data, read-only.",
+  },
+  storage: {
+    subtitle: 'Everything this instance has tucked away',
+    device: 'On this device',
+    server: 'On the server',
+    audioCache: 'Cached audio',
+    audioCacheUsage: '{{used}} of {{max}} used',
+    cachedTracks: '{{n}} tracks cached for offline',
+    audioCacheUnavailable:
+      'Offline audio cache unavailable (service worker not active).',
+    offlineLibrary: 'Offline library',
+    offlineLibraryMeta:
+      '{{tracks}} tracks · {{albums}} albums · {{artists}} artists browsable offline',
+    serverUnreachable: 'Server unreachable — showing this device only.',
+    emptyTitle: 'Nothing stored yet',
+    emptyDesc:
+      'Download or upload some music and your library stats will appear here.',
+    disk: 'Disk',
+    diskUsage: '{{used}} of {{total}} used',
+    diskFree: '{{free}} free',
+    diskLibraryShare: 'This library is {{percent}}% of the whole disk',
+    diskUnknown: 'Object storage — no fixed disk to report',
+    footprint: 'Library footprint',
+    tracks: 'Tracks',
+    artists: 'Artists',
+    albums: 'Albums',
+    playtime: 'Total playtime',
+    avgTrackSize: 'Avg. track size',
+    largestTrack: 'Largest track',
+    formats: 'Formats',
+    sources: 'Where it came from',
+    metadataHealth: 'Metadata health',
+    topGenres: 'Top genres',
+    noGenres: 'No genres tagged yet',
+    funFacts: 'Fun facts',
+    factPlaytime:
+      'Hit play and walk away — this library runs for {{duration}} non-stop.',
+    factFootprint: '{{size}} of music across {{tracks}} tracks.',
+    factGenre: 'Your most-tagged genre is {{genre}} ({{count}} tracks).',
+    factAvg: 'The average track weighs in at {{size}}.',
+    factSince: 'Collecting since {{date}}.',
+    status: {
+      enriched: 'Enriched',
+      manual: 'Manual',
+      pending: 'Pending',
+      failed: 'Failed',
+    },
   },
   pages: {
     admin: 'Admin',
@@ -190,6 +339,10 @@ const en = {
     clearCompleted: 'Clear completed',
     retry: 'Retry',
     editMetadata: 'Edit metadata',
+    recent: {
+      title: 'Recently uploaded',
+      empty: 'Nothing uploaded yet.',
+    },
     metadataPending:
       'Uploaded tracks land as “Unknown Artist” with metadata pending — enrich them afterwards.',
     unknownArtist: 'Unknown Artist · metadata pending',
@@ -201,11 +354,102 @@ const en = {
       error: 'Failed',
     },
   },
+  discover: {
+    title: 'Search & download',
+    subtitle: 'Find music on connected sources and add it to your library.',
+    searchPlaceholder: 'Search for a song, artist, or album…',
+    searchButton: 'Search',
+    allSources: 'All sources',
+    noSources:
+      'No download sources are configured. Enable a source (e.g. YouTube Music) on the server to search and download.',
+    startTitle: 'Search to get started',
+    startDesc: 'Results from your connected sources will appear here.',
+    emptyTitle: 'No results',
+    emptyDesc: 'Try a different search term or another source.',
+    searchError: "Couldn't search right now. Try again.",
+    download: 'Download',
+    retryDownload: 'Retry',
+    queued: 'Queued',
+    inLibrary: 'In library',
+    viewDownloads: 'View downloads',
+  },
+  downloads: {
+    title: 'Downloads',
+    subtitle: 'Track downloads in progress, completed, and failed.',
+    activeCount: '{{count}} active',
+    sectionActive: 'In progress',
+    sectionHistory: 'History',
+    emptyTitle: 'No downloads yet',
+    emptyDesc: 'Find music in Search & download to queue it here.',
+    loadError: "Couldn't load downloads.",
+    failedBanner:
+      '{{count}} download(s) failed. Retry them, or check the source on the server.',
+    attempt: 'Attempt {{count}}',
+    open: 'Open',
+    retry: 'Retry',
+    cancel: 'Cancel',
+    status: {
+      queued: 'Queued',
+      downloading: 'Downloading',
+      enriching: 'Enriching',
+      done: 'Done',
+      failed: 'Failed',
+    },
+  },
+  metadata: {
+    status: {
+      pending: 'Enriching…',
+      enriched: 'Enriched',
+      failed: 'No match',
+      manual: 'Manual',
+    },
+    statusHint: {
+      pending: 'Identifying metadata…',
+      enriched: 'Metadata identified',
+      failed: 'Metadata could not be identified',
+      manual: 'Edited manually — not auto-updated',
+    },
+  },
+  metadataEditor: {
+    error: 'Failed to load track',
+    saved: 'Metadata saved.',
+    saveError: 'Failed to save metadata.',
+    save: 'Save',
+    fields: {
+      title: 'Title',
+      artist: 'Artist',
+      album: 'Album',
+      year: 'Year',
+      genre: 'Genre',
+      trackNumber: 'Track number',
+    },
+    autoEnrich: {
+      title: 'AcoustID lookup',
+      hint: 'Identify this track by audio fingerprint.',
+      findMatches: 'Find matches',
+      reEnrich: 'Re-run enrichment',
+      enqueued: 'Enrichment queued — refresh in a moment.',
+      error: 'Could not look up matches.',
+      noMatches: 'No matches found.',
+    },
+    matches: {
+      use: 'Use',
+      unknownTitle: 'Unknown title',
+    },
+    diff: {
+      title: 'Apply this match?',
+      noChanges: 'No changes from current values.',
+      cancel: 'Cancel',
+      apply: 'Apply',
+    },
+  },
 } as const;
 
 export default en;
 
 type DeepString<T> = {
-  [K in keyof T]: T[K] extends Record<string, unknown> ? DeepString<T[K]> : string;
+  [K in keyof T]: T[K] extends Record<string, unknown>
+    ? DeepString<T[K]>
+    : string;
 };
 export type Translations = DeepString<typeof en>;

src/i18n/locales/ru.ts

@@ -19,6 +19,7 @@ const ru: Translations = {
     disconnected: 'Нет связи',
     error: 'Недоступно',
     manage: 'Соединение — управление экземплярами',
+    cached: 'Показаны последние данные',
   },
   user: {
     online: 'онлайн',
@@ -26,18 +27,46 @@ const ru: Translations = {
     signOut: 'Выйти',
   },
   connect: {
-    savedInstances: 'Сохранённые серверы',
-    active: 'активный',
+    domains: {
+      title: 'Сохранённые серверы',
+      addPlaceholder: 'https://your-server.example.com',
+      addButton: 'Добавить сервер',
+      selected: 'Выбран',
       use: 'Выбрать',
-    forgetTitle: 'Забыть этот сервер',
-    form: {
-      title: 'Подключиться к серверу',
-      serverUrl: 'URL сервера',
+      forgetTitle: 'Удалить этот сервер',
+    },
+    removeDialog: {
+      title: 'Удалить локальные данные?',
+      description:
+        'Сервер «{{name}}» будет удалён из сохранённых, а его данные на этом устройстве — очищены.',
+      cancel: 'Отмена',
+      logout: 'Просто выйти',
+      removeAndLogout: 'Удалить данные и выйти',
+    },
+    login: {
+      title: 'Вход в {{name}}',
+      registerTitle: 'Регистрация на {{name}}',
       username: 'Имя пользователя',
       password: 'Пароль',
-      submit: 'Подключиться',
-      stubNote:
-        'Режим заглушки — сервер не подключён. Создаётся фиктивная сессия администратора для этого экземпляра.',
+      passwordHint: 'Не менее 8 символов.',
+      submit: 'Войти',
+      submitting: 'Вход…',
+      registerSubmit: 'Зарегистрироваться',
+      registering: 'Регистрация…',
+      noAccount: 'Нет аккаунта?',
+      registerLink: 'Зарегистрироваться',
+      haveAccount: 'Уже есть аккаунт?',
+      signInLink: 'Войти',
+    },
+    errors: {
+      unreachable:
+        'Не удаётся подключиться к серверу. Проверьте URL и доступность.',
+      badCredentials: 'Неверное имя пользователя или пароль.',
+      generic: 'Не удалось войти. Попробуйте ещё раз.',
+      usernameTaken: 'Это имя пользователя уже занято.',
+      passwordTooShort: 'Пароль должен содержать не менее 8 символов.',
+      registrationDisabled: 'Регистрация на этом сервере отключена.',
+      registerFailed: 'Не удалось создать аккаунт. Попробуйте ещё раз.',
     },
   },
   library: {
@@ -70,6 +99,13 @@ const ru: Translations = {
     artistRow: {
       meta: '{{albumCount}} альб. · {{trackCount}} треков',
     },
+    offline: {
+      banner:
+        'Нет связи с сервером — показана локально доступная библиотека. Она может быть неполной и доступна только для чтения, пока сервер недоступен.',
+      emptyTitle: 'Офлайн ничего нет',
+      emptyDesc:
+        'На этом устройстве ещё нет кэша библиотеки. Подключитесь к серверу хотя бы раз, чтобы просматривать офлайн.',
+    },
   },
   album: {
     type: 'Альбом',
@@ -80,6 +116,27 @@ const ru: Translations = {
       title: 'Нет треков',
       description: 'В этом альбоме нет треков.',
     },
+    offline: {
+      title: 'Альбом недоступен офлайн',
+      description: 'Нет связи, а этот альбом не сохранён на устройстве.',
+    },
+  },
+  artist: {
+    type: 'Исполнитель',
+    play: '▶ Слушать всё',
+    error: 'Не удалось загрузить исполнителя',
+    meta: '{{albumCount}} альбомов · {{trackCount}} треков',
+    albums: 'Альбомы',
+    tracks: 'Треки',
+    noAlbums: 'Пока нет альбомов.',
+    empty: {
+      title: 'Нет треков',
+      description: 'У этого исполнителя нет треков.',
+    },
+    offline: {
+      title: 'Исполнитель недоступен офлайн',
+      description: 'Нет связи, а этот исполнитель не сохранён на устройстве.',
+    },
   },
   playlist: {
     type: 'Плейлист',
@@ -93,27 +150,25 @@ const ru: Translations = {
   },
   player: {
     nothingPlaying: 'Ничего не играет',
-    shuffle: 'Перемешать',
     previous: 'Назад',
     next: 'Вперёд',
     pause: 'Пауза',
     play: 'Воспроизвести',
-    repeat: 'Повтор: {{mode}}',
-    streaming: 'Стриминг · 320 kbps',
-    local: 'Локально · FLAC',
+    streaming: 'Стриминг',
+    local: 'Локально',
     queue: 'Очередь',
     mute: 'Выключить звук',
     unmute: 'Включить звук',
   },
   queue: {
     title: 'Очередь воспроизведения',
+    shuffle: 'Перемешать очередь',
+    loop: 'Повторять текущий трек',
     clear: 'Очистить очередь',
     close: 'Закрыть',
     from: 'Из: {{source}}',
     radio: 'Радио · {{source}}',
-    nowPlaying: 'Сейчас играет',
     nextUp: 'Далее',
-    nothingNext: 'Очередь пуста',
     empty: 'Очередь пуста',
     radioActive: 'Радио активно',
     mixing: '∞ микс',
@@ -122,6 +177,13 @@ const ru: Translations = {
     loadingMore: 'Загрузка радио…',
     doubleClickPlay: 'Двойной клик для воспроизведения',
     removeFromQueue: 'Убрать из очереди',
+    menu: {
+      options: 'Параметры трека',
+      playNow: 'Воспроизвести сейчас',
+      moveNext: 'Сделать следующим',
+      info: 'Информация о треке',
+      remove: 'Убрать из очереди',
+    },
   },
   track: {
     menu: {
@@ -129,17 +191,103 @@ const ru: Translations = {
       playNow: 'Играть сейчас',
       playNext: 'Следующим',
       addToQueue: 'Добавить в очередь',
+      info: 'Информация о треке',
       addToPlaylist: 'Добавить в плейлист…',
       editMetadata: 'Редактировать метаданные',
       download: 'Скачать',
       delete: 'Удалить',
     },
   },
+  trackInfo: {
+    title: 'О треке',
+    open: 'Информация о треке',
+    close: 'Закрыть',
+    notFound: 'Трек не найден',
+    play: 'Играть',
+    addToQueue: 'В очередь',
+    editMetadata: 'Метаданные',
+    liked: 'В избранном',
+    trackOf: '№ {{n}} из {{total}}',
+    kbps: '{{n}} кбит/с',
+    sections: {
+      status: 'Статус',
+      general: 'Основное',
+      file: 'Файл',
+      identifiers: 'Идентификаторы',
+    },
+    fields: {
+      artist: 'Исполнитель',
+      album: 'Альбом',
+      trackNumber: 'Трек',
+      disc: 'Диск',
+      year: 'Год',
+      genre: 'Жанр',
+      duration: 'Длительность',
+      format: 'Формат',
+      bitrate: 'Битрейт',
+      size: 'Размер',
+      source: 'Источник',
+      added: 'Добавлен',
+      enriched: 'Обогащён',
+      trackId: 'ID трека',
+      albumId: 'ID альбома',
+      artistId: 'ID исполнителя',
+    },
+  },
   common: {
     error: 'Что-то пошло не так',
     retry: 'Повторить',
     comingSoon: 'Скоро',
     back: 'Назад',
+    offlineBanner:
+      'Нет связи с сервером — показаны локально доступные данные, только для чтения.',
+  },
+  storage: {
+    subtitle: 'Всё, что хранит этот инстанс',
+    device: 'На этом устройстве',
+    server: 'На сервере',
+    audioCache: 'Кэш аудио',
+    audioCacheUsage: 'Занято {{used}} из {{max}}',
+    cachedTracks: '{{n}} треков сохранено офлайн',
+    audioCacheUnavailable:
+      'Офлайн-кэш аудио недоступен (service worker не активен).',
+    offlineLibrary: 'Офлайн-библиотека',
+    offlineLibraryMeta:
+      '{{tracks}} треков · {{albums}} альбомов · {{artists}} исполнителей доступно офлайн',
+    serverUnreachable: 'Сервер недоступен — показано только это устройство.',
+    emptyTitle: 'Пока ничего не сохранено',
+    emptyDesc:
+      'Загрузите немного музыки — и здесь появится статистика вашей библиотеки.',
+    disk: 'Диск',
+    diskUsage: 'Занято {{used}} из {{total}}',
+    diskFree: 'Свободно {{free}}',
+    diskLibraryShare: 'Библиотека занимает {{percent}}% всего диска',
+    diskUnknown: 'Объектное хранилище — фиксированного диска нет',
+    footprint: 'Объём библиотеки',
+    tracks: 'Треки',
+    artists: 'Исполнители',
+    albums: 'Альбомы',
+    playtime: 'Общая длительность',
+    avgTrackSize: 'Средний размер трека',
+    largestTrack: 'Самый большой трек',
+    formats: 'Форматы',
+    sources: 'Откуда взято',
+    metadataHealth: 'Состояние метаданных',
+    topGenres: 'Топ жанров',
+    noGenres: 'Жанры пока не указаны',
+    funFacts: 'Интересные факты',
+    factPlaytime:
+      'Нажмите play и уходите — библиотека играет {{duration}} без остановки.',
+    factFootprint: '{{size}} музыки в {{tracks}} треках.',
+    factGenre: 'Чаще всего встречается жанр {{genre}} ({{count}} треков).',
+    factAvg: 'Средний трек весит {{size}}.',
+    factSince: 'Коллекция собирается с {{date}}.',
+    status: {
+      enriched: 'Обогащено',
+      manual: 'Вручную',
+      pending: 'В ожидании',
+      failed: 'Ошибка',
+    },
   },
   pages: {
     admin: 'Администрирование',
@@ -192,6 +340,10 @@ const ru: Translations = {
     clearCompleted: 'Убрать завершённые',
     retry: 'Повторить',
     editMetadata: 'Изменить метаданные',
+    recent: {
+      title: 'Недавно загруженные',
+      empty: 'Пока ничего не загружено.',
+    },
     metadataPending:
       'Загруженные треки появляются как «Unknown Artist» с метаданными в ожидании — дозаполните их позже.',
     unknownArtist: 'Unknown Artist · метаданные в ожидании',
@@ -203,6 +355,96 @@ const ru: Translations = {
       error: 'Ошибка',
     },
   },
+  discover: {
+    title: 'Поиск и скачивание',
+    subtitle:
+      'Находите музыку в подключённых источниках и добавляйте в библиотеку.',
+    searchPlaceholder: 'Найти трек, исполнителя или альбом…',
+    searchButton: 'Найти',
+    allSources: 'Все источники',
+    noSources:
+      'Источники скачивания не настроены. Включите источник (например, YouTube Music) на сервере, чтобы искать и скачивать.',
+    startTitle: 'Начните с поиска',
+    startDesc: 'Здесь появятся результаты из подключённых источников.',
+    emptyTitle: 'Ничего не найдено',
+    emptyDesc: 'Попробуйте другой запрос или другой источник.',
+    searchError: 'Не удалось выполнить поиск. Попробуйте ещё раз.',
+    download: 'Скачать',
+    retryDownload: 'Повторить',
+    queued: 'В очереди',
+    inLibrary: 'В библиотеке',
+    viewDownloads: 'К загрузкам',
+  },
+  downloads: {
+    title: 'Загрузки',
+    subtitle: 'Активные, завершённые и неуспешные скачивания.',
+    activeCount: 'Активных: {{count}}',
+    sectionActive: 'В процессе',
+    sectionHistory: 'История',
+    emptyTitle: 'Пока нет загрузок',
+    emptyDesc: 'Найдите музыку в разделе «Поиск и скачивание».',
+    loadError: 'Не удалось загрузить список.',
+    failedBanner:
+      'Неуспешных скачиваний: {{count}}. Повторите их или проверьте источник на сервере.',
+    attempt: 'Попытка {{count}}',
+    open: 'Открыть',
+    retry: 'Повторить',
+    cancel: 'Отменить',
+    status: {
+      queued: 'В очереди',
+      downloading: 'Скачивание',
+      enriching: 'Обработка',
+      done: 'Готово',
+      failed: 'Ошибка',
+    },
+  },
+  metadata: {
+    status: {
+      pending: 'Обработка…',
+      enriched: 'Готово',
+      failed: 'Нет совпадения',
+      manual: 'Вручную',
+    },
+    statusHint: {
+      pending: 'Определяем метаданные…',
+      enriched: 'Метаданные определены',
+      failed: 'Не удалось определить метаданные',
+      manual: 'Изменено вручную — не обновляется автоматически',
+    },
+  },
+  metadataEditor: {
+    error: 'Не удалось загрузить трек',
+    saved: 'Метаданные сохранены.',
+    saveError: 'Не удалось сохранить метаданные.',
+    save: 'Сохранить',
+    fields: {
+      title: 'Название',
+      artist: 'Исполнитель',
+      album: 'Альбом',
+      year: 'Год',
+      genre: 'Жанр',
+      trackNumber: 'Номер трека',
+    },
+    autoEnrich: {
+      title: 'Поиск по AcoustID',
+      hint: 'Определить трек по аудио-отпечатку.',
+      findMatches: 'Найти совпадения',
+      reEnrich: 'Повторить обогащение',
+      enqueued: 'Обогащение запущено — обновите через момент.',
+      error: 'Не удалось найти совпадения.',
+      noMatches: 'Совпадений не найдено.',
+    },
+    matches: {
+      use: 'Использовать',
+      unknownTitle: 'Неизвестное название',
+    },
+    diff: {
+      title: 'Применить это совпадение?',
+      noChanges: 'Нет изменений относительно текущих значений.',
+      cancel: 'Отмена',
+      apply: 'Применить',
+    },
+  },
 };
 
 export default ru;

src/index.tsx

@@ -10,17 +10,23 @@ import { BrowserRouter } from 'react-router';
 import { ThemeProvider, TooltipProvider } from '@olly/modern-sk';
 import { store } from './store';
 import { AppRoutes } from './routes';
+import { registerServiceWorker } from './lib/sw';
 
 // Import all endpoint injections to ensure they are registered
 import './api/endpoints/auth';
 import './api/endpoints/library';
 import './api/endpoints/playlists';
 import './api/endpoints/downloads';
+import './api/endpoints/search';
 import './api/endpoints/likes';
 import './api/endpoints/storage';
 import './api/endpoints/admin';
 import './api/endpoints/upload';
 
+// Tier 3 offline: register the audio-caching service worker (no-op if the
+// browser/origin doesn't support it).
+registerServiceWorker();
+
 const rootEl = document.getElementById('root');
 if (rootEl) {
   // grained black-ish background + base text color from modern-sk

src/lib/format.ts

@@ -16,6 +16,30 @@ export function formatFileSize(bytes: number): string {
   return `${(bytes / (1024 * 1024 * 1024)).toFixed(2)} GB`;
 }
 
+export function formatDateTime(iso: string | undefined): string | undefined {
+  if (!iso) return undefined;
+  const d = new Date(iso);
+  if (Number.isNaN(d.getTime())) return undefined;
+  return new Intl.DateTimeFormat(undefined, {
+    dateStyle: 'medium',
+    timeStyle: 'short',
+  }).format(d);
+}
+
+/** Human "X days Y hours" style for big spans (e.g. total library playtime).
+ * Shows the two most-significant non-zero units; falls back to "0m". */
+export function formatLongDuration(seconds: number): string {
+  if (seconds <= 0) return '0m';
+  const days = Math.floor(seconds / 86400);
+  const hours = Math.floor((seconds % 86400) / 3600);
+  const mins = Math.floor((seconds % 3600) / 60);
+  const parts: string[] = [];
+  if (days) parts.push(`${days}d`);
+  if (hours) parts.push(`${hours}h`);
+  if (mins && parts.length < 2) parts.push(`${mins}m`);
+  return parts.slice(0, 2).join(' ') || '0m';
+}
+
 export function formatCount(n: number): string {
   if (n < 1000) return String(n);
   if (n < 1_000_000) return `${(n / 1000).toFixed(1)}K`;

src/lib/sw.ts

@@ -0,0 +1,80 @@
+/*
+ * Service-worker client: registration + a typed bridge to the audio offline
+ * cache (Tier 3). The SW itself lives in `public/sw.js`; this is the app side.
+ *
+ * Messaging uses a MessageChannel — we hand the SW a port and await its reply —
+ * so each call resolves with that request's result rather than a global event.
+ */
+
+export interface AudioCacheStats {
+  count: number;
+  bytes: number;
+  maxBytes: number;
+}
+
+/** Register the service worker. No-op when unsupported (e.g. plain http host). */
+export function registerServiceWorker(): void {
+  if (typeof navigator === 'undefined' || !('serviceWorker' in navigator)) {
+    return;
+  }
+  window.addEventListener('load', () => {
+    // Module worker: sw.js uses ES imports (see public/sw.js + sw-core.js).
+    navigator.serviceWorker.register('/sw.js', { type: 'module' }).catch(() => {
+      /* SW unavailable (insecure origin, blocked, …) — app still works online */
+    });
+  });
+}
+
+function controller(): ServiceWorker | null {
+  if (typeof navigator === 'undefined' || !('serviceWorker' in navigator)) {
+    return null;
+  }
+  return navigator.serviceWorker.controller;
+}
+
+/** Round-trip a message to the SW; rejects if no controlling SW is present. */
+function send<T>(message: Record<string, unknown>): Promise<T> {
+  const sw = controller();
+  if (!sw) return Promise.reject(new Error('no-service-worker'));
+  return new Promise<T>((resolve, reject) => {
+    const channel = new MessageChannel();
+    channel.port1.onmessage = (event) => resolve(event.data as T);
+    try {
+      sw.postMessage(message, [channel.port2]);
+    } catch (err) {
+      reject(err as Error);
+    }
+  });
+}
+
+/** Total size + count of cached audio, or null when the SW isn't controlling. */
+export async function getAudioCacheStats(): Promise<AudioCacheStats | null> {
+  try {
+    return await send<AudioCacheStats>({ type: 'STATS' });
+  } catch {
+    return null;
+  }
+}
+
+/** Whether a given stream URL is already cached for offline playback. */
+export async function isStreamCached(streamUrl: string): Promise<boolean> {
+  try {
+    const { cached } = await send<{ cached: boolean }>({
+      type: 'HAS',
+      url: streamUrl,
+    });
+    return cached;
+  } catch {
+    return false;
+  }
+}
+
+/** Drop the entire audio cache. Resolves false if the SW isn't controlling. */
+export async function clearAudioCache(): Promise<boolean> {
+  try {
+    const { ok } = await send<{ ok: boolean }>({ type: 'CLEAR' });
+    return ok;
+  } catch {
+    return false;
+  }
+}

src/routes/index.tsx

@@ -44,7 +44,9 @@ const DownloadsManagerPage = lazy(() =>
   })),
 );
 const UploadPage = lazy(() =>
-  import('../features/upload/UploadPage').then((m) => ({ default: m.UploadPage })),
+  import('../features/upload/UploadPage').then((m) => ({
+    default: m.UploadPage,
+  })),
 );
 const MetadataEditorPage = lazy(() =>
   import('../features/metadata-editor/MetadataEditorPage').then((m) => ({
@@ -126,7 +128,10 @@ export function AppRoutes() {
 
         {/* Storage */}
         <Route path="/storage" element={<StoragePage />} />
-        <Route path="/storage/maintenance" element={<StorageMaintenancePage />} />
+        <Route
+          path="/storage/maintenance"
+          element={<StorageMaintenancePage />}
+        />
 
         {/* Queue (narrow viewports) */}
         <Route path="/queue" element={<QueuePage />} />

src/store/index.ts

@@ -1,21 +1,44 @@
 import { configureStore } from '@reduxjs/toolkit';
+import { setupListeners } from '@reduxjs/toolkit/query';
 import { api } from '../api';
 import authReducer from './slices/auth';
+import connectionReducer from './slices/connection';
 import playerReducer from './slices/player';
 import queueReducer from './slices/queue';
 import uiReducer from './slices/ui';
+import { loadPlayerState, loadQueueState, startPersistence } from './persist';
+import { rehydrateApiCache, startApiPersistence } from './rtkqPersist';
 
 export const store = configureStore({
   reducer: {
     [api.reducerPath]: api.reducer,
     auth: authReducer,
+    connection: connectionReducer,
     player: playerReducer,
     queue: queueReducer,
     ui: uiReducer,
   },
+  // Tier 1 offline: rehydrate queue/player from the active backend's namespace
+  // so a reload (even with no backend) restores exactly where the user left off.
+  preloadedState: {
+    queue: loadQueueState(),
+    player: loadPlayerState(),
+  },
   middleware: (getDefaultMiddleware) =>
     getDefaultMiddleware().concat(api.middleware),
 });
 
+// Enable refetchOnReconnect / refetchOnFocus by dispatching the browser's
+// online + focus events into RTKQ (no-op without the api flags set in api/index).
+setupListeners(store.dispatch);
+
+// Flush queue/player changes back to localStorage (throttled).
+startPersistence(store);
+
+// Tier 2 offline: replay the last-seen RTKQ cache, then keep snapshotting it.
+// Rehydrate first so cached server data is present before any component mounts.
+rehydrateApiCache(store.dispatch);
+startApiPersistence(store);
+
 export type RootState = ReturnType<typeof store.getState>;
 export type AppDispatch = typeof store.dispatch;

src/store/persist.ts

@@ -0,0 +1,123 @@
+/*
+ * Tier 1 offline support: persist client state (queue + player) to the active
+ * backend's localStorage namespace, mirroring the auth slice. This is what lets
+ * the UI come back exactly as the user left it after a reload with no backend
+ * reachable — no server data is duplicated (the queue stores track IDs + minimal
+ * display fields only; full track records still live in the RTKQ cache).
+ *
+ * Server data (library/albums/…) is Tier 2 (see `rtkqPersist.ts`).
+ */
+import { instanceStorage } from '../config/instances';
+import { queueInitialState, type QueueState } from './slices/queue';
+import { playerInitialState, type PlayerState } from './slices/player';
+import type { RootState } from './index';
+
+const QUEUE_KEY = 'queue';
+const PLAYER_KEY = 'player';
+
+// Only persist fields that make sense to restore. `duration`/`isPlaying` are
+// derived from the <audio> element on next load, and the panel toggles are
+// transient UI, so they are intentionally left out.
+type PersistedQueue = Pick<
+  QueueState,
+  | 'entries'
+  | 'currentIndex'
+  | 'source'
+  | 'sourceId'
+  | 'sourceName'
+  | 'shuffle'
+  | 'loop'
+>;
+type PersistedPlayer = Pick<
+  PlayerState,
+  'currentTrackId' | 'position' | 'volume' | 'muted'
+>;
+
+function pickQueue(state: QueueState): PersistedQueue {
+  return {
+    entries: state.entries,
+    currentIndex: state.currentIndex,
+    source: state.source,
+    sourceId: state.sourceId,
+    sourceName: state.sourceName,
+    shuffle: state.shuffle,
+    loop: state.loop,
+  };
+}
+
+function pickPlayer(state: PlayerState): PersistedPlayer {
+  return {
+    currentTrackId: state.currentTrackId,
+    position: state.position,
+    volume: state.volume,
+    muted: state.muted,
+  };
+}
+
+function read<T>(key: string): Partial<T> | null {
+  try {
+    const raw = instanceStorage.get(key);
+    return raw ? (JSON.parse(raw) as Partial<T>) : null;
+  } catch {
+    return null;
+  }
+}
+
+/** Build the queue slice's initial state, restoring any persisted queue. */
+export function loadQueueState(): QueueState {
+  const persisted = read<PersistedQueue>(QUEUE_KEY);
+  if (!persisted) return queueInitialState;
+  const merged: QueueState = { ...queueInitialState, ...persisted };
+  // Guard the index against a corrupted/short entries array.
+  if (
+    merged.currentIndex >= merged.entries.length ||
+    merged.currentIndex < -1
+  ) {
+    merged.currentIndex = merged.entries.length ? 0 : -1;
+  }
+  return merged;
+}
+
+/** Build the player slice's initial state, restoring any persisted player. */
+export function loadPlayerState(): PlayerState {
+  const persisted = read<PersistedPlayer>(PLAYER_KEY);
+  if (!persisted) return playerInitialState;
+  // Never auto-resume playback on load: browsers block autoplay and the
+  // <audio> element starts paused regardless. isPlaying stays false.
+  return { ...playerInitialState, ...persisted, isPlaying: false };
+}
+
+/**
+ * Subscribe a store so queue/player changes are flushed to localStorage. The
+ * write is throttled because `setPosition` fires several times a second during
+ * playback — without throttling we'd hammer localStorage on every tick.
+ */
+export function startPersistence(store: {
+  getState: () => RootState;
+  subscribe: (listener: () => void) => () => void;
+}): () => void {
+  const initial = store.getState();
+  let lastQueue = JSON.stringify(pickQueue(initial.queue));
+  let lastPlayer = JSON.stringify(pickPlayer(initial.player));
+  let timer: ReturnType<typeof setTimeout> | null = null;
+
+  const flush = () => {
+    timer = null;
+    const state = store.getState();
+    const queueSnapshot = JSON.stringify(pickQueue(state.queue));
+    if (queueSnapshot !== lastQueue) {
+      instanceStorage.set(QUEUE_KEY, queueSnapshot);
+      lastQueue = queueSnapshot;
+    }
+    const playerSnapshot = JSON.stringify(pickPlayer(state.player));
+    if (playerSnapshot !== lastPlayer) {
+      instanceStorage.set(PLAYER_KEY, playerSnapshot);
+      lastPlayer = playerSnapshot;
+    }
+  };
+
+  return store.subscribe(() => {
+    if (timer) return;
+    timer = setTimeout(flush, 1000);
+  });
+}

src/store/rtkqPersist.ts

@@ -0,0 +1,90 @@
+/*
+ * Tier 2 offline support: persist the RTK Query cache (last-seen server data —
+ * library/albums/artists/…) to the active backend's localStorage namespace and
+ * replay it into the cache on startup. With the backend down, components keep
+ * rendering the last-known data read-only instead of an error state.
+ *
+ * Per the architecture invariant, server data is NOT copied into a slice: this
+ * snapshots the RTKQ cache itself and feeds it back through RTKQ's own
+ * `extractRehydrationInfo` mechanism (see `api/index.ts`).
+ */
+import { instanceStorage } from '../config/instances';
+import { rehydrateApi, type RehydrateApiPayload } from '../api/rehydrate';
+import type { RootState } from './index';
+
+const CACHE_KEY = 'rtkq';
+
+type ApiState = RootState['api'];
+type QueryEntry = ApiState['queries'][string];
+
+/**
+ * Keep only successfully-fulfilled query results — pending/rejected entries
+ * carry no usable data and subscriptions are rebuilt by components on mount.
+ * Mutation results are never restored.
+ */
+const EMPTY_PROVIDED = { tags: {}, keys: {} };
+
+function snapshot(apiState: ApiState): RehydrateApiPayload {
+  const queries: Record<string, unknown> = {};
+  for (const [key, entry] of Object.entries(apiState.queries)) {
+    const q = entry as QueryEntry | undefined;
+    if (q && q.status === 'fulfilled') queries[key] = q;
+  }
+  // Carry `provided` along so RTKQ can re-register invalidation tags for the
+  // restored entries; it is also required structurally (see RehydrateApiPayload).
+  return {
+    queries,
+    mutations: {},
+    provided: apiState.provided ?? EMPTY_PROVIDED,
+  };
+}
+
+function load(): RehydrateApiPayload | null {
+  try {
+    const raw = instanceStorage.get(CACHE_KEY);
+    if (!raw) return null;
+    const parsed = JSON.parse(raw) as Partial<RehydrateApiPayload>;
+    if (!parsed.queries) return null;
+    // `provided` may be absent in snapshots written before this field existed —
+    // default it so the invalidation slice doesn't crash on `provided.tags`.
+    return {
+      queries: parsed.queries,
+      mutations: {},
+      provided: parsed.provided ?? EMPTY_PROVIDED,
+    };
+  } catch {
+    return null;
+  }
+}
+
+/** Replay the persisted cache into RTKQ. Call once after the store is created. */
+export function rehydrateApiCache(dispatch: (action: unknown) => void): void {
+  const cached = load();
+  if (cached) dispatch(rehydrateApi(cached));
+}
+
+/**
+ * Subscribe a store so the RTKQ cache is flushed to localStorage. Throttled,
+ * since cache state churns on every in-flight query transition.
+ */
+export function startApiPersistence(store: {
+  getState: () => RootState;
+  subscribe: (listener: () => void) => () => void;
+}): () => void {
+  let last = '';
+  let timer: ReturnType<typeof setTimeout> | null = null;
+
+  const flush = () => {
+    timer = null;
+    const snap = JSON.stringify(snapshot(store.getState().api));
+    if (snap !== last) {
+      instanceStorage.set(CACHE_KEY, snap);
+      last = snap;
+    }
+  };
+
+  return store.subscribe(() => {
+    if (timer) return;
+    timer = setTimeout(flush, 2000);
+  });
+}

src/store/selectors/localLibrary.ts

@@ -0,0 +1,97 @@
+/*
+ * Offline library composition. When the active backend is unreachable, a single
+ * `getTracks` query may be `rejected` (or never matched a rehydrated arg), so we
+ * can't rely on it to render the library. Instead we compose the "locally
+ * available" library from *every* fulfilled entry in the RTK Query cache —
+ * last-seen lists rehydrated from localStorage (Tier 2) plus anything fetched
+ * this session. This is read-only derived data, not a server-data slice copy:
+ * it reads straight from the RTKQ cache the architecture already owns.
+ */
+import { createSelector } from '@reduxjs/toolkit';
+import type { RootState } from '../index';
+import type { Album, Artist, PaginatedResponse, Track } from '../../api/types';
+
+interface CacheEntry {
+  status: string;
+  endpointName?: string;
+  data?: unknown;
+}
+
+const selectQueries = (state: RootState): Record<string, unknown> =>
+  state.api.queries;
+
+function fulfilled(queries: Record<string, unknown>): CacheEntry[] {
+  const out: CacheEntry[] = [];
+  for (const entry of Object.values(queries)) {
+    const e = entry as CacheEntry | undefined;
+    if (e && e.status === 'fulfilled' && e.data != null) out.push(e);
+  }
+  return out;
+}
+
+/** Every track known locally, deduped by id (last write wins). */
+export const selectLocalTracks = createSelector(
+  selectQueries,
+  (queries): Track[] => {
+    const byId = new Map<string, Track>();
+    for (const e of fulfilled(queries)) {
+      switch (e.endpointName) {
+        case 'getTracks':
+          for (const t of (e.data as PaginatedResponse<Track>).items)
+            byId.set(t.id, t);
+          break;
+        case 'getAlbumTracks':
+        case 'getArtistTracks':
+          for (const t of e.data as Track[]) byId.set(t.id, t);
+          break;
+        case 'getTrack':
+          byId.set((e.data as Track).id, e.data as Track);
+          break;
+      }
+    }
+    return [...byId.values()];
+  },
+);
+
+/** Every album known locally, deduped by id. */
+export const selectLocalAlbums = createSelector(
+  selectQueries,
+  (queries): Album[] => {
+    const byId = new Map<string, Album>();
+    for (const e of fulfilled(queries)) {
+      switch (e.endpointName) {
+        case 'getAlbums':
+          for (const a of (e.data as PaginatedResponse<Album>).items)
+            byId.set(a.id, a);
+          break;
+        case 'getArtistAlbums':
+          for (const a of e.data as Album[]) byId.set(a.id, a);
+          break;
+        case 'getAlbum':
+          byId.set((e.data as Album).id, e.data as Album);
+          break;
+      }
+    }
+    return [...byId.values()];
+  },
+);
+
+/** Every artist known locally, deduped by id. */
+export const selectLocalArtists = createSelector(
+  selectQueries,
+  (queries): Artist[] => {
+    const byId = new Map<string, Artist>();
+    for (const e of fulfilled(queries)) {
+      switch (e.endpointName) {
+        case 'getArtists':
+          for (const a of (e.data as PaginatedResponse<Artist>).items)
+            byId.set(a.id, a);
+          break;
+        case 'getArtist':
+          byId.set((e.data as Artist).id, e.data as Artist);
+          break;
+      }
+    }
+    return [...byId.values()];
+  },
+);

src/store/slices/auth.ts

@@ -38,12 +38,16 @@ export const authSlice = createSlice({
       action: PayloadAction<{
         accessToken: string;
         refreshToken: string;
-        expiresIn: number;
+        expiresIn?: number;
       }>,
     ) {
       state.accessToken = action.payload.accessToken;
       state.refreshToken = action.payload.refreshToken;
-      state.expiresAt = Date.now() + action.payload.expiresIn * 1000;
+      // Backends that omit a TTL leave expiresAt null — reauth is 401-driven.
+      state.expiresAt =
+        action.payload.expiresIn != null
+          ? Date.now() + action.payload.expiresIn * 1000
+          : null;
       persistAuth(state);
     },
     setUser(state, action: PayloadAction<User>) {

src/store/slices/connection.ts

@@ -0,0 +1,28 @@
+import { createSlice, type PayloadAction } from '@reduxjs/toolkit';
+
+export type ConnectionStatus =
+  | 'connected'
+  | 'connecting'
+  | 'disconnected'
+  | 'error';
+
+export interface ConnectionState {
+  status: ConnectionStatus;
+}
+
+export const connectionInitialState: ConnectionState = {
+  status: 'connecting',
+};
+
+export const connectionSlice = createSlice({
+  name: 'connection',
+  initialState: connectionInitialState,
+  reducers: {
+    setConnectionStatus(state, action: PayloadAction<ConnectionStatus>) {
+      state.status = action.payload;
+    },
+  },
+});
+
+export const { setConnectionStatus } = connectionSlice.actions;
+export default connectionSlice.reducer;

src/store/slices/player.ts

@@ -1,38 +1,28 @@
 import { createSlice, type PayloadAction } from '@reduxjs/toolkit';
 
-type RepeatMode = 'none' | 'one' | 'all';
-
-interface PlayerState {
+export interface PlayerState {
   currentTrackId: string | null;
   isPlaying: boolean;
   position: number;
   duration: number;
   volume: number;
   muted: boolean;
-  repeat: RepeatMode;
-  shuffle: boolean;
-  isNowPlayingOpen: boolean;
   isQueueOpen: boolean;
 }
 
-const initialState: PlayerState = {
+export const playerInitialState: PlayerState = {
   currentTrackId: null,
   isPlaying: false,
   position: 0,
   duration: 0,
   volume: 0.78,
   muted: false,
-  repeat: 'none',
-  shuffle: false,
-  isNowPlayingOpen: false,
-  // STUB: open by default so the queue drawer look is visible before a backend
-  // exists (pairs with DEMO_QUEUE). Default to false once real playback lands.
-  isQueueOpen: true,
+  isQueueOpen: false,
 };
 
 export const playerSlice = createSlice({
   name: 'player',
-  initialState,
+  initialState: playerInitialState,
   reducers: {
     play(state, action: PayloadAction<string>) {
       state.currentTrackId = action.payload;
@@ -62,15 +52,6 @@ export const playerSlice = createSlice({
     toggleMute(state) {
       state.muted = !state.muted;
     },
-    setRepeat(state, action: PayloadAction<RepeatMode>) {
-      state.repeat = action.payload;
-    },
-    toggleShuffle(state) {
-      state.shuffle = !state.shuffle;
-    },
-    toggleNowPlaying(state) {
-      state.isNowPlayingOpen = !state.isNowPlayingOpen;
-    },
     toggleQueue(state) {
       state.isQueueOpen = !state.isQueueOpen;
     },
@@ -86,9 +67,6 @@ export const {
   setDuration,
   setVolume,
   toggleMute,
-  setRepeat,
-  toggleShuffle,
-  toggleNowPlaying,
   toggleQueue,
 } = playerSlice.actions;
 export default playerSlice.reducer;

src/store/slices/queue.ts

@@ -1,6 +1,6 @@
 import { createSlice, type PayloadAction } from '@reduxjs/toolkit';
 
-type QueueSource =
+export type QueueSource =
   | 'manual'
   | 'album'
   | 'playlist'
@@ -8,7 +8,7 @@ type QueueSource =
   | 'search'
   | 'radio';
 
-interface QueueEntry {
+export interface QueueEntry {
   trackId: string;
   title: string;
   artistName: string;
@@ -17,60 +17,29 @@ interface QueueEntry {
   albumArtUrl?: string;
 }
 
-interface QueueState {
+export interface QueueState {
   entries: QueueEntry[];
   currentIndex: number;
   source: QueueSource;
   sourceId: string | null;
   sourceName: string | null;
+  shuffle: boolean;
+  loop: boolean;
 }
 
-// STUB demo queue — purely client-side display data so the player bar and
-// queue drawer render with content before the backend exists. Delete this
-// block (reset entries/currentIndex/source to the empty values) once real
-// playback wires tracks into the queue.
-const DEMO_QUEUE: QueueEntry[] = [
-  {
-    trackId: 'd1',
-    title: 'Quiet Storage',
-    artistName: 'Cyan Atlas',
-    albumTitle: 'Night Index',
-    durationMs: 312_000,
-  },
-  {
-    trackId: 'd2',
-    title: 'Magnetic North',
-    artistName: 'Tidal Bloom',
-    albumTitle: 'Ferric Coast',
-    durationMs: 243_000,
-  },
-  {
-    trackId: 'd3',
-    title: 'Ambergris',
-    artistName: 'Møller',
-    albumTitle: 'Warm Static',
-    durationMs: 201_000,
-  },
-  {
-    trackId: 'd4',
-    title: 'Slow Carrier',
-    artistName: 'Tidal Bloom',
-    albumTitle: 'Ferric Coast',
-    durationMs: 301_000,
-  },
-];
-
-const initialState: QueueState = {
-  entries: DEMO_QUEUE,
-  currentIndex: 0,
-  source: 'radio',
+export const queueInitialState: QueueState = {
+  entries: [],
+  currentIndex: -1,
+  source: 'manual',
   sourceId: null,
-  sourceName: 'My radio',
+  sourceName: null,
+  shuffle: false,
+  loop: false,
 };
 
 export const queueSlice = createSlice({
   name: 'queue',
-  initialState,
+  initialState: queueInitialState,
   reducers: {
     setQueue(
       state,
@@ -94,6 +63,11 @@ export const queueSlice = createSlice({
     addNextInQueue(state, action: PayloadAction<QueueEntry>) {
       state.entries.splice(state.currentIndex + 1, 0, action.payload);
     },
+    playNow(state, action: PayloadAction<QueueEntry>) {
+      const insertAt = state.currentIndex + 1;
+      state.entries.splice(insertAt, 0, action.payload);
+      state.currentIndex = insertAt;
+    },
     removeFromQueue(state, action: PayloadAction<number>) {
       state.entries.splice(action.payload, 1);
       if (action.payload < state.currentIndex) state.currentIndex--;
@@ -112,7 +86,15 @@ export const queueSlice = createSlice({
       state.currentIndex = action.payload;
     },
     nextTrack(state) {
-      if (state.currentIndex < state.entries.length - 1) state.currentIndex++;
+      if (state.shuffle && state.entries.length > 1) {
+        let next = state.currentIndex;
+        while (next === state.currentIndex) {
+          next = Math.floor(Math.random() * state.entries.length);
+        }
+        state.currentIndex = next;
+      } else if (state.currentIndex < state.entries.length - 1) {
+        state.currentIndex++;
+      }
     },
     prevTrack(state) {
       if (state.currentIndex > 0) state.currentIndex--;
@@ -121,6 +103,12 @@ export const queueSlice = createSlice({
       state.entries = [];
       state.currentIndex = -1;
     },
+    toggleShuffle(state) {
+      state.shuffle = !state.shuffle;
+    },
+    toggleLoop(state) {
+      state.loop = !state.loop;
+    },
   },
 });
 
@@ -128,11 +116,14 @@ export const {
   setQueue,
   addToQueue,
   addNextInQueue,
+  playNow,
   removeFromQueue,
   moveInQueue,
   goToIndex,
   nextTrack,
   prevTrack,
   clearQueue,
+  toggleShuffle,
+  toggleLoop,
 } = queueSlice.actions;
 export default queueSlice.reducer;

src/store/slices/ui.ts

@@ -4,12 +4,15 @@ interface UiState {
   sidebarCollapsed: boolean;
   activeModal: string | null;
   activeTrackContextMenuId: string | null;
+  /** Track whose info drawer is open (rightmost drawer); null = closed. */
+  trackInfoId: string | null;
 }
 
 const initialState: UiState = {
   sidebarCollapsed: false,
   activeModal: null,
   activeTrackContextMenuId: null,
+  trackInfoId: null,
 };
 
 export const uiSlice = createSlice({
@@ -31,6 +34,12 @@ export const uiSlice = createSlice({
     setActiveContextMenu(state, action: PayloadAction<string | null>) {
       state.activeTrackContextMenuId = action.payload;
     },
+    openTrackInfo(state, action: PayloadAction<string>) {
+      state.trackInfoId = action.payload;
+    },
+    closeTrackInfo(state) {
+      state.trackInfoId = null;
+    },
   },
 });
 
@@ -40,5 +49,7 @@ export const {
   openModal,
   closeModal,
   setActiveContextMenu,
+  openTrackInfo,
+  closeTrackInfo,
 } = uiSlice.actions;
 export default uiSlice.reducer;

src/styles/global.css

@@ -28,6 +28,11 @@ body {
   margin: 0;
   font-family: var(--font-sans);
   color: var(--fg-1);
+  /* Paint the themed background immediately. The inline theme script in
+     index.html (see rsbuild.config.ts) sets [data-theme] before first paint, so
+     --color-bg resolves to the right value here before React mounts #root and
+     layers the .modern-sk-felt grain on top — no flash of white. */
+  background: var(--color-bg);
   -webkit-font-smoothing: antialiased;
 }
 

src/styles/shell.css

@@ -404,6 +404,55 @@
   font-size: 10px;
 }
 
+/* ---- playing indicator ("hopping bars" equalizer, YTM-style) ---- */
+.playing-bars {
+  display: inline-flex;
+  align-items: flex-end;
+  justify-content: center;
+  gap: 2px;
+  width: 14px;
+  height: 14px;
+  flex-shrink: 0;
+}
+.playing-bars span {
+  display: block;
+  width: 3px;
+  background: var(--lime);
+  border-radius: 1px;
+  height: 30%;
+  animation: playing-bar-bounce 1s ease-in-out infinite;
+}
+.playing-bars span:nth-child(1) {
+  animation-delay: -0.9s;
+}
+.playing-bars span:nth-child(2) {
+  animation-delay: -0.3s;
+}
+.playing-bars span:nth-child(3) {
+  animation-delay: -0.6s;
+}
+.playing-bars.paused span {
+  animation-play-state: paused;
+  height: 100%;
+}
+.spin {
+  animation: spin 1.2s linear infinite;
+}
+@keyframes spin {
+  to {
+    transform: rotate(360deg);
+  }
+}
+@keyframes playing-bar-bounce {
+  0%,
+  100% {
+    height: 30%;
+  }
+  50% {
+    height: 100%;
+  }
+}
+
 /* ============================================================
    PLAYER BAR
    ============================================================ */
@@ -602,38 +651,9 @@
   flex: 1;
   min-height: 0;
   overflow-y: auto;
+  overflow-x: hidden;
   padding: 12px 12px 18px;
 }
-.qd-now {
-  display: flex;
-  gap: 11px;
-  align-items: center;
-  padding: 10px;
-  border-radius: var(--r-md);
-  background: linear-gradient(
-    180deg,
-    rgba(190, 242, 100, 0.13),
-    rgba(190, 242, 100, 0.05)
-  );
-  border: 1px solid rgba(190, 242, 100, 0.2);
-  margin-bottom: 14px;
-}
-.qd-now .qt {
-  min-width: 0;
-  flex: 1;
-}
-.qd-now .qt .t {
-  font-size: 13px;
-  font-weight: 600;
-  color: var(--fg-1);
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-.qd-now .qt .r {
-  font-size: 11px;
-  color: var(--fg-3);
-}
 .qrow {
   display: flex;
   gap: 11px;
@@ -649,6 +669,24 @@
 .qrow:hover {
   background: rgba(255, 255, 255, 0.04);
 }
+.qrow.current {
+  background: linear-gradient(
+    180deg,
+    rgba(190, 242, 100, 0.13),
+    rgba(190, 242, 100, 0.05)
+  );
+  box-shadow: 0 0 0 1px rgba(190, 242, 100, 0.35) inset;
+}
+.qrow.dragging {
+  z-index: 1;
+  cursor: grabbing;
+  background: rgba(255, 255, 255, 0.06);
+  box-shadow: 0 4px 16px rgba(0, 0, 0, 0.4);
+}
+.qrow.current .qt .t {
+  color: var(--lime);
+  font-weight: 600;
+}
 .qrow .grip {
   color: var(--fg-3);
   font-size: 15px;
@@ -663,23 +701,46 @@
   font-size: 13px;
   font-weight: 500;
   color: var(--fg-1);
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
 }
 .qrow .qt .r {
   font-size: 11px;
   color: var(--fg-3);
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  display: flex;
-  align-items: center;
-  gap: 4px;
 }
-.qrow .qt .r .ph {
-  color: var(--lime);
-  font-size: 11px;
+
+/* News-ticker text: clips by default, ping-pong scrolls only when it overflows
+   (the .on class is set by the Marquee component after measuring). */
+.marquee {
+  display: block;
+  max-width: 100%;
+  overflow: hidden;
+  white-space: nowrap;
+}
+.marquee-inner {
+  display: inline-block;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  max-width: 100%;
+  overflow: hidden;
+  vertical-align: bottom;
+}
+.marquee.on .marquee-inner {
+  max-width: none;
+  animation: marquee-pingpong 9s ease-in-out infinite alternate;
+}
+@keyframes marquee-pingpong {
+  0%,
+  12% {
+    transform: translateX(0);
+  }
+  88%,
+  100% {
+    transform: translateX(var(--mq-shift, 0));
+  }
+}
+@media (prefers-reduced-motion: reduce) {
+  .marquee.on .marquee-inner {
+    animation: none;
+  }
 }
 .qd-radio {
   margin-bottom: 14px;
@@ -724,6 +785,164 @@
   font-size: 12px;
 }
 
+/* ============================================================
+   TRACK INFO DRAWER (rightmost — sits right of the queue drawer)
+   ============================================================ */
+/* Same width-collapse pattern as .qd. Rendered after QueuePanel in AppShell so
+   when both are open this is the rightmost panel. */
+.tid {
+  width: 360px;
+  flex-shrink: 0;
+  overflow: hidden;
+  border-left: 1px solid var(--hair);
+  background: linear-gradient(180deg, rgba(0, 0, 0, 0.12), rgba(0, 0, 0, 0.24));
+  transition:
+    width 0.24s var(--ease-out),
+    border-left-color 0.24s var(--ease-out);
+}
+.tid.closed {
+  width: 0;
+  border-left-color: transparent;
+}
+.tid-inner {
+  width: 360px;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  min-height: 0;
+}
+.tid-head {
+  flex-shrink: 0;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  padding: 16px 18px 12px;
+  border-bottom: 1px solid var(--hair);
+}
+.tid-head h3 {
+  margin: 0;
+  font-size: 15px;
+  font-weight: 700;
+  color: var(--fg-1);
+}
+.tid-scroll {
+  flex: 1;
+  min-height: 0;
+  overflow-y: auto;
+  padding: 18px;
+}
+.tid-cover {
+  width: 100%;
+  aspect-ratio: 1 / 1;
+  margin-bottom: 16px;
+  border-radius: 12px;
+  overflow: hidden;
+  background: var(--steel-900);
+  box-shadow: var(--shadow-raised, 0 8px 24px rgba(0, 0, 0, 0.4));
+}
+.tid-cover img {
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+  display: block;
+}
+.tid-title {
+  margin: 0 0 4px;
+  font-size: 19px;
+  font-weight: 700;
+  color: var(--fg-1);
+  line-height: 1.25;
+}
+.tid-sub {
+  display: block;
+  font-size: 13px;
+  color: var(--fg-2);
+  text-decoration: none;
+}
+.tid-sub:hover {
+  color: var(--lime);
+  text-decoration: underline;
+}
+.tid-album {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  margin-top: 3px;
+  color: var(--fg-3);
+}
+.tid-actions {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+  margin: 16px 0 4px;
+}
+.tid-section {
+  margin-top: 18px;
+  padding-top: 14px;
+  border-top: 1px solid var(--hair);
+}
+.tid-section-label {
+  display: block;
+  margin-bottom: 10px;
+}
+.tid-status {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  gap: 8px;
+}
+.tid-error {
+  margin: 8px 0 0;
+  font-size: 12px;
+  color: var(--ember, #e9572b);
+}
+.tid-row {
+  display: flex;
+  gap: 12px;
+  padding: 5px 0;
+  font-size: 13px;
+}
+.tid-row-k {
+  flex-shrink: 0;
+  width: 96px;
+  color: var(--fg-3);
+}
+.tid-row-v {
+  min-width: 0;
+  flex: 1;
+  color: var(--fg-1);
+  text-align: right;
+  word-break: break-word;
+}
+.tid-row-v.mono {
+  font-family: var(--font-mono, ui-monospace, monospace);
+  font-size: 11px;
+  color: var(--fg-2);
+}
+
+/* On narrower viewports the drawer overlays the content instead of pushing it,
+   so the queue + info drawers don't squeeze the main screen. */
+@media (max-width: 1180px) {
+  .app-body {
+    position: relative;
+  }
+  .tid {
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    width: 360px;
+    z-index: 30;
+    box-shadow: -16px 0 40px rgba(0, 0, 0, 0.5);
+    transition: transform 0.24s var(--ease-out);
+  }
+  .tid.closed {
+    width: 360px;
+    transform: translateX(100%);
+    box-shadow: none;
+  }
+}
+
 /* ============================================================
    PAGE HEADER + SECONDARY NAV (Settings, Admin)
    ============================================================ */
@@ -764,3 +983,60 @@
 .sb-sec-link.active {
   color: var(--fg-1);
 }
+
+/* ============================================================
+   TRACK ROW — cover art play overlay
+   ============================================================ */
+.track-art {
+  position: relative;
+  width: 36px;
+  height: 36px;
+  flex-shrink: 0;
+  border-radius: 4px;
+  overflow: hidden;
+}
+.track-art-play {
+  position: absolute;
+  inset: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border: none;
+  border-radius: 4px;
+  background: rgba(0, 0, 0, 0.5);
+  color: var(--fg-1);
+  font-size: 16px;
+  cursor: pointer;
+  opacity: 0;
+  transition: opacity var(--dur-quick);
+}
+.track-art:hover .track-art-play {
+  opacity: 1;
+}
+.track-art-play:hover {
+  color: var(--lime);
+}
+
+/* Now-playing overlay shown on a cover when its track is the active one
+   (track lists and the queue panel both use this). */
+.cover-playing {
+  position: absolute;
+  inset: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: rgba(0, 0, 0, 0.45);
+}
+.track-art:hover .cover-playing {
+  opacity: 0;
+}
+
+/* Queue row cover-art wrapper, sized to match the 36px ArtTile */
+.qart {
+  position: relative;
+  width: 36px;
+  height: 36px;
+  flex-shrink: 0;
+  border-radius: 6px;
+  overflow: hidden;
+}

tests/localLibrary.test.ts

@@ -0,0 +1,87 @@
+import { expect, test } from '@rstest/core';
+import {
+  selectLocalTracks,
+  selectLocalAlbums,
+  selectLocalArtists,
+} from '../src/store/selectors/localLibrary';
+import type { RootState } from '../src/store/index';
+
+function stateWith(queries: Record<string, unknown>): RootState {
+  return { api: { queries } } as unknown as RootState;
+}
+
+const track = (id: string, over: Record<string, unknown> = {}) => ({
+  id,
+  title: `Track ${id}`,
+  artistName: 'A',
+  albumTitle: 'Alb',
+  ...over,
+});
+
+test('selectLocalTracks unions getTracks pages, list endpoints and single tracks', () => {
+  const state = stateWith({
+    'getTracks(undefined)': {
+      status: 'fulfilled',
+      endpointName: 'getTracks',
+      data: { items: [track('1'), track('2')], total: 2 },
+    },
+    'getArtistTracks("x")': {
+      status: 'fulfilled',
+      endpointName: 'getArtistTracks',
+      data: [track('2'), track('3')], // 2 is a dupe
+    },
+    'getTrack("4")': {
+      status: 'fulfilled',
+      endpointName: 'getTrack',
+      data: track('4'),
+    },
+  });
+
+  const ids = selectLocalTracks(state)
+    .map((t) => t.id)
+    .sort();
+  expect(ids).toEqual(['1', '2', '3', '4']);
+});
+
+test('selectLocalTracks ignores pending/rejected and null-data entries', () => {
+  const state = stateWith({
+    'getTracks(a)': {
+      status: 'rejected',
+      endpointName: 'getTracks',
+      data: undefined,
+    },
+    'getTracks(b)': { status: 'pending', endpointName: 'getTracks' },
+    'getTracks(c)': {
+      status: 'fulfilled',
+      endpointName: 'getTracks',
+      data: { items: [track('9')], total: 1 },
+    },
+  });
+  expect(selectLocalTracks(state).map((t) => t.id)).toEqual(['9']);
+});
+
+test('selectLocalAlbums and selectLocalArtists compose and dedupe', () => {
+  const state = stateWith({
+    'getAlbums(undefined)': {
+      status: 'fulfilled',
+      endpointName: 'getAlbums',
+      data: { items: [{ id: 'al1' }, { id: 'al2' }], total: 2 },
+    },
+    'getArtistAlbums("x")': {
+      status: 'fulfilled',
+      endpointName: 'getArtistAlbums',
+      data: [{ id: 'al2' }], // dupe
+    },
+    'getArtists(undefined)': {
+      status: 'fulfilled',
+      endpointName: 'getArtists',
+      data: { items: [{ id: 'ar1' }], total: 1 },
+    },
+  });
+  expect(
+    selectLocalAlbums(state)
+      .map((a) => a.id)
+      .sort(),
+  ).toEqual(['al1', 'al2']);
+  expect(selectLocalArtists(state).map((a) => a.id)).toEqual(['ar1']);
+});

tests/persist.test.ts

@@ -0,0 +1,120 @@
+// @rstest-environment jsdom
+import { expect, test, beforeEach, rstest } from '@rstest/core';
+import {
+  loadQueueState,
+  loadPlayerState,
+  startPersistence,
+} from '../src/store/persist';
+import { queueInitialState, type QueueState } from '../src/store/slices/queue';
+import {
+  playerInitialState,
+  type PlayerState,
+} from '../src/store/slices/player';
+import {
+  upsertInstance,
+  setActiveInstanceId,
+  instanceStorage,
+} from '../src/config/instances';
+
+beforeEach(() => {
+  localStorage.clear();
+  const inst = upsertInstance('http://test.local');
+  setActiveInstanceId(inst.id);
+});
+
+const sampleQueue: QueueState = {
+  entries: [
+    {
+      trackId: 't1',
+      title: 'A',
+      artistName: 'X',
+      albumTitle: 'Alb',
+      durationMs: 1000,
+    },
+    {
+      trackId: 't2',
+      title: 'B',
+      artistName: 'Y',
+      albumTitle: 'Alb',
+      durationMs: 2000,
+    },
+  ],
+  currentIndex: 1,
+  source: 'album',
+  sourceId: 'alb-1',
+  sourceName: 'My Album',
+};
+
+test('loaders fall back to initial state with nothing persisted', () => {
+  expect(loadQueueState()).toEqual(queueInitialState);
+  expect(loadPlayerState()).toEqual(playerInitialState);
+});
+
+test('loadQueueState restores a persisted queue', () => {
+  instanceStorage.set('queue', JSON.stringify(sampleQueue));
+  expect(loadQueueState()).toEqual(sampleQueue);
+});
+
+test('loadQueueState guards a currentIndex past the entries array', () => {
+  instanceStorage.set(
+    'queue',
+    JSON.stringify({ ...sampleQueue, currentIndex: 99 }),
+  );
+  expect(loadQueueState().currentIndex).toBe(0);
+});
+
+test('loadPlayerState restores fields but never auto-resumes playback', () => {
+  instanceStorage.set(
+    'player',
+    JSON.stringify({
+      currentTrackId: 't2',
+      position: 42,
+      volume: 0.5,
+      muted: true,
+      repeat: 'all',
+      shuffle: true,
+      // a stale isPlaying:true must not survive a reload
+      isPlaying: true,
+    }),
+  );
+  const loaded = loadPlayerState();
+  expect(loaded.currentTrackId).toBe('t2');
+  expect(loaded.position).toBe(42);
+  expect(loaded.volume).toBe(0.5);
+  expect(loaded.repeat).toBe('all');
+  expect(loaded.isPlaying).toBe(false);
+});
+
+test('corrupt JSON falls back to initial state', () => {
+  instanceStorage.set('queue', '{not json');
+  expect(loadQueueState()).toEqual(queueInitialState);
+});
+
+test('startPersistence flushes changed state to storage after throttle', () => {
+  rstest.useFakeTimers();
+  let state = {
+    queue: queueInitialState,
+    player: playerInitialState,
+  } as { queue: QueueState; player: PlayerState };
+  let listener: (() => void) | null = null;
+  const store = {
+    getState: () => state as never,
+    subscribe: (l: () => void) => {
+      listener = l;
+      return () => {};
+    },
+  };
+
+  startPersistence(store);
+
+  // mutate + notify
+  state = { ...state, queue: sampleQueue };
+  listener!();
+  // nothing written before the throttle window elapses
+  expect(instanceStorage.get('queue')).toBeNull();
+
+  rstest.advanceTimersByTime(1000);
+  expect(JSON.parse(instanceStorage.get('queue')!).currentIndex).toBe(1);
+
+  rstest.useRealTimers();
+});

tests/rtkqPersist.test.ts

@@ -0,0 +1,105 @@
+// @rstest-environment jsdom
+import { expect, test, beforeEach, rstest } from '@rstest/core';
+import {
+  rehydrateApiCache,
+  startApiPersistence,
+} from '../src/store/rtkqPersist';
+import { REHYDRATE_API } from '../src/api/rehydrate';
+import {
+  upsertInstance,
+  setActiveInstanceId,
+  instanceStorage,
+} from '../src/config/instances';
+import type { RootState } from '../src/store/index';
+
+beforeEach(() => {
+  localStorage.clear();
+  const inst = upsertInstance('http://test.local');
+  setActiveInstanceId(inst.id);
+});
+
+function apiStateWith(queries: Record<string, unknown>) {
+  return {
+    api: {
+      queries,
+      mutations: {},
+      provided: {},
+      subscriptions: {},
+      config: {},
+    },
+  } as unknown as RootState;
+}
+
+test('rehydrateApiCache dispatches nothing when no cache is stored', () => {
+  const dispatched: unknown[] = [];
+  rehydrateApiCache((a) => dispatched.push(a));
+  expect(dispatched).toHaveLength(0);
+});
+
+test('rehydrateApiCache replays a stored cache as a rehydrate action', () => {
+  instanceStorage.set(
+    'rtkq',
+    JSON.stringify({
+      queries: { 'getLibrary(undefined)': { status: 'fulfilled', data: [1] } },
+      mutations: {},
+    }),
+  );
+  const dispatched: Array<{ type: string; payload: unknown }> = [];
+  rehydrateApiCache((a) =>
+    dispatched.push(a as { type: string; payload: unknown }),
+  );
+  expect(dispatched).toHaveLength(1);
+  expect(dispatched[0].type).toBe(REHYDRATE_API);
+  expect(dispatched[0].payload).toMatchObject({
+    queries: { 'getLibrary(undefined)': { status: 'fulfilled' } },
+  });
+});
+
+test('rehydrate payload always carries `provided` (regression: RTKQ reads provided.tags)', () => {
+  // A snapshot persisted before `provided` existed must not crash RTKQ's
+  // invalidation slice, which does `Object.entries(provided.tags ?? {})`.
+  instanceStorage.set(
+    'rtkq',
+    JSON.stringify({
+      queries: { 'getLibrary(undefined)': { status: 'fulfilled', data: [] } },
+      mutations: {},
+    }),
+  );
+  const dispatched: Array<{ payload: { provided?: unknown } }> = [];
+  rehydrateApiCache((a) =>
+    dispatched.push(a as { payload: { provided?: unknown } }),
+  );
+  expect(dispatched[0].payload.provided).toEqual({ tags: {}, keys: {} });
+});
+
+test('startApiPersistence saves only fulfilled queries after throttle', () => {
+  rstest.useFakeTimers();
+  let state = apiStateWith({});
+  let listener: (() => void) | null = null;
+  const store = {
+    getState: () => state,
+    subscribe: (l: () => void) => {
+      listener = l;
+      return () => {};
+    },
+  };
+
+  startApiPersistence(store);
+
+  state = apiStateWith({
+    'getAlbums(undefined)': { status: 'fulfilled', data: ['a'] },
+    'getArtists(undefined)': { status: 'pending' },
+    'getTracks(undefined)': { status: 'rejected', error: 'boom' },
+  });
+  listener!();
+
+  // throttled — nothing yet
+  expect(instanceStorage.get('rtkq')).toBeNull();
+
+  rstest.advanceTimersByTime(2000);
+  const saved = JSON.parse(instanceStorage.get('rtkq')!);
+  expect(Object.keys(saved.queries)).toEqual(['getAlbums(undefined)']);
+  expect(saved.mutations).toEqual({});
+
+  rstest.useRealTimers();
+});

tests/sw-core.test.ts

@@ -0,0 +1,79 @@
+import { expect, test } from '@rstest/core';
+import {
+  trackIdFromUrl,
+  cacheKeyFor,
+  parseRangeHeader,
+  selectEvictions,
+} from '../public/sw-core.js';
+
+test('trackIdFromUrl extracts the content id from a stream URL', () => {
+  expect(trackIdFromUrl('https://host/api/v1/stream/abc123?token=xyz')).toBe(
+    'abc123',
+  );
+  expect(trackIdFromUrl('https://host/api/v1/library/albums')).toBeNull();
+});
+
+test('cacheKeyFor strips the token so the key is token-stable', () => {
+  const a = cacheKeyFor('https://host/api/v1/stream/t1?token=AAA');
+  const b = cacheKeyFor('https://host/api/v1/stream/t1?token=BBB');
+  expect(a).toBe(b);
+  expect(a).toBe('https://host/api/v1/stream/t1');
+});
+
+test('cacheKeyFor keeps different origins distinct', () => {
+  expect(cacheKeyFor('https://a/stream/t1?token=x')).not.toBe(
+    cacheKeyFor('https://b/stream/t1?token=x'),
+  );
+});
+
+test('parseRangeHeader: closed range', () => {
+  expect(parseRangeHeader('bytes=0-99', 1000)).toEqual({ start: 0, end: 99 });
+});
+
+test('parseRangeHeader: open-ended range clamps to size', () => {
+  expect(parseRangeHeader('bytes=500-', 1000)).toEqual({
+    start: 500,
+    end: 999,
+  });
+});
+
+test('parseRangeHeader: suffix range (last N bytes)', () => {
+  expect(parseRangeHeader('bytes=-200', 1000)).toEqual({
+    start: 800,
+    end: 999,
+  });
+});
+
+test('parseRangeHeader: end past size is clamped', () => {
+  expect(parseRangeHeader('bytes=900-5000', 1000)).toEqual({
+    start: 900,
+    end: 999,
+  });
+});
+
+test('parseRangeHeader: invalid / no range returns null', () => {
+  expect(parseRangeHeader('', 1000)).toBeNull();
+  expect(parseRangeHeader('items=0-1', 1000)).toBeNull();
+  expect(parseRangeHeader('bytes=500-100', 1000)).toBeNull();
+});
+
+test('selectEvictions: nothing evicted when under cap', () => {
+  const index = {
+    a: { size: 100, lastAccess: 1 },
+    b: { size: 100, lastAccess: 2 },
+  };
+  expect(selectEvictions(index, 100, 1000)).toEqual([]);
+});
+
+test('selectEvictions: evicts least-recently-used first until it fits', () => {
+  const index = {
+    a: { size: 400, lastAccess: 10 }, // oldest
+    b: { size: 400, lastAccess: 30 },
+    c: { size: 400, lastAccess: 20 },
+  };
+  // total 1200 + incoming 400 = 1600, cap 1000 → must free >=600.
+  // LRU order: a (10), c (20). Evict a (1200→800... wait incl incoming)
+  const evicted = selectEvictions(index, 400, 1000);
+  // total with incoming = 1600; evict a → 1200; evict c → 800 <= 1000.
+  expect(evicted).toEqual(['a', 'c']);
+});