style(recommender): format demographic integration test

Co-authored-by: Cursor <cursoragent@cursor.com>

.gitea/workflows/ci-boundaries.yml

@@ -0,0 +1,27 @@
+name: ci / module boundaries
+
+on:
+  push:
+    branches: [main]
+    paths:
+      - 'packages/core/src/**'
+      - 'apps/web/src/features/uploads/**'
+      - 'services/api/internal/uploads/**'
+      - 'scripts/check-boundaries.mjs'
+      - '.gitea/workflows/ci-boundaries.yml'
+  pull_request:
+    paths:
+      - 'packages/core/src/**'
+      - 'apps/web/src/features/uploads/**'
+      - 'services/api/internal/uploads/**'
+      - 'scripts/check-boundaries.mjs'
+      - '.gitea/workflows/ci-boundaries.yml'
+
+jobs:
+  boundaries:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with: { node-version: '22' }
+      - run: node scripts/check-boundaries.mjs

.gitea/workflows/release.yml

@@ -2,6 +2,7 @@
 # Релиз создаётся сразу (статусы Android/десктоп — «собирается»); сборки докладывают файлы
 # и переписывают статус: собран / не удалась (scripts/release.mjs).
 # Один Ubuntu-раннер: сначала APK, потом десктоп (Linux native + Windows через cargo-xwin).
+# После сборок job prune оставляет файлы у последних 8 релизов и последние 8 прогонов Actions.
 # Docker-образы не публикуются: сервер собирает их сам из клонированного репозитория (deploy/update.sh).
 #
 # Секреты (Settings → Actions → Secrets):
@@ -321,3 +322,19 @@ jobs:
         run: |
           node scripts/release.mjs desktop linux cancelled
           node scripts/release.mjs desktop windows cancelled
+
+  prune:
+    name: prune (старые файлы и прогоны)
+    needs: [release, android, desktop]
+    if: always() && needs.release.result == 'success'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with: { node-version: "${{ env.NODE_VERSION }}" }
+      - name: Оставить 8 релизов и 8 прогонов
+        env:
+          GITEA_API: ${{ github.server_url }}/api/v1/repos/${{ github.repository }}
+          GITEA_TOKEN: ${{ secrets.RELEASE_TOKEN || secrets.GITHUB_TOKEN }}
+          TAG: ${{ github.ref_name }}
+        run: node scripts/release.mjs prune

AGENTS.md

@@ -0,0 +1,10 @@
+# Работа с проектом
+
+- Начинай с ближайшего локального `AGENTS.md` и файлов конкретной возможности. Карта документов: `docs/README.md`; реализация архитектуры: `docs/architecture.md`.
+- Web/desktop UI: `apps/web/src`; Android: `apps/mobile/src`; общие правила клиентов: `packages/core/src`; Go API: `services/api/internal`; рекомендации: `services/recommender/pipu_rec`.
+- Контракт HTTP — `api/openapi.yaml`. Читай нужную операцию и связанные схемы. Generated-код (`**/gen/**`, `**/generated/**`) и lock-файлы исследуй точечно; не редактируй вручную.
+- После изменения OpenAPI: `pnpm --filter @pipu/api-client generate`, затем из `services/api`: `go generate ./...`. Проверяй и коммить результат генерации.
+- Новые правила размещай у владельца сценария, IO — в адаптере. Сохраняй явные границы транзакций и платформенные особенности. Узкий интерфейс вводи для конкретного потребителя.
+- Промежуточно запускай проверки затронутой области; перед сдачей — необходимые связанные проверки. Команды запускаются из корня, если не сказано иначе.
+- Общие проверки: `pnpm typecheck`, `pnpm test`, `pnpm i18n:check`, `pnpm test:scripts`. Go: из `services/api` — `go vet ./...`, `go test ./...`. Python: из `services/recommender` — `uv run ruff check .`, `uv run mypy pipu_rec`, `uv run pytest`.
+- Не меняй пользовательские артефакты, локальные бинарники и посторонние незакоммиченные файлы.

README.md

@@ -5,6 +5,7 @@ Self-hosted музыкальный сервис: веб, десктоп и Andro
 
 - Идея продукта: [docs/IDEA.md](docs/IDEA.md)
 - Документация: [docs/README.md](docs/README.md)
+- Карта работы с кодом и проверок: [AGENTS.md](AGENTS.md)
 - Установка сервера на свой домен: [docs/install-guide.md](docs/install-guide.md)
 
 ## Структура
@@ -47,6 +48,7 @@ pnpm --filter @pipu/web dev
 
 ```bash
 pnpm typecheck && pnpm test && pnpm i18n:check && pnpm test:scripts
+pnpm check:boundaries
 ```
 
 ```bash

api/openapi.yaml

@@ -1427,9 +1427,10 @@ paths:
     get:
       operationId: getOnboarding
       tags: [wave]
-      summary: Онбординг вкуса — исполнители и жанры библиотеки для выбора
+      summary: Анкета рекомендаций — варианты, сохранённые ответы и необходимость заполнения
       description: |
-        `required` — показать онбординг: пользователь его не проходил и не пропускал, а своей истории почти нет.
+        `required` — пользователь не проходил и не пропускал анкету либо администратор сбросил рекомендации.
+        `choice` содержит ответы с текущей приблизительной возрастной группой; исходная группа и год хранятся на сервере.
       responses:
         "200":
           description: Варианты и состояние
@@ -1547,9 +1548,10 @@ paths:
       operationId: getAppClients
       tags: [app]
       security: [] # публично: страница /download без входа
-      summary: Клиенты последнего релиза (Android и десктоп)
+      summary: Клиенты последних релизов (Android и десктоп)
       description: |
         Тот же релиз Gitea, что и для Android: APK, установщик Windows, .deb, DMG.
+        У каждой платформы `older` — предыдущие сборки (до 8 релизов, сколько есть с файлами).
         Нет настроек Gitea или файлов клиентов — `404 app.update_unavailable`.
       responses:
         "200":
@@ -1818,6 +1820,8 @@ components:
       properties:
         required:
           type: boolean
+        choice:
+          $ref: "#/components/schemas/OnboardingChoice"
         artists:
           type: array
           items:
@@ -1853,6 +1857,19 @@ components:
       type: object
       required: [artist_ids, genres]
       properties:
+        gender:
+          type: string
+          nullable: true
+          enum: [male, female, other]
+        age_group:
+          type: string
+          nullable: true
+          enum: [under_13, "13_19", "20_29", "30_39", "40_49", "50_59", 60_plus]
+          description: Текущая приблизительная возрастная группа. Сервер хранит год выбора и учитывает прошедшие годы.
+        age_group_year:
+          type: integer
+          readOnly: true
+          description: Год последнего выбора возрастной группы.
         artist_ids:
           type: array
           maxItems: 50
@@ -3581,12 +3598,12 @@ components:
     AppClient:
       type: string
       enum: [android, windows, linux, macos]
-    AppClientFile:
+    AppClientBuild:
       type: object
-      required: [client, filename, size, download_url]
+      required: [version, filename, size, download_url]
       properties:
-        client:
-          $ref: "#/components/schemas/AppClient"
+        version:
+          type: string
         filename:
           type: string
         size:
@@ -3596,6 +3613,27 @@ components:
           type: string
         download_url:
           type: string
+    AppClientFile:
+      type: object
+      required: [client, filename, size, download_url]
+      properties:
+        client:
+          $ref: "#/components/schemas/AppClient"
+        version:
+          type: string
+        filename:
+          type: string
+        size:
+          type: integer
+          format: int64
+        sha256:
+          type: string
+        download_url:
+          type: string
+        older:
+          type: array
+          items:
+            $ref: "#/components/schemas/AppClientBuild"
     AppClients:
       type: object
       required: [version, version_code, notes_md, clients]

apps/mobile/AGENTS.md

@@ -0,0 +1,7 @@
+# Android
+
+- `src/player/controller.ts` — фасад и зеркало native-очереди; `service.ts` — фоновые события. Владельцем воспроизводимой очереди остаётся TrackPlayer.
+- Общая политика волны — `packages/core/src`; офлайн-адаптация — `src/player/offlineWave.ts`, `src/offline`.
+- Сессия/настройки — `src/lib`; маршруты — `src/app`. Сохраняй работу при выгруженном UI и изоляцию офлайн-данных по пользователю/серверу.
+- `pnpm --filter @pipu/mobile typecheck`, `pnpm --filter @pipu/mobile test`.
+- Изменения native playback требуют проверки на устройстве: background, смена трека, offline→online. Unit-тесты не заменяют эту проверку.

apps/mobile/src/app/(tabs)/index.tsx

@@ -9,6 +9,7 @@ import { player } from '../../player/controller';
 import { usePlayerState } from '../../player/hooks';
 import { useColors } from '../../theme';
 import { ErrorBox, Icon, Screen, useErrorText, type IconName } from '../../ui/kit';
+import { OnboardingGate } from '../../ui/Onboarding';
 import { WaveOrb } from '../../ui/wave/WaveOrb';
 
 /** Имена из /wave/options (Material Symbols) → MaterialIcons. */
@@ -22,6 +23,10 @@ function iconFor(name: string): IconName {
  * На Android спектр недоступен, поэтому пульс берётся из BPM и energy трека (docs/mobile.md).
  */
 export default function HomeScreen() {
+  return <OnboardingGate><WaveHome /></OnboardingGate>;
+}
+
+function WaveHome() {
   const colors = useColors();
   const { t } = useTranslation();
   const tr = t as unknown as (k: string) => string;

apps/mobile/src/app/(tabs)/profile.tsx

@@ -15,6 +15,7 @@ import { player } from '../../player/controller';
 import { radius, useColors } from '../../theme';
 import { Button, H1, Icon, Muted, Screen, Segmented } from '../../ui/kit';
 import { useDownloads } from '../../ui/downloads';
+import { RecommendationSettings } from '../../ui/Onboarding';
 import { PasswordSheet, QualitySheet, useQualityPrefs } from '../../ui/settings';
 import { useUpdateState } from '../../ui/UpdateDialog';
 
@@ -74,6 +75,8 @@ export default function ProfileScreen() {
           @{user.username} · {t(`roles.${user.role}`)}
         </Muted>
 
+        <RecommendationSettings />
+
         <Section>
           <Row label={t('language.label')}>
             <Segmented<Locale>

apps/mobile/src/player/controller.ts

@@ -1,6 +1,11 @@
 import NetInfo from '@react-native-community/netinfo';
 import {
   EventBuffer,
+  WaveCoordinator,
+  EARLY_SKIP_MS,
+  type WaveInfo,
+  type WaveOutcome,
+  type WaveFeedback,
   PlayAttempt,
   normalizeGain,
   unwrap,
@@ -24,12 +29,7 @@ import { eventId } from './eventId';
 
 export { offlineWave };
 
-export interface WaveInfo {
-  sessionId: string;
-  activity: string | null;
-  mood: string | null;
-  fallback: boolean;
-}
+export type { WaveInfo } from '@pipu/core';
 
 export interface PlayerState {
   ready: boolean;
@@ -44,10 +44,6 @@ export interface PlayerState {
   wave: WaveInfo | null;
 }
 
-type WaveOutcome = 'complete' | 'skip' | 'skip_early' | 'like' | 'dislike';
-
-const WAVE_REFILL_AT = 2;
-const EARLY_SKIP_MS = 30_000;
 const SAVE_EVERY_MS = 10_000;
 
 const playable = (t: Track) => t.available && (!!t.stream_url || downloads.isDownloaded(t.id));
@@ -84,8 +80,13 @@ class Controller {
   private attempt: PlayAttempt | null = null;
   private lastPositionMs = 0;
   private lastSave = 0;
-  private waveFeedback: { track_id: string; outcome: WaveOutcome }[] = [];
-  private waveLoading = false;
+  private readonly wavePolicy = new WaveCoordinator({
+    next: async (id: string, feedback: WaveFeedback[]) => unwrap(
+      await this.session!.client.POST('/api/v1/wave/sessions/{id}/next', {
+        params: { path: { id } }, body: { feedback },
+      }),
+    ),
+  });
   private neutralSwitch = false; // следующая смена трека — из-за нового контекста волны
   private setupDone: Promise<void> | null = null;
   private listeners = new Set<() => void>();
@@ -308,18 +309,22 @@ class Controller {
     if (!this.session) return;
     await this.setup();
     this.leaveWave();
+    const version = this.wavePolicy.version;
     let res;
     try {
       res = unwrap(await this.session.client.POST('/api/v1/wave/sessions', { body: { activity, mood } }));
     } catch (e) {
+      if (!this.wavePolicy.isCurrent(version)) return;
       // Нет связи с сервером — офлайн-волна из скачанного.
       const local = offlineWave(downloads.downloaded());
       if (!local.length) throw e;
       return this.playList(local, 0, { type: 'collection', id: 'downloads' });
     }
+    if (!this.wavePolicy.isCurrent(version)) return;
     const tracks = res.tracks.filter(playable);
     if (!tracks.length) return;
     this.finishAttempt(this.lastPositionMs / 1000);
+    this.wavePolicy.activate(res.session_id);
     this.update({
       queue: tracks, index: 0, track: tracks[0] ?? null, context: { type: 'wave', id: res.session_id },
       wave: { sessionId: res.session_id, activity: res.activity, mood: res.mood, fallback: res.fallback },
@@ -332,13 +337,16 @@ class Controller {
   async setWaveContext(activity: string | null, mood: string | null) {
     const wave = this.state.wave;
     if (!wave || !this.session) return this.startWave(activity, mood);
+    const version = this.wavePolicy.changeContext(wave.sessionId);
     const res = unwrap(
       await this.session.client.PATCH('/api/v1/wave/sessions/{id}', {
         params: { path: { id: wave.sessionId } },
         body: { activity, mood },
       }),
     );
-    await this.replaceUpcoming(res.tracks);
+    if (!this.wavePolicy.isCurrent(version)) return;
+    await this.replaceUpcoming(res.tracks, () => this.wavePolicy.isCurrent(version));
+    if (!this.wavePolicy.isCurrent(version)) return;
     this.update({ wave: { ...wave, activity: res.activity, mood: res.mood, fallback: res.fallback } });
     // Новый контекст звучит сразу; прерванный трек — не скип для волны (как в вебе).
     if (res.tracks.some(playable)) {
@@ -351,8 +359,8 @@ class Controller {
 
   private leaveWave() {
     const wave = this.state.wave;
+    this.wavePolicy.activate(null);
     if (!wave) return;
-    this.waveFeedback = [];
     this.update({ wave: null });
     void this.session?.client
       .DELETE('/api/v1/wave/sessions/{id}', { params: { path: { id: wave.sessionId } } })
@@ -360,46 +368,36 @@ class Controller {
   }
 
   private noteWave(trackId: string, outcome: WaveOutcome) {
-    if (this.state.wave) this.waveFeedback.push({ track_id: trackId, outcome });
+    this.wavePolicy.note(trackId, outcome);
   }
 
   /** Убрать не начатые треки и поставить новые (после реакции или смены контекста). */
-  private async replaceUpcoming(tracks: Track[]) {
+  private async replaceUpcoming(tracks: Track[], current: () => boolean = () => true) {
     const keep = this.state.queue.slice(0, this.state.index + 1);
-    await TrackPlayer.removeUpcomingTracks();
     const add = tracks.filter(playable);
-    await TrackPlayer.add(await this.toRntp(add));
-    this.update({ queue: [...keep, ...add] });
+    const native = await this.toRntp(add);
+    if (!current()) return;
+    await TrackPlayer.removeUpcomingTracks();
+    if (!current()) return;
+    await TrackPlayer.add(native);
+    if (current()) this.update({ queue: [...keep, ...add] });
   }
 
   private async refillWave(refresh = false) {
-    const wave = this.state.wave;
-    if (!wave || !this.session || this.waveLoading) return;
+    if (!this.session) return;
     const remaining = this.state.queue.length - this.state.index - 1;
-    if (!refresh && remaining > WAVE_REFILL_AT) return;
-    this.waveLoading = true;
-    const feedback = this.waveFeedback;
-    this.waveFeedback = [];
-    try {
-      const res = unwrap(
-        await this.session.client.POST('/api/v1/wave/sessions/{id}/next', {
-          params: { path: { id: wave.sessionId } },
-          body: { feedback },
-        }),
-      );
-      if (this.state.wave?.sessionId !== wave.sessionId) return;
-      if (refresh) await this.replaceUpcoming(res.tracks);
+    await this.wavePolicy.refill(remaining, refresh, async (res, current) => {
+      if (refresh) await this.replaceUpcoming(res.tracks, current);
       else {
         const add = res.tracks.filter(playable);
-        await TrackPlayer.add(await this.toRntp(add));
+        const native = await this.toRntp(add);
+        if (!current()) return;
+        await TrackPlayer.add(native);
+        if (!current()) return;
         this.update({ queue: [...this.state.queue, ...add] });
       }
-      this.update({ wave: { ...wave, fallback: res.fallback } });
-    } catch {
-      this.waveFeedback = [...feedback, ...this.waveFeedback];
-    } finally {
-      this.waveLoading = false;
-    }
+      if (current()) this.update({ wave: { ...this.state.wave!, fallback: res.fallback } });
+    });
   }
 
   // --- состояние ---
@@ -443,6 +441,7 @@ class Controller {
   }
 
   async reset() {
+    this.wavePolicy.activate(null);
     this.attempt = null;
     this.update({ queue: [], track: null, index: 0, playing: false, positionMs: 0, wave: null, context: null });
     if (this.setupDone) await TrackPlayer.reset().catch(() => undefined);

apps/mobile/src/ui/Onboarding.tsx

@@ -0,0 +1,85 @@
+import type { components } from '@pipu/api-client';
+import { AGE_GROUPS, GENDERS, unwrap } from '@pipu/core';
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { useState, type ReactNode } from 'react';
+import { useTranslation } from 'react-i18next';
+import { ActivityIndicator, Pressable, ScrollView, Text, View } from 'react-native';
+
+import { useSession, useSessionCtx, useUser } from '../lib/session';
+import { useColors } from '../theme';
+import { Button, ErrorBox, H1, Muted, Screen, useErrorText } from './kit';
+
+type Options = components['schemas']['Onboarding'];
+type Choice = components['schemas']['OnboardingChoice'];
+
+function useOnboarding() {
+  const session = useSession();
+  const user = useUser();
+  const { server } = useSessionCtx();
+  return useQuery({ queryKey: ['onboarding', server, user.id],
+    queryFn: async () => unwrap(await session.client.GET('/api/v1/onboarding')),
+    staleTime: 0, refetchInterval: 30_000 });
+}
+
+export function OnboardingGate({ children }: { children: ReactNode }) {
+  const query = useOnboarding();
+  const client = useQueryClient();
+  if (query.isPending) return <Screen><ActivityIndicator /></Screen>;
+  if (!query.data?.required) return <>{children}</>;
+  return <Screen><ScrollView contentContainerStyle={{ padding: 16 }}>
+    <Onboarding options={query.data} onDone={() => void client.invalidateQueries({ queryKey: ['onboarding'] })} />
+  </ScrollView></Screen>;
+}
+
+export function RecommendationSettings() {
+  const { t } = useTranslation();
+  const query = useOnboarding();
+  const client = useQueryClient();
+  const [editing, setEditing] = useState(false);
+  const errorText = useErrorText();
+  return <View>
+    {editing && query.data ? <Onboarding key={JSON.stringify(query.data.choice)} options={query.data} editing onDone={() => {
+      setEditing(false); void client.invalidateQueries({ queryKey: ['onboarding'] });
+    }} /> : <Button title={t('onboarding.edit')} variant="secondary" busy={query.isFetching} onPress={() => { void query.refetch().then((result) => { if (result.data && !result.error) setEditing(true); }); }} />}
+    <ErrorBox>{query.error ? errorText(query.error) : null}</ErrorBox>
+  </View>;
+}
+
+function Onboarding({ options, onDone, editing = false }: { options: Options; onDone: () => void; editing?: boolean }) {
+  const { t } = useTranslation();
+  const session = useSession();
+  const errorText = useErrorText();
+  const [choice, setChoice] = useState<Choice>(options.choice ?? { artist_ids: [], genres: [], gender: null, age_group: null });
+  const save = useMutation({ mutationFn: async (skip: boolean) => unwrap(await session.client.PUT('/api/v1/me/onboarding', {
+    body: skip ? { artist_ids: [], genres: [], gender: null, age_group: null } : choice,
+  })), onSuccess: onDone });
+  const toggle = (key: 'artist_ids' | 'genres', value: string) => setChoice((old) => ({ ...old,
+    [key]: old[key].includes(value) ? old[key].filter((x) => x !== value) : [...old[key], value],
+  }));
+  return <View style={{ gap: 20 }}>
+    <H1>{t('onboarding.title')}</H1><Muted>{t('onboarding.subtitle')}</Muted>
+    <Choices title={t('onboarding.gender')} items={[{ value: '', label: t('onboarding.unspecified') }, ...GENDERS.map((g) => ({ value: g, label: t(`onboarding.genders.${g}`) }))]}
+      selected={[choice.gender ?? '']} onPick={(v) => setChoice((old) => ({ ...old, gender: (v || null) as Choice['gender'] }))} />
+    <Choices title={t('onboarding.age_group')} items={[{ value: '', label: t('onboarding.unspecified') }, ...AGE_GROUPS.map((g) => ({ value: g, label: t(`onboarding.ages.${g}`) }))]}
+      selected={[choice.age_group ?? '']} onPick={(v) => setChoice((old) => ({ ...old, age_group: (v || null) as Choice['age_group'] }))} />
+    <Muted>{t('onboarding.age_hint')}</Muted>
+    <Choices title={t('onboarding.artists')} items={options.artists.map((a) => ({ value: a.id, label: a.name }))} selected={choice.artist_ids} onPick={(v) => toggle('artist_ids', v)} />
+    <Choices title={t('onboarding.genres')} items={options.genres.map((g) => ({ value: g.name, label: g.name }))} selected={choice.genres} onPick={(v) => toggle('genres', v)} />
+    <ErrorBox>{save.error ? errorText(save.error) : null}</ErrorBox>
+    <Button title={t(editing ? 'settings.save' : 'onboarding.done')} busy={save.isPending} onPress={() => save.mutate(false)} />
+    <Button title={t(editing ? 'form.cancel' : 'onboarding.skip')} variant="ghost" disabled={save.isPending} onPress={() => editing ? onDone() : save.mutate(true)} />
+  </View>;
+}
+
+function Choices({ title, items, selected, onPick }: { title: string; items: { value: string; label: string }[]; selected: string[]; onPick: (value: string) => void }) {
+  const colors = useColors();
+  return <View style={{ gap: 10 }}><Text style={{ color: colors.text, fontWeight: '600' }}>{title}</Text>
+    <View style={{ flexDirection: 'row', flexWrap: 'wrap', gap: 8 }}>{items.map((item) => {
+      const on = selected.includes(item.value);
+      return <Pressable key={item.value} accessibilityRole="button" accessibilityState={{ selected: on }} onPress={() => onPick(item.value)}
+        style={{ padding: 12, borderRadius: 20, backgroundColor: on ? colors['accent-fill'] : colors.surface2 }}>
+        <Text style={{ color: on ? '#fff' : colors.text }}>{item.label}</Text>
+      </Pressable>;
+    })}</View>
+  </View>;
+}

apps/mobile/test/controller.test.ts

@@ -0,0 +1,72 @@
+import type { AuthSession, Track } from '@pipu/core';
+import { beforeEach, expect, it, vi } from 'vitest';
+
+vi.mock('@react-native-community/netinfo', () => ({ default: {
+  fetch: async () => ({ type: 'wifi' }), addEventListener: () => () => {},
+} }));
+vi.mock('../src/lib/prefs', () => ({
+  qualityPrefs: { load: async () => ({ wifi: 'high', cellular: 'medium' }) },
+  playerCache: { clearIfRequested: async () => {} },
+}));
+vi.mock('../src/offline/events', () => ({ PersistentEvents: class {} }));
+vi.mock('../src/offline/downloads', () => ({
+  downloads: { isDownloaded: () => false, localTrack: () => undefined, localCover: () => undefined, downloaded: () => [] },
+  sizedCover: (s: string) => s,
+}));
+vi.mock('react-native-track-player', () => ({
+  default: {
+    isServiceRunning: async () => true, setupPlayer: async () => {}, updateOptions: async () => {},
+    addEventListener: vi.fn(), reset: vi.fn().mockResolvedValue(undefined),
+    add: vi.fn().mockResolvedValue(undefined), play: vi.fn().mockResolvedValue(undefined),
+    skip: vi.fn().mockResolvedValue(undefined),
+  },
+  AppKilledPlaybackBehavior: {}, Capability: {}, Event: {}, State: {},
+}));
+
+function track(id: string): Track {
+  return { id, title: id, duration_ms: 1000, artists: [],
+    album: { id: 'album', title: 'Album', year: null, cover_url: null, cover_colors: [] },
+    genres: [], disc_no: 1, track_no: 1, available: true, stream_url: `/s/${id}?sig=x`, reaction: null, features: null };
+}
+function deferred<T>() {
+  let resolve!: (v: T) => void;
+  const promise = new Promise<T>((yes) => { resolve = yes; });
+  return { promise, resolve };
+}
+const reply = (id: string) => ({ data: { session_id: id, activity: null, mood: null, fallback: false, tracks: [track(id)] }, response: new Response() });
+
+beforeEach(() => { vi.resetModules(); vi.clearAllMocks(); });
+
+it('ignores a wave creation response after the player is reset', async () => {
+  const { player } = await import('../src/player/controller');
+  const native = (await import('react-native-track-player')).default;
+  const pending = deferred<ReturnType<typeof reply>>();
+  const post = vi.fn().mockReturnValue(pending.promise);
+  player.attach({ client: { POST: post } } as unknown as AuthSession, 'http://localhost', null);
+  const start = player.startWave(null, null);
+  await vi.waitFor(() => expect(post).toHaveBeenCalled());
+  await player.reset();
+  pending.resolve(reply('old'));
+  await start;
+  expect(player.getState().wave).toBeNull();
+  expect(player.getState().queue).toEqual([]);
+  expect(native.add).not.toHaveBeenCalled();
+});
+
+it('does not let a late context response replace a manually selected playlist', async () => {
+  const { player } = await import('../src/player/controller');
+  const pending = deferred<ReturnType<typeof reply>>();
+  const session = { client: {
+    POST: vi.fn().mockResolvedValue(reply('wave')),
+    PATCH: vi.fn().mockReturnValue(pending.promise), DELETE: vi.fn().mockResolvedValue({}),
+  } };
+  player.attach(session as unknown as AuthSession, 'http://localhost', null);
+  await player.startWave(null, null);
+  const change = player.setWaveContext('focus', null);
+  await player.playList([track('manual')], 0, { type: 'album', id: 'album' });
+  pending.resolve(reply('stale'));
+  await change;
+  expect(player.getState().wave).toBeNull();
+  expect(player.getState().queue.map((t) => t.id)).toEqual(['manual']);
+  expect(player.getState().context?.type).toBe('album');
+});

apps/web/AGENTS.md

@@ -0,0 +1,8 @@
+# Web и desktop UI
+
+- Маршруты: `src/app/router.tsx`; сессия: `src/app/session.tsx`; страницы собирают возможности, `src/features` владеет сценариями.
+- Воспроизведение: `src/player/player.ts` — фасад; адаптеры рядом. Общие правила очереди, событий и волны — `packages/core/src`.
+- Загрузки: `src/features/uploads`; страница очереди — `src/pages/admin/UploadQueuePage.tsx`. Сохраняй query keys/invalidation, права и поведение диалогов.
+- `pnpm --filter @pipu/web typecheck`; `pnpm --filter @pipu/web test`. Для локальной проверки можно передать путь теста после `test`.
+- UI/навигация/диалоги: `pnpm --filter @pipu/web test:e2e`. Проверки используют fake API; реальная серверная авторизация покрывается Go отдельно.
+- Restore не запускает музыку и не создаёт событие прослушивания. Ошибка preload не пропускает трек. Dispose должен освобождать обработчики.

apps/web/e2e/playlists.spec.ts

@@ -10,7 +10,10 @@ for (const width of [320, 1280]) {
     await page.getByRole('button', { name: 'Войти', exact: true }).click();
     if (width < 768) await page.getByRole('button', { name: 'Ещё', exact: true }).click();
     await page.getByRole('link', { name: 'Плейлисты', exact: true }).click();
-    await page.getByRole('button', { name: 'Создать плейлист', exact: true }).click();
+    const playlistsHeader = page.locator('header').filter({
+      has: page.getByRole('heading', { name: 'Плейлисты', exact: true }),
+    });
+    await playlistsHeader.getByRole('button', { name: 'Создать плейлист', exact: true }).click();
     await page.getByLabel('Название', { exact: true }).fill('Музыка для долгой дороги');
     await page.getByLabel('Описание', { exact: true }).fill('Любимые песни всегда рядом');
     await page.getByRole('button', { name: 'Сохранить', exact: true }).click();

apps/web/e2e/scenarios.spec.ts

@@ -48,6 +48,15 @@ test('settings expose crossfade and loudness normalization', async ({ page }) =>
   const slider = page.getByRole('slider', { name: /Кроссфейд/ });
   await slider.fill('4');
   await expect(page.getByText('Кроссфейд, 4 с')).toBeVisible();
+  await page.getByRole('button', { name: 'Настроить рекомендации' }).click();
+  await page.getByRole('button', { name: 'Мужской', exact: true }).click();
+  await page.getByRole('button', { name: '13–19', exact: true }).click();
+  const form = page.getByRole('heading', { name: 'Что вы любите слушать?' }).locator('../..');
+  await form.getByRole('button', { name: 'Сохранить', exact: true }).click();
+  await page.getByRole('button', { name: 'Настроить рекомендации' }).click();
+  await expect(page.getByRole('button', { name: 'Мужской', exact: true })).toHaveAttribute('aria-pressed', 'true');
+  await expect(page.getByRole('button', { name: '13–19', exact: true })).toHaveAttribute('aria-pressed', 'true');
+
 });
 test('9. login page switches between Russian and English', async ({ page }) => {
   await page.goto('/login');

apps/web/src/App.test.tsx

@@ -291,7 +291,7 @@ describe('player', () => {
     await user.click(screen.getByRole('button', { name: 'Войти' }));
     await screen.findByRole('heading', { name: 'Закрой за мной дверь' });
     expect(router.state.location.pathname).toBe(path);
-    await user.click(screen.getByRole('listitem'));
+    await user.click(screen.getByRole('button', { name: 'Слушать' }));
     const bar = screen.getByRole('contentinfo', { name: 'Плеер' });
     await user.click(within(bar).getByRole('button', { name: 'Поделиться треком' }));
     expect(await within(bar).findByRole('status')).toHaveTextContent('Ссылка на трек скопирована');
@@ -479,3 +479,30 @@ describe('playlists', () => {
     expect(api.playlists.get(item.id)?.name).toBe('Другое устройство');
   });
 });
+
+
+describe('recommendation preferences', () => {
+  it('saves demographics, edits the age group and asks again after an admin reset', async () => {
+    const admin = makeUser('owner', 'admin');
+    const { user, api, router, session } = await renderApp([admin], '/settings', { signedInAs: admin });
+    await user.click(await screen.findByRole('button', { name: 'Настроить рекомендации' }));
+    await user.click(await screen.findByRole('button', { name: 'Мужской' }));
+    await user.click(screen.getByRole('button', { name: '13–19' }));
+    await user.click(screen.getAllByRole('button', { name: 'Сохранить' }).find((b) => !b.hasAttribute('disabled'))!);
+    await screen.findByRole('button', { name: 'Настроить рекомендации' });
+    expect(api.calls.filter((c) => c.path === '/api/v1/me/onboarding').at(-1)?.body).toMatchObject({ gender: 'male', age_group: '13_19' });
+    await user.click(screen.getByRole('button', { name: 'Настроить рекомендации' }));
+    expect(await screen.findByRole('button', { name: '13–19' })).toHaveAttribute('aria-pressed', 'true');
+    await user.click(screen.getByRole('button', { name: '20–29' }));
+    await user.click(screen.getAllByRole('button', { name: 'Сохранить' }).find((b) => !b.hasAttribute('disabled'))!);
+    await screen.findByRole('button', { name: 'Настроить рекомендации' });
+    await session.client.POST('/api/v1/admin/users/{id}/reset-recommendations', { params: { path: { id: admin.id } } });
+    await router.navigate({ to: '/' });
+    await screen.findByRole('heading', { name: 'Что вы любите слушать?' });
+    expect(screen.getByRole('button', { name: 'Мужской' })).toHaveAttribute('aria-pressed', 'false');
+    expect(screen.getByRole('button', { name: '20–29' })).toHaveAttribute('aria-pressed', 'false');
+    await user.click(screen.getByRole('button', { name: 'Пропустить' }));
+    await screen.findByRole('button', { name: 'Запустить «Мою волну»' });
+    expect(api.calls.filter((c) => c.path === '/api/v1/me/onboarding').at(-1)?.body).toEqual({ artist_ids: [], genres: [], gender: null, age_group: null });
+  });
+});

apps/web/src/entities/catalog.module.css

@@ -8,12 +8,18 @@
   color: rgba(255, 255, 255, 0.85);
 }
 
-.cover img {
+.coverImg {
   position: absolute;
   inset: 0;
   width: 100%;
   height: 100%;
   object-fit: cover;
+  opacity: 0;
+  transition: opacity 0.35s ease;
+}
+
+.coverImgOn {
+  opacity: 1;
 }
 
 .round {
@@ -59,10 +65,52 @@
   width: 128px;
 }
 
+.cardCoverWrap {
+  position: relative;
+  margin-bottom: 4px;
+  overflow: hidden;
+  border-radius: 12px;
+}
+
 .cardCover {
   aspect-ratio: 1;
   border-radius: 12px;
-  margin-bottom: 4px;
+  transition: transform 0.28s cubic-bezier(0.2, 0.8, 0.2, 1);
+}
+
+.card:hover .cardCover,
+.card:focus-within .cardCover {
+  transform: scale(1.04);
+}
+
+.cardPlay {
+  position: absolute;
+  right: 10px;
+  bottom: 10px;
+  z-index: 1;
+  display: grid;
+  place-items: center;
+  width: 44px;
+  height: 44px;
+  border-radius: 50%;
+  background: #fff;
+  color: #05070d;
+  opacity: 0;
+  transform: translateY(6px);
+  transition:
+    opacity 0.18s,
+    transform 0.18s;
+}
+
+.card:hover .cardPlay,
+.card:focus-within .cardPlay,
+.cardPlay:focus-visible {
+  opacity: 1;
+  transform: none;
+}
+
+.cardPlay:active {
+  transform: scale(0.94);
 }
 
 .cardTitle {
@@ -104,6 +152,12 @@
   min-height: 56px;
   padding: 6px 12px;
   border-radius: 10px;
+  animation: pipuIn 0.2s ease-out both;
+  animation-delay: var(--stagger, 0ms);
+}
+
+.trackStatic {
+  animation: none;
 }
 
 .track:has(.trackAlbum) {
@@ -272,6 +326,7 @@
 }
 
 @media (max-width: 767px) {
+  .cardPlay { opacity: 1; transform: none; }
   .grid { grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 16px; }
   .track, .track:has(.trackAlbum) { gap: 8px; padding: 6px 4px; }
   .track:has(.lead), .track:has(.lead):has(.trackAlbum) { grid-template-columns: 24px 40px minmax(0, 1fr) auto; }

apps/web/src/entities/catalog.tsx

@@ -1,10 +1,12 @@
 import type { components } from '@pipu/api-client';
+import { unwrap } from '@pipu/core';
 import { Link } from '@tanstack/react-router';
 import { useVirtualizer } from '@tanstack/react-virtual';
-import { Fragment, useRef, type ReactNode } from 'react';
+import { Fragment, useRef, useState, type CSSProperties, type MouseEvent, type ReactNode } from 'react';
 import { AddToPlaylist } from './playlists';
 import { useTranslation } from 'react-i18next';
 
+import { useSession } from '../app/session';
 import { formatDuration } from '../shared/lib/format';
 import { usePlayer, usePlayerState } from '../player/context';
 import type { PlayContext } from '../player/player';
@@ -59,7 +61,7 @@ export function Cover({
       aria-hidden
     >
       {album.cover_url ? (
-        <img src={coverSrc(album.cover_url, typeof size === 'number' ? size : 300)} alt="" loading="lazy" />
+        <CoverImg src={coverSrc(album.cover_url, typeof size === 'number' ? size : 300)} />
       ) : (
         <Icon src={round ? personIcon : albumIcon} size={typeof size === 'number' ? Math.max(16, size * 0.4) : 40} />
       )}
@@ -83,10 +85,39 @@ export function ArtistLinks({ artists }: { artists: ArtistRef[] }) {
   );
 }
 
+function CoverImg({ src }: { src: string }) {
+  const [ready, setReady] = useState(false);
+  return (
+    <img
+      src={src}
+      alt=""
+      loading="lazy"
+      className={cx(s.coverImg, ready && s.coverImgOn)}
+      onLoad={() => setReady(true)}
+    />
+  );
+}
+
 export function AlbumCard({ album }: { album: AlbumSummary }) {
+  const { t } = useTranslation();
+  const session = useSession();
+  const player = usePlayer();
+  const play = (e: MouseEvent) => {
+    e.preventDefault();
+    e.stopPropagation();
+    void (async () => {
+      const full = unwrap(await session.client.GET('/api/v1/albums/{id}', { params: { path: { id: album.id } } }));
+      if (full.tracks.some((tr) => tr.available)) player.playList(full.tracks, 0, { type: 'album', id: album.id, label: album.title });
+    })();
+  };
   return (
     <Link to="/album/$id" params={{ id: album.id }} className={s.card}>
-      <Cover album={album} size="100%" className={s.cardCover} />
+      <span className={s.cardCoverWrap}>
+        <Cover album={album} size="100%" className={s.cardCover} />
+        <button type="button" className={s.cardPlay} aria-label={t('catalog.play')} onClick={play}>
+          <Icon src={playIcon} size={22} />
+        </button>
+      </span>
       <span className={s.cardTitle}>{album.title}</span>
       <span className={s.cardMeta}>
         {[album.artist.name, album.year].filter(Boolean).join(' · ')}
@@ -155,7 +186,8 @@ export function TrackList({
         role="listitem"
         tabIndex={tr.available ? 0 : -1}
         aria-current={isCurrent || undefined}
-        className={cx(s.track, !tr.available && s.unavailable, isCurrent && s.current)}
+        className={cx(s.track, !tr.available && s.unavailable, isCurrent && s.current, virtual && s.trackStatic)}
+        style={{ '--stagger': `${Math.min(i, 12) * 40}ms` } as CSSProperties}
         title={tr.available ? undefined : t('catalog.unavailable')}
         onClick={(e) => {
           if (e.currentTarget.contains(e.target as Node) && !(e.target as HTMLElement).closest('a, button')) play();

apps/web/src/features/uploads/BatchEditDialog.tsx

@@ -0,0 +1,69 @@
+import { useMutation } from '@tanstack/react-query';
+import { useState } from 'react';
+import { useErrorText } from '../../shared/lib/errors';
+import { useUploadsApi } from './queries';
+import { useTranslation } from 'react-i18next';
+import { Button, Dialog, Field, FormError } from '../../shared/ui/ui';
+import s from '../../pages/page.module.css';
+export function BatchEditDialog({ batchId, onClose, onSaved }: { batchId: string; onClose: () => void; onSaved: () => void }) {
+  const { t } = useTranslation(['admin', 'common']);
+  const api = useUploadsApi();
+  const errorText = useErrorText();
+  const [artist, setArtist] = useState('');
+  const [album, setAlbum] = useState('');
+  const [year, setYear] = useState('');
+  const [cover, setCover] = useState<string | null | undefined>(undefined);
+  const save = useMutation({
+    mutationFn: () => api.updateBatch(batchId, {
+      ...(artist.trim() ? { artist: artist.trim() } : {}),
+      ...(album.trim() ? { album: album.trim() } : {}),
+      ...(year.trim() ? { year: Number.parseInt(year, 10) } : {}),
+      ...(cover !== undefined ? { cover_base64: cover } : {}),
+    }),
+    onSuccess: onSaved,
+  });
+  const pickCover = (file: File | undefined) => {
+    if (!file) {
+      setCover(undefined);
+      return;
+    }
+    const reader = new FileReader();
+    reader.onload = () => {
+      const data = String(reader.result ?? '');
+      const comma = data.indexOf(',');
+      setCover(comma >= 0 ? data.slice(comma + 1) : data);
+    };
+    reader.readAsDataURL(file);
+  };
+  return (
+    <Dialog
+      title={t('uploads.batch_edit_title')}
+      onClose={onClose}
+      footer={
+        <>
+          <Button variant="ghost" onClick={onClose}>
+            {t('common:form.cancel')}
+          </Button>
+          <Button variant="primary" busy={save.isPending} onClick={() => save.mutate()}>
+            {t('uploads.save')}
+          </Button>
+        </>
+      }
+    >
+      <div className={s.sessions}>
+        <p className={s.note}>{t('uploads.batch_edit_hint')}</p>
+        <Field label={t('uploads.meta_artist')} value={artist} onChange={setArtist} maxLength={500} />
+        <Field label={t('uploads.meta_album')} value={album} onChange={setAlbum} maxLength={500} />
+        <Field label={t('uploads.meta_year')} value={year} inputMode="numeric" onChange={setYear} />
+        <label className={s.sessions}>
+          <span>{t('uploads.batch_cover')}</span>
+          <input type="file" accept="image/jpeg,image/png,image/webp" onChange={(e) => pickCover(e.target.files?.[0])} />
+        </label>
+        <Button variant="ghost" onClick={() => setCover(null)}>
+          {t('uploads.batch_cover_clear')}
+        </Button>
+        <FormError>{save.error ? errorText(save.error) : null}</FormError>
+      </div>
+    </Dialog>
+  );
+}

apps/web/src/features/uploads/EditDialog.test.tsx

@@ -0,0 +1,56 @@
+import { AuthSession } from '@pipu/core';
+import { createI18n } from '@pipu/i18n';
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import { cleanup, render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { I18nextProvider } from 'react-i18next';
+import { afterEach, expect, it, vi } from 'vitest';
+import { SessionProvider } from '../../app/session';
+import { mobileFixtures } from '../../test/mobileFixtures';
+import { EditDialog } from './EditDialog';
+import type { UploadFile } from './common';
+
+afterEach(cleanup);
+
+async function fixture(fail = false) {
+  const file = (mobileFixtures['/api/v1/admin/uploads'] as { items: UploadFile[] }).items[0]!;
+  const requests: unknown[] = [];
+  const fetchImpl: typeof fetch = async (input) => {
+    const req = input as Request;
+    if (req.method === 'PATCH') {
+      requests.push(await req.json());
+      return new Response(JSON.stringify(fail ? { status: 409, code: 'uploads.wrong_status' } : file), { status: fail ? 409 : 200 });
+    }
+    return new Response(JSON.stringify(mobileFixtures['/api/v1/admin/sources']));
+  };
+  const session = new AuthSession({ baseUrl: 'http://localhost', fetch: fetchImpl, clientType: 'web' });
+  const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false }, mutations: { retry: false } } });
+  const onSaved = vi.fn();
+  const onClose = vi.fn();
+  const i18n = await createI18n('ru');
+  render(<I18nextProvider i18n={i18n}><SessionProvider session={session}><QueryClientProvider client={queryClient}>
+    <EditDialog file={file} onSaved={onSaved} onClose={onClose} />
+  </QueryClientProvider></SessionProvider></I18nextProvider>);
+  const user = userEvent.setup();
+  await user.type(screen.getByLabelText('Исполнитель', { exact: true }), 'Кино');
+  await user.type(screen.getByLabelText('Название', { exact: true }), 'Перемен');
+  return { requests, onSaved, onClose, user };
+}
+
+it('saves edited metadata with the target source and closes only after success', async () => {
+  const f = await fixture();
+  await f.user.click(screen.getByRole('button', { name: 'Сохранить' }));
+  await waitFor(() => expect(f.onSaved).toHaveBeenCalledOnce());
+  expect(f.onClose).toHaveBeenCalledOnce();
+  expect(f.requests).toEqual([expect.objectContaining({ metadata: expect.objectContaining({ artist: 'Кино', title: 'Перемен' }), target_source_id: expect.any(String) })]);
+});
+
+it('keeps the editor and input when a concurrent review rejects the save', async () => {
+  const f = await fixture(true);
+  await f.user.click(screen.getByRole('button', { name: 'Сохранить' }));
+  await waitFor(() => expect(screen.getByRole('alert')).toBeVisible());
+  expect(screen.getByRole('dialog')).toBeVisible();
+  expect(screen.getByLabelText('Название', { exact: true })).toHaveValue('Перемен');
+  expect(f.onSaved).not.toHaveBeenCalled();
+  expect(f.onClose).not.toHaveBeenCalled();
+});

apps/web/src/features/uploads/EditDialog.tsx

@@ -0,0 +1,85 @@
+import type { components } from '@pipu/api-client';
+import { useMutation } from '@tanstack/react-query';
+import { useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useErrorText, useFieldError } from '../../shared/lib/errors';
+import { Button, Dialog, Field, FormError } from '../../shared/ui/ui';
+import { useUploadsApi, useUploadSources } from './queries';
+import type { UploadFile } from './common';
+import s from '../../pages/page.module.css';
+import u from '../../pages/uploads/uploads.module.css';
+
+type Meta = components['schemas']['UploadMeta'];
+const EMPTY_META: Meta = { artist: '', albumartist: '', album: '', title: '', genre: '', year: null, track: null, disc: null };
+
+export function EditDialog({ file, onClose, onSaved }: { file: UploadFile; onClose: () => void; onSaved: () => void }) {
+  const { t } = useTranslation(['admin', 'common']);
+  const api = useUploadsApi();
+  const errorText = useErrorText();
+  const fieldError = useFieldError();
+  const [m, setM] = useState<Meta>(file.metadata ?? EMPTY_META);
+  const [source, setSource] = useState(file.target_source_id ?? '');
+  const sources = useUploadSources();
+  const save = useMutation({
+    mutationFn: () => api.updateFile(file.id, { metadata: m, ...(source ? { target_source_id: source } : {}) }),
+    onSuccess: () => {
+      onSaved();
+      onClose();
+    },
+  });
+  const text = (k: 'artist' | 'albumartist' | 'album' | 'title' | 'genre') => (
+    <Field label={t(`uploads.meta_${k}`)} value={m[k]} onChange={(v) => setM({ ...m, [k]: v })} maxLength={500} />
+  );
+  const num = (k: 'year' | 'track' | 'disc') => (
+    <Field
+      label={t(`uploads.meta_${k}`)}
+      value={m[k] === null ? '' : String(m[k])}
+      inputMode="numeric"
+      onChange={(v) => setM({ ...m, [k]: v.trim() === '' ? null : Number.parseInt(v, 10) || null })}
+    />
+  );
+  const accepting = sources.data?.filter((x) => x.accepts_uploads) ?? [];
+  return (
+    <Dialog
+      title={t('uploads.edit_title')}
+      onClose={onClose}
+      footer={
+        <>
+          <Button variant="ghost" onClick={onClose}>
+            {t('common:form.cancel')}
+          </Button>
+          <Button variant="primary" busy={save.isPending} disabled={!m.artist.trim() || !m.title.trim()} onClick={() => save.mutate()}>
+            {t('uploads.save')}
+          </Button>
+        </>
+      }
+    >
+      <div className={s.sessions}>
+        <p className={s.note}>{file.client_rel_path ?? file.original_name}</p>
+        <div className={u.grid}>
+          {text('artist')}
+          {text('albumartist')}
+          {text('album')}
+          {text('title')}
+          {text('genre')}
+          {num('year')}
+          {num('track')}
+          {num('disc')}
+        </div>
+        <label className={s.sessions}>
+          <span>{t('uploads.target_source')}</span>
+          <select className={s.select} value={source} onChange={(e) => setSource(e.target.value)}>
+            <option value="">{t('uploads.target_default')}</option>
+            {accepting.map((x) => (
+              <option key={x.id} value={x.id}>
+                {x.name}
+              </option>
+            ))}
+          </select>
+        </label>
+        <p className={s.note}>{t('uploads.tags_note')}</p>
+        <FormError>{save.error ? (fieldError(save.error, 'metadata') ?? errorText(save.error)) : null}</FormError>
+      </div>
+    </Dialog>
+  );
+}

apps/web/src/features/uploads/QueueRows.tsx

@@ -0,0 +1,153 @@
+import { formatBytes, formatDateTime, formatDuration } from '../../shared/lib/format';
+import { editIcon, refreshIcon } from '../../shared/ui/icons';
+import { needsFormatAttention } from './files';
+import { UploadStatusBadge, useReasonText, type UploadFile } from './common';
+import { useTranslation } from 'react-i18next';
+import { Button, cx, Icon } from '../../shared/ui/ui';
+import s from '../../pages/page.module.css';
+import u from '../../pages/uploads/uploads.module.css';
+export function BatchCard({
+  files,
+  selectable,
+  selected,
+  onToggle,
+  onEdit,
+  onEditBatch,
+  onRetry,
+}: {
+  files: UploadFile[];
+  selectable: boolean;
+  selected: Set<string>;
+  onToggle: (ids: string[], on: boolean) => void;
+  onEdit: (f: UploadFile) => void;
+  onEditBatch: (batchId: string) => void;
+  onRetry: (id: string) => void;
+}) {
+  const { t, i18n } = useTranslation('admin');
+  const first = files[0]!;
+  const ids = files.map((f) => f.id);
+  const all = ids.every((id) => selected.has(id));
+  const size = files.reduce((n, f) => n + f.size_bytes, 0);
+  return (
+    <section className={u.batch} aria-label={t('uploads.batch_of', { author: first.author.username })}>
+      <div className={u.batchHead}>
+        {selectable && (
+          <input type="checkbox" aria-label={t('uploads.select_batch')} checked={all} onChange={(e) => onToggle(ids, e.target.checked)} />
+        )}
+        <b>{first.author.username}</b>
+        <span>{formatDateTime(first.created_at, i18n.language)}</span>
+        <span>{t('uploads.batch_size', { count: files.length, size: formatBytes(size, i18n.language) })}</span>
+        {first.batch_comment && <span className={u.comment}>«{first.batch_comment}»</span>}
+        <span style={{ flex: 1 }} />
+        {selectable && (
+          <Button variant="ghost" onClick={() => onEditBatch(first.batch_id)}>
+            {t('uploads.edit_batch')}
+          </Button>
+        )}
+      </div>
+      {files.map((f) => (
+        <QueueRow
+          key={f.id}
+          file={f}
+          selectable={selectable}
+          checked={selected.has(f.id)}
+          onCheck={(on) => onToggle([f.id], on)}
+          onEdit={() => onEdit(f)}
+          onRetry={() => onRetry(f.id)}
+        />
+      ))}
+    </section>
+  );
+}
+
+function QueueRow({
+  file: f,
+  selectable,
+  checked,
+  onCheck,
+  onEdit,
+  onRetry,
+}: {
+  file: UploadFile;
+  selectable: boolean;
+  checked: boolean;
+  onCheck: (on: boolean) => void;
+  onEdit: () => void;
+  onRetry: () => void;
+}) {
+  const { t, i18n } = useTranslation('admin');
+  const reason = useReasonText()(f.status_reason);
+  const m = f.metadata;
+  const quality = [
+    f.format?.toUpperCase(),
+    f.bitrate ? `${Math.round(f.bitrate / 1000)} kbps` : null,
+    f.sample_rate ? `${(f.sample_rate / 1000).toFixed(1)} kHz` : null,
+    f.bit_depth ? `${f.bit_depth} bit` : null,
+    f.duration_ms ? formatDuration(f.duration_ms) : null,
+    formatBytes(f.size_bytes, i18n.language),
+  ]
+    .filter(Boolean)
+    .join(' · ');
+  const editable = f.status === 'pending_review' || f.status === 'import_failed';
+  return (
+    <div className={u.queueRow}>
+      {selectable ? (
+        <input type="checkbox" aria-label={t('uploads.select_file', { name: f.original_name })} checked={checked} onChange={(e) => onCheck(e.target.checked)} />
+      ) : (
+        <span />
+      )}
+      <div className={u.meta}>
+        <span className={u.metaTitle}>{m ? `${m.artist} — ${m.title}` : f.original_name}</span>
+        {m && (
+          <span className={u.sub}>
+            {[m.album, m.year, m.disc && m.disc > 1 ? t('uploads.disc', { n: m.disc }) : null, m.track ? `#${m.track}` : null, m.genre]
+              .filter(Boolean)
+              .join(' · ')}
+            {f.metadata_edited && ` · ${t('uploads.edited')}`}
+          </span>
+        )}
+        <span className={u.sub}>{quality}</span>
+        <span className={u.sub} title={f.client_rel_path ?? undefined}>
+          {f.client_rel_path ?? f.original_name}
+        </span>
+      </div>
+      <div className={u.meta}>
+        <div className={u.flags}>
+          <UploadStatusBadge status={f.status} />
+          {needsFormatAttention(f.format, f.original_name) && (
+            <span className={cx(s.badge, u.tone_warn)} title={t('uploads.format_attention')}>
+              {t('uploads.flag_attention')}
+            </span>
+          )}
+          {f.possible_duplicate && <span className={cx(s.badge, u.tone_warn)}>{t('uploads.flag_possible')}</span>}
+          {f.quality_upgrade && <span className={cx(s.badge, u.tone_info)}>{t('uploads.flag_quality')}</span>}
+          {f.matched_album_id ? (
+            <span className={cx(s.badge, u.tone_info)}>{t('uploads.flag_existing_album')}</span>
+          ) : (
+            m && <span className={cx(s.badge, u.tone_muted)}>{t('uploads.flag_new_album')}</span>
+          )}
+        </div>
+        {f.target_rel_path && <span className={u.target}>{f.target_rel_path}</span>}
+        {reason && <span className={f.status === 'pending_review' ? u.warn : u.bad}>{reason}</span>}
+        {f.duplicate_level && f.status === 'duplicate' && (
+          <span className={u.sub}>{t(`uploads.dup_level_${f.duplicate_level}`)}</span>
+        )}
+      </div>
+      <div className={u.rowActions}>
+        {f.stream_url && (
+          <audio controls preload="none" src={f.stream_url} aria-label={t('uploads.listen', { name: f.original_name })} />
+        )}
+        {editable && (
+          <Button variant="ghost" aria-label={t('uploads.edit', { name: f.original_name })} onClick={onEdit}>
+            <Icon src={editIcon} size={18} />
+          </Button>
+        )}
+        {f.status === 'import_failed' && (
+          <Button variant="ghost" icon={refreshIcon} onClick={onRetry}>
+            {t('uploads.retry')}
+          </Button>
+        )}
+      </div>
+    </div>
+  );
+}

apps/web/src/features/uploads/RejectDialog.tsx

@@ -0,0 +1,40 @@
+import { useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { Button, Dialog } from '../../shared/ui/ui';
+import s from '../../pages/page.module.css';
+import u from '../../pages/uploads/uploads.module.css';
+export function RejectDialog({
+  count,
+  busy,
+  onClose,
+  onReject,
+}: {
+  count: number;
+  busy: boolean;
+  onClose: () => void;
+  onReject: (reason: string) => void;
+}) {
+  const { t } = useTranslation(['admin', 'common']);
+  const [reason, setReason] = useState('');
+  return (
+    <Dialog
+      title={t('uploads.reject_title', { count })}
+      onClose={onClose}
+      footer={
+        <>
+          <Button variant="ghost" onClick={onClose}>
+            {t('common:form.cancel')}
+          </Button>
+          <Button variant="danger" busy={busy} onClick={() => onReject(reason)}>
+            {t('uploads.reject')}
+          </Button>
+        </>
+      }
+    >
+      <label className={s.sessions}>
+        <span>{t('uploads.reject_reason')}</span>
+        <textarea className={u.textarea} value={reason} maxLength={1000} onChange={(e) => setReason(e.target.value)} />
+      </label>
+    </Dialog>
+  );
+}

apps/web/src/features/uploads/UploadQueue.tsx

@@ -0,0 +1,180 @@
+import { ApiError } from '@pipu/core';
+import type { components } from '@pipu/api-client';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { useEffect, useMemo, useState } from 'react';
+import { checkIcon, closeIcon, inboxIcon } from '../../shared/ui/icons';
+import { useErrorText } from '../../shared/lib/errors';
+import { QuotaMeter, type UploadFile, type UploadStatus } from './common';
+import { BatchCard } from './QueueRows';
+import { BatchEditDialog } from './BatchEditDialog';
+import { EditDialog } from './EditDialog';
+import { RejectDialog } from './RejectDialog';
+import { useUploadQueue, useUploadsApi } from './queries';
+import { useTranslation } from 'react-i18next';
+import { Button, EmptyState, FormError } from '../../shared/ui/ui';
+import s from '../../pages/page.module.css';
+import u from '../../pages/uploads/uploads.module.css';
+const TABS = {
+  review: ['pending_review'],
+  failed: ['import_failed'],
+  progress: ['uploading', 'processing', 'approved', 'importing'],
+  imported: ['imported'],
+  declined: ['rejected', 'duplicate', 'invalid', 'withdrawn', 'expired'],
+} satisfies Record<string, UploadStatus[]>;
+type Tab = keyof typeof TABS;
+
+/** «Очередь на добавление» (docs/uploads.md#8): рассмотрение по пачкам, правка метаданных, массовые решения. */
+export function UploadQueue() {
+  const { t } = useTranslation(['admin', 'common']);
+  const api = useUploadsApi();
+  const queryClient = useQueryClient();
+  const errorText = useErrorText();
+  const [tab, setTab] = useState<Tab>('review');
+  const [onlyPossible, setOnlyPossible] = useState(false);
+  const [selected, setSelected] = useState<Set<string>>(new Set());
+  const [editing, setEditing] = useState<UploadFile | null>(null);
+  const [batchEdit, setBatchEdit] = useState<string | null>(null);
+  const [rejecting, setRejecting] = useState(false);
+
+  const list = useUploadQueue(TABS[tab], tab, onlyPossible);
+  const items = useMemo(() => list.data?.pages.flatMap((p) => p.items) ?? [], [list.data]);
+  useEffect(() => setSelected(new Set()), [tab, onlyPossible]);
+
+  const refresh = async () => {
+    setSelected(new Set());
+    await queryClient.invalidateQueries({ queryKey: ['admin-uploads'] });
+    await queryClient.invalidateQueries({ queryKey: ['upload-quota'] });
+  };
+  const review = useMutation({
+    mutationFn: (v: { decision: 'approve' | 'reject'; ids: string[]; reason?: string }) => api.review(v),
+    onSuccess: refresh,
+  });
+  const retry = useMutation({
+    mutationFn: api.retry,
+    onSuccess: refresh,
+  });
+  const failed = review.data?.items.filter((r) => !r.ok) ?? [];
+
+  // Группировка по пачке: файлы одной загрузки (обычно альбом) рассматриваются вместе.
+  const batches = useMemo(() => {
+    const m = new Map<string, UploadFile[]>();
+    for (const f of items) m.set(f.batch_id, [...(m.get(f.batch_id) ?? []), f]);
+    return [...m.values()];
+  }, [items]);
+  const toggle = (ids: string[], on: boolean) =>
+    setSelected((cur) => {
+      const next = new Set(cur);
+      for (const id of ids) {
+        if (on) next.add(id);
+        else next.delete(id);
+      }
+      return next;
+    });
+  const selectable = tab === 'review' || tab === 'failed';
+  const ids = [...selected];
+
+  return (
+    <div className={s.page}>
+      <div className={s.head}>
+        <div>
+          <h1>{t('uploads.queue_title')}</h1>
+          <p className={s.subtitle}>{t('uploads.queue_subtitle')}</p>
+        </div>
+        <QuotaMeter />
+      </div>
+      <div className={s.toolbar}>
+        <div className={s.chips} role="group" aria-label={t('uploads.filter')}>
+          {(Object.keys(TABS) as Tab[]).map((k) => (
+            <button key={k} type="button" className={s.chip} aria-pressed={tab === k} onClick={() => setTab(k)}>
+              {t(`uploads.tab_${k}`)}
+            </button>
+          ))}
+        </div>
+        <span style={{ flex: 1 }} />
+        <label className={u.sub} style={{ display: 'flex', gap: 8, alignItems: 'center' }}>
+          <input type="checkbox" checked={onlyPossible} onChange={(e) => setOnlyPossible(e.target.checked)} />
+          {t('uploads.only_possible')}
+        </label>
+      </div>
+      <FormError>{(list.error ?? review.error ?? retry.error) ? errorText(list.error ?? review.error ?? retry.error) : null}</FormError>
+      {failed.length > 0 && (
+        <FormError>{t('uploads.review_failed', { count: failed.length, reason: failed[0]?.error ? errorText(problemError(failed[0].error)) : '' })}</FormError>
+      )}
+      {list.isSuccess && items.length === 0 && <EmptyState icon={inboxIcon}>{t('uploads.queue_empty')}</EmptyState>}
+
+      {batches.map((files) => (
+        <BatchCard
+          key={files[0]!.batch_id}
+          files={files}
+          selectable={selectable}
+          selected={selected}
+          onToggle={toggle}
+          onEdit={setEditing}
+          onEditBatch={setBatchEdit}
+          onRetry={(id) => retry.mutate(id)}
+        />
+      ))}
+      {list.hasNextPage && (
+        <Button busy={list.isFetchingNextPage} onClick={() => void list.fetchNextPage()}>
+          {t('uploads.load_more')}
+        </Button>
+      )}
+
+      {ids.length > 0 && (
+        <div className={u.bulk} role="region" aria-label={t('uploads.bulk')}>
+          <span>{t('uploads.selected', { count: ids.length })}</span>
+          <span style={{ flex: 1 }} />
+          <Button variant="ghost" onClick={() => setSelected(new Set())}>
+            {t('common:form.cancel')}
+          </Button>
+          <Button variant="danger" icon={closeIcon} onClick={() => setRejecting(true)}>
+            {t('uploads.reject')}
+          </Button>
+          {tab === 'review' && (
+            <Button variant="primary" icon={checkIcon} busy={review.isPending} onClick={() => review.mutate({ decision: 'approve', ids })}>
+              {t('uploads.approve')}
+            </Button>
+          )}
+        </div>
+      )}
+
+      {batchEdit && (
+        <BatchEditDialog
+          batchId={batchEdit}
+          onClose={() => setBatchEdit(null)}
+          onSaved={() => {
+            setBatchEdit(null);
+            void refresh();
+          }}
+        />
+      )}
+
+      {editing && (
+        <EditDialog
+          file={editing}
+          onClose={() => setEditing(null)}
+          onSaved={() => {
+            review.reset();
+            void refresh();
+          }}
+        />
+      )}
+      {rejecting && (
+        <RejectDialog
+          count={ids.length}
+          busy={review.isPending}
+          onClose={() => setRejecting(false)}
+          onReject={(reason) => {
+            setRejecting(false);
+            review.mutate({ decision: 'reject', ids, reason });
+          }}
+        />
+      )}
+    </div>
+  );
+}
+
+/** Problem из ответа массового решения → объект, понятный useErrorText. */
+function problemError(p: components['schemas']['Problem']) {
+  return new ApiError(p.status, p.code, p.params ?? {});
+}

apps/web/src/features/uploads/UploadSettingsSection.tsx

@@ -0,0 +1,101 @@
+import type { components } from '@pipu/api-client';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { useEffect, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useErrorText } from '../../shared/lib/errors';
+import { Button, Field, FormError } from '../../shared/ui/ui';
+import { useUploadsApi, useUploadSources, useUploadSettings } from './queries';
+import s from '../../pages/page.module.css';
+import u from '../../pages/uploads/uploads.module.css';
+
+type Settings = components['schemas']['UploadSettings'];
+const GB = 1024 ** 3;
+
+/** Настройки очереди: общий лимит, лимит на модератора, размер файла, хранилище по умолчанию. */
+export function UploadSettingsSection() {
+  const { t } = useTranslation(['admin', 'common']);
+  const api = useUploadsApi();
+  const queryClient = useQueryClient();
+  const errorText = useErrorText();
+  const settings = useUploadSettings();
+  const sources = useUploadSources();
+  const [form, setForm] = useState<{ queue: string; perUser: string; maxFile: string; source: string; upgrade: boolean } | null>(null);
+  useEffect(() => {
+    if (settings.data) setForm(toForm(settings.data));
+  }, [settings.data]);
+
+  const save = useMutation({
+    mutationFn: async () => {
+      const f = form!;
+      const gb = (v: string) => Math.round(Number.parseFloat(v.replace(',', '.')) * GB);
+      return api.updateSettings({
+        queue_limit_bytes: gb(f.queue), max_file_bytes: gb(f.maxFile),
+        per_user_limit_bytes: f.perUser.trim() ? gb(f.perUser) : null,
+        default_source_id: f.source || null, allow_quality_upgrade: f.upgrade,
+      });
+    },
+    onSuccess: async (data) => {
+      queryClient.setQueryData(['upload-settings'], data);
+      await queryClient.invalidateQueries({ queryKey: ['upload-quota'] });
+    },
+  });
+  if (!form) return null;
+  const valid = [form.queue, form.maxFile].every((v) => Number.parseFloat(v.replace(',', '.')) > 0) &&
+    (!form.perUser.trim() || Number.parseFloat(form.perUser.replace(',', '.')) > 0);
+  const dirty = settings.data ? JSON.stringify(toForm(settings.data)) !== JSON.stringify(form) : false;
+  return (
+    <section className={s.section}>
+      <h2>{t('uploads.settings_title')}</h2>
+      <div className={u.settingsGrid}>
+        <Field label={t('uploads.set_queue')} value={form.queue} onChange={(v) => setForm({ ...form, queue: v })} inputMode="decimal" />
+        <Field
+          label={t('uploads.set_per_user')}
+          value={form.perUser}
+          hint={t('uploads.set_per_user_hint')}
+          onChange={(v) => setForm({ ...form, perUser: v })}
+          inputMode="decimal"
+        />
+        <Field label={t('uploads.set_max_file')} value={form.maxFile} onChange={(v) => setForm({ ...form, maxFile: v })} inputMode="decimal" />
+        <label>
+          <span className={u.settingsLabel}>{t('uploads.set_source')}</span>
+          <select className={s.select} value={form.source} onChange={(e) => setForm({ ...form, source: e.target.value })}>
+            <option value="">{t('uploads.set_source_auto')}</option>
+            {sources.data
+              ?.filter((x) => x.accepts_uploads)
+              .map((x) => (
+                <option key={x.id} value={x.id}>
+                  {x.name}
+                </option>
+              ))}
+          </select>
+        </label>
+        <div>
+          <label className={u.settingsCheck}>
+            <input type="checkbox" checked={form.upgrade} onChange={(e) => setForm({ ...form, upgrade: e.target.checked })} />
+            <span>{t('uploads.set_upgrade')}</span>
+          </label>
+        </div>
+      </div>
+      <p className={s.note}>{t('uploads.set_note')}</p>
+      <div className={s.toolbar}>
+        <span style={{ flex: 1 }} />
+        <Button variant="primary" busy={save.isPending} disabled={!dirty || !valid} onClick={() => save.mutate()}>
+          {t('uploads.save')}
+        </Button>
+      </div>
+      {save.isSuccess && !dirty && <span className={s.ok}>{t('uploads.saved')}</span>}
+      <FormError>{save.error ? errorText(save.error) : null}</FormError>
+    </section>
+  );
+}
+
+function toForm(st: Settings) {
+  const gb = (n: number) => String(Math.round((n / GB) * 100) / 100);
+  return {
+    queue: gb(st.queue_limit_bytes),
+    perUser: st.per_user_limit_bytes === null ? '' : gb(st.per_user_limit_bytes),
+    maxFile: gb(st.max_file_bytes),
+    source: st.default_source_id ?? '',
+    upgrade: st.allow_quality_upgrade,
+  };
+}

apps/web/src/features/uploads/api.ts

@@ -0,0 +1,26 @@
+import type { ApiClient, components, paths } from '@pipu/api-client';
+import { unwrap } from '@pipu/core';
+
+type FilePatch = paths['/api/v1/admin/uploads/files/{id}']['patch']['requestBody']['content']['application/json'];
+type BatchPatch = paths['/api/v1/admin/uploads/batches/{id}']['patch']['requestBody']['content']['application/json'];
+type SettingsPatch = paths['/api/v1/admin/settings/uploads']['patch']['requestBody']['content']['application/json'];
+
+/** The feature owns transport mapping; views only provide form values. */
+export function uploadsApi(client: ApiClient) {
+  return {
+    list: async (status: components['schemas']['UploadStatus'][], possible: boolean, cursor?: string) => unwrap(
+      await client.GET('/api/v1/admin/uploads', {
+        params: { query: { status, possible_duplicate: possible || undefined, cursor, limit: 100 } },
+      }),
+    ),
+    review: async (v: { ids: string[]; decision: 'approve' | 'reject'; reason?: string }) => unwrap(
+      await client.POST('/api/v1/admin/uploads/review', { body: { file_ids: v.ids, decision: v.decision, reason: v.reason } }),
+    ),
+    retry: async (id: string) => unwrap(await client.POST('/api/v1/admin/uploads/files/{id}/retry', { params: { path: { id } } })),
+    updateFile: async (id: string, body: FilePatch) => unwrap(await client.PATCH('/api/v1/admin/uploads/files/{id}', { params: { path: { id } }, body })),
+    updateBatch: async (id: string, body: BatchPatch) => unwrap(await client.PATCH('/api/v1/admin/uploads/batches/{id}', { params: { path: { id } }, body })),
+    sources: async () => unwrap(await client.GET('/api/v1/admin/sources')).items,
+    settings: async () => unwrap(await client.GET('/api/v1/admin/settings/uploads')),
+    updateSettings: async (body: SettingsPatch) => unwrap(await client.PATCH('/api/v1/admin/settings/uploads', { body })),
+  };
+}

apps/web/src/features/uploads/common.tsx

@@ -0,0 +1,84 @@
+import type { components } from '@pipu/api-client';
+import { unwrap } from '@pipu/core';
+import { useQuery } from '@tanstack/react-query';
+import { useId } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { useSession } from '../../app/session';
+import { formatBytes } from '../../shared/lib/format';
+import { cx } from '../../shared/ui/ui';
+import s from '../../pages/page.module.css';
+import u from '../../pages/uploads/uploads.module.css';
+
+export type UploadStatus = components['schemas']['UploadStatus'];
+export type UploadFile = components['schemas']['UploadFile'];
+
+const TONE: Record<UploadStatus, 'ok' | 'warn' | 'bad' | 'info' | 'muted'> = {
+  uploading: 'info',
+  processing: 'info',
+  pending_review: 'warn',
+  approved: 'info',
+  importing: 'info',
+  imported: 'ok',
+  import_failed: 'bad',
+  duplicate: 'muted',
+  invalid: 'bad',
+  rejected: 'bad',
+  withdrawn: 'muted',
+  expired: 'muted',
+};
+
+/** Статусы, которые ещё меняются сами (обработка, импорт) — список опрашивается. */
+export const MOVING: UploadStatus[] = ['uploading', 'processing', 'approved', 'importing'];
+
+export function UploadStatusBadge({ status }: { status: UploadStatus }) {
+  const { t } = useTranslation('admin');
+  return <span className={cx(s.badge, u[`tone_${TONE[status]}`])}>{t(`uploads.status.${status}`)}</span>;
+}
+
+export function useUploadQuota() {
+  const session = useSession();
+  return useQuery({
+    queryKey: ['upload-quota'],
+    queryFn: async () => unwrap(await session.client.GET('/api/v1/uploads/quota')),
+  });
+}
+
+/** «Очередь: 6,2 ГБ из 10 ГБ» — видят модераторы и админ (docs/uploads.md#3). */
+export function QuotaMeter() {
+  const { t, i18n } = useTranslation('admin');
+  const quota = useUploadQuota();
+  const id = useId();
+  if (!quota.data) return null;
+  const q = quota.data;
+  const ratio = q.limit_bytes > 0 ? Math.min(q.used_bytes / q.limit_bytes, 1) : 1;
+  const fmt = (n: number) => formatBytes(n, i18n.language);
+  return (
+    <div className={u.quota}>
+      <span className={u.quotaText} id={id}>
+        {t('uploads.quota', { used: fmt(q.used_bytes), limit: fmt(q.limit_bytes) })}
+        {q.per_user_limit_bytes !== null &&
+          ` · ${t('uploads.quota_mine', { used: fmt(q.user_used_bytes), limit: fmt(q.per_user_limit_bytes) })}`}
+      </span>
+      <div className={u.progress} role="progressbar" aria-labelledby={id} aria-valuenow={Math.round(ratio * 100)} aria-valuemin={0} aria-valuemax={100}>
+        <span style={{ width: `${ratio * 100}%` }} />
+      </div>
+    </div>
+  );
+}
+
+/** Понятный текст причины: код из errors:<code> или текст отклонения админа. */
+export function useReasonText(): (reason: string | null) => string | null {
+  const { t, i18n } = useTranslation(['admin', 'errors']);
+  const tr = t as unknown as (k: string) => string;
+  return (reason) => {
+    if (!reason) return null;
+    const code = reason.split(':')[0]!.trim();
+    const key = `errors:${code}`;
+    if (i18n.exists(key)) {
+      const rest = reason.slice(code.length + 1).trim();
+      return rest ? `${tr(key)}: ${rest}` : tr(key);
+    }
+    return reason;
+  };
+}

apps/web/src/features/uploads/queries.ts

@@ -0,0 +1,27 @@
+import { useInfiniteQuery, useQuery } from '@tanstack/react-query';
+import { useSession } from '../../app/session';
+import { uploadsApi } from './api';
+import { MOVING, type UploadStatus } from './common';
+
+export function useUploadsApi() { return uploadsApi(useSession().client); }
+
+export function useUploadQueue(status: UploadStatus[], tab: string, onlyPossible: boolean) {
+  const api = useUploadsApi();
+  return useInfiniteQuery({
+    queryKey: ['admin-uploads', tab, onlyPossible],
+    initialPageParam: undefined as string | undefined,
+    queryFn: ({ pageParam }) => api.list(status, onlyPossible, pageParam),
+    getNextPageParam: (p) => p.next_cursor ?? undefined,
+    refetchInterval: (q) => q.state.data?.pages.some((p) => p.items.some((it) => MOVING.includes(it.status))) ? 5000 : false,
+  });
+}
+
+export function useUploadSources() {
+  const api = useUploadsApi();
+  return useQuery({ queryKey: ['sources'], queryFn: api.sources });
+}
+
+export function useUploadSettings() {
+  const api = useUploadsApi();
+  return useQuery({ queryKey: ['upload-settings'], queryFn: api.settings });
+}

apps/web/src/pages/AlbumPage.tsx

@@ -4,12 +4,12 @@ import { Link } from '@tanstack/react-router';
 import { useTranslation } from 'react-i18next';
 
 import { useSession } from '../app/session';
-import { Cover, TrackList } from '../entities/catalog';
+import { Cover, TrackList, coverSrc } from '../entities/catalog';
 import { AddToPlaylist } from '../entities/playlists';
 import { usePlayer } from '../player/context';
 import { formatDuration } from '../shared/lib/format';
 import { playIcon, shuffleIcon } from '../shared/ui/icons';
-import { Button } from '../shared/ui/ui';
+import { Button, PageSkeleton } from '../shared/ui/ui';
 import { NotFound } from './NotFound';
 import s from './page.module.css';
 import c from './catalog.module.css';
@@ -23,30 +23,41 @@ export function AlbumPage({ id }: { id: string }) {
     queryFn: async () => unwrap(await session.client.GET('/api/v1/albums/{id}', { params: { path: { id } } })),
   });
 
+  if (album.isPending) {
+    return (
+      <div className={s.page}>
+        <PageSkeleton />
+      </div>
+    );
+  }
   if (album.isError) return <NotFound error={album.error} />;
   const a = album.data;
-  const colors = a?.cover_colors.length === 3 ? a.cover_colors : null;
-  const ctx = { type: 'album' as const, id, label: a?.title };
+  if (!a) return null;
+  const colors = a.cover_colors.length === 3 ? a.cover_colors : null;
+  const ctx = { type: 'album' as const, id, label: a.title };
 
   return (
     <div className={s.page}>
       <header className={c.hero}>
+        {a.cover_url && (
+          <span className={c.heroBg} aria-hidden>
+            <img src={coverSrc(a.cover_url, 300)} alt="" />
+          </span>
+        )}
         {colors && <span className={c.tint} style={{ background: `linear-gradient(180deg, ${colors[0]}66, transparent)` }} aria-hidden />}
-        <Cover album={a ?? { id }} size={200} />
+        <Cover album={a} size={200} className={c.heroCover} />
         <div className={c.heroBody}>
           <span className={c.kind}>{t('catalog.album')}</span>
-          <h1 className={c.heroTitle}>{a?.title ?? '…'}</h1>
-          {a && (
-            <span className={c.heroMeta}>
-              <Link to="/artist/$id" params={{ id: a.artist.id }}>
-                {a.artist.name}
-              </Link>
-              {a.year ? ` · ${a.year}` : ''} · {t('catalog.track_count', { count: a.tracks.length })} · {formatDuration(a.duration_ms)}
-            </span>
-          )}
-          {a && a.tracks.some((tr) => tr.available) && (
+          <h1 className={c.heroTitle}>{a.title}</h1>
+          <span className={c.heroMeta}>
+            <Link to="/artist/$id" params={{ id: a.artist.id }}>
+              {a.artist.name}
+            </Link>
+            {a.year ? ` · ${a.year}` : ''} · {t('catalog.track_count', { count: a.tracks.length })} · {formatDuration(a.duration_ms)}
+          </span>
+          {a.tracks.some((tr) => tr.available) && (
             <div className={c.heroActions}>
-              <AddToPlaylist trackIds={a.tracks.map(tr => tr.id)} />
+              <AddToPlaylist trackIds={a.tracks.map((tr) => tr.id)} />
               <Button variant="primary" className={c.pill} icon={playIcon} onClick={() => player.playList(a.tracks, 0, ctx)}>
                 {t('catalog.play')}
               </Button>
@@ -67,7 +78,7 @@ export function AlbumPage({ id }: { id: string }) {
           )}
         </div>
       </header>
-      {a && <TrackList tracks={a.tracks} numbered context={ctx} />}
+      <TrackList tracks={a.tracks} numbered context={ctx} />
     </div>
   );
 }

apps/web/src/pages/AppDownloadPage.tsx

@@ -12,7 +12,7 @@ import s from './auth.module.css';
 
 /**
  * Публичная страница приложений (/download, /android): ссылку можно отправить человеку.
- * Сборки — последний релиз Gitea через сервер; первым предлагается клиент текущей ОС.
+ * Сборки — до 8 последних релизов Gitea через сервер; первым предлагается клиент текущей ОС.
  */
 export function AppDownloadPage() {
   const { t, i18n } = useTranslation(['auth', 'common']);
@@ -40,10 +40,17 @@ export function AppDownloadPage() {
       <span className={s.badge}>{detected ? t(`app.platform.${detected}`) : t('app.badge')}</span>
       <h1>{t('app.title')}</h1>
       <p className={s.lead}>{t('app.subtitle')}</p>
-      {latest.isPending ? null : data ? (
+      {latest.isPending ? (
+        <p role="status">{t('common:loading')}</p>
+      ) : latest.isError ? (
+        <div className={s.hint}>{t('app.unavailable')}</div>
+      ) : data ? (
         <>
           {primary ? (
-            <DownloadButton client={detected!} href={primary.download_url} meta={`${t('app.version', { version: data.version })} · ${formatBytes(primary.size, i18n.language)}`} />
+            <>
+              <DownloadButton client={detected!} href={primary.download_url} meta={`${t('app.version', { version: primary.version ?? data.version })} · ${formatBytes(primary.size, i18n.language)}`} />
+              <OlderVersions items={primary.older ?? []} />
+            </>
           ) : detected ? (
             <div className={s.hint}>{t('app.unavailable_platform', { platform: t(`app.platform.${detected}`) })}</div>
           ) : null}
@@ -72,12 +79,15 @@ export function AppDownloadPage() {
               {others.map((id) => {
                 const file = files[id]!;
                 return (
-                  <a key={id} className={s.downloadAlt} href={file.download_url} download={file.filename}>
-                    {t(`app.download.${id}`)}
-                    <span>
-                      {t('app.version', { version: data.version })} · {formatBytes(file.size, i18n.language)}
-                    </span>
-                  </a>
+                  <div key={id} className={s.otherBlock}>
+                    <a className={s.downloadAlt} href={file.download_url} download={file.filename}>
+                      {t(`app.download.${id}`)}
+                      <span>
+                        {t('app.version', { version: file.version ?? data.version })} · {formatBytes(file.size, i18n.language)}
+                      </span>
+                    </a>
+                    <OlderVersions items={file.older ?? []} />
+                  </div>
                 );
               })}
             </div>
@@ -91,6 +101,22 @@ export function AppDownloadPage() {
   );
 }
 
+function OlderVersions({ items }: { items: { version: string; filename?: string; size: number; download_url: string }[] }) {
+  const { t, i18n } = useTranslation(['auth', 'common']);
+  if (items.length === 0) return null;
+  return (
+    <details className={s.older}>
+      <summary>{t('app.older')}</summary>
+      {items.map((b) => (
+        <a key={b.version} className={s.downloadAlt} href={b.download_url} download={b.filename}>
+          {t('app.version', { version: b.version })}
+          <span>{formatBytes(b.size, i18n.language)}</span>
+        </a>
+      ))}
+    </details>
+  );
+}
+
 function DownloadButton({ client, href, meta }: { client: AppClient; href: string; meta: string }) {
   const { t } = useTranslation('auth');
   return (

apps/web/src/pages/ArtistPage.tsx

@@ -3,10 +3,10 @@ import { useQuery } from '@tanstack/react-query';
 import { useTranslation } from 'react-i18next';
 
 import { useSession } from '../app/session';
-import { AlbumGrid, Cover, TrackList } from '../entities/catalog';
+import { AlbumGrid, Cover, TrackList, coverSrc } from '../entities/catalog';
 import { usePlayer } from '../player/context';
 import { playIcon, waveIcon } from '../shared/ui/icons';
-import { Button } from '../shared/ui/ui';
+import { Button, PageSkeleton } from '../shared/ui/ui';
 import { NotFound } from './NotFound';
 import s from './page.module.css';
 import c from './catalog.module.css';
@@ -29,42 +29,51 @@ export function ArtistPage({ id }: { id: string }) {
     queryFn: async () => unwrap(await session.client.GET('/api/v1/artists/{id}/albums', { params: { path: { id } } })).items,
   });
 
+  if (artist.isPending) {
+    return (
+      <div className={s.page}>
+        <PageSkeleton />
+      </div>
+    );
+  }
   if (artist.isError) return <NotFound error={artist.error} />;
   const a = artist.data;
+  if (!a) return null;
   const tracks = top.data ?? [];
-  const ctx = { type: 'artist' as const, id, label: a?.name };
+  const ctx = { type: 'artist' as const, id, label: a.name };
   const own = albums.data?.filter((al) => al.artist.id === id) ?? [];
   const appears = albums.data?.filter((al) => al.artist.id !== id) ?? [];
 
   return (
     <div className={s.page}>
       <header className={c.hero}>
-        <Cover album={{ id, cover_url: a?.image_url }} size={168} round />
+        {a.image_url && (
+          <span className={c.heroBg} aria-hidden>
+            <img src={coverSrc(a.image_url, 300)} alt="" />
+          </span>
+        )}
+        <Cover album={{ id, cover_url: a.image_url }} size={168} round className={c.heroCover} />
         <div className={c.heroBody}>
           <span className={c.kind}>{t('catalog.artist')}</span>
-          <h1 className={c.heroTitle}>{a?.name ?? '…'}</h1>
-          {a && (
-            <span className={c.heroMeta}>
-              {t('catalog.album_count', { count: a.album_count })} · {t('catalog.track_count', { count: a.track_count })}
-            </span>
-          )}
-          {a && (
-            <div className={c.heroActions}>
-              <Button
-                variant="primary"
-                className={c.pill}
-                icon={waveIcon}
-                onClick={() => void player.startWave(null, null, { type: 'artist', id, label: a.name }).catch(() => undefined)}
-              >
-                {t('catalog.artist_wave')}
+          <h1 className={c.heroTitle}>{a.name}</h1>
+          <span className={c.heroMeta}>
+            {t('catalog.album_count', { count: a.album_count })} · {t('catalog.track_count', { count: a.track_count })}
+          </span>
+          <div className={c.heroActions}>
+            <Button
+              variant="primary"
+              className={c.pill}
+              icon={waveIcon}
+              onClick={() => void player.startWave(null, null, { type: 'artist', id, label: a.name }).catch(() => undefined)}
+            >
+              {t('catalog.artist_wave')}
+            </Button>
+            {tracks.length > 0 && (
+              <Button className={c.pill} icon={playIcon} onClick={() => player.playList(tracks, 0, ctx)}>
+                {t('catalog.play')}
               </Button>
-              {tracks.length > 0 && (
-                <Button className={c.pill} icon={playIcon} onClick={() => player.playList(tracks, 0, ctx)}>
-                  {t('catalog.play')}
-                </Button>
-              )}
-            </div>
-          )}
+            )}
+          </div>
         </div>
       </header>
       {tracks.length > 0 && (

apps/web/src/pages/AuthLayout.tsx

@@ -2,16 +2,21 @@ import type { ReactNode } from 'react';
 
 import { Logo } from '../shared/ui/ui';
 import { LanguageSwitch } from '../widgets/LanguageSwitch';
+import { WaveButton } from '../widgets/wave/WaveButton';
 import s from './auth.module.css';
 
-/** Экран без каркаса: декоративный фон волны и стеклянная карточка по центру. */
+/** Экран без каркаса: декоративная волна и стеклянная карточка по центру. */
 export function AuthLayout({ children, footer }: { children: ReactNode; footer?: ReactNode }) {
+  const theme = typeof document !== 'undefined' && document.documentElement.dataset.theme === 'light' ? 'light' : 'dark';
   return (
     <div className={s.screen}>
       <div className={s.backdrop} aria-hidden>
         <span className={s.blob1} />
         <span className={s.blob2} />
         <span className={s.blob3} />
+        <div className={s.waveDecor}>
+          <WaveButton interactive={false} size={620} label="" theme={theme} />
+        </div>
       </div>
       <header className={s.top}>
         <Logo />

apps/web/src/pages/CollectionPage.tsx

@@ -10,7 +10,7 @@ import { useCollectionCounts } from '../entities/collection';
 import { usePlayer } from '../player/context';
 import { useErrorText } from '../shared/lib/errors';
 import { dislikeFillIcon, historyFillIcon, likeFillIcon, playIcon, shuffleIcon } from '../shared/ui/icons';
-import { Button, Dialog, FormError, Icon } from '../shared/ui/ui';
+import { Button, Dialog, EmptyState, FormError, Icon, PageSkeleton } from '../shared/ui/ui';
 import c from './catalog.module.css';
 import s from './page.module.css';
 
@@ -109,7 +109,12 @@ function History() {
         </div>
       )}
       <FormError>{history.error || clear.error ? errorText(history.error ?? clear.error) : null}</FormError>
-      {history.isSuccess && items.length === 0 && <div className={s.empty}>{t('collection.empty_history')}</div>}
+      {history.isPending && <PageSkeleton />}
+      {history.isSuccess && items.length === 0 && (
+        <EmptyState icon={historyFillIcon} action={<Link to="/">{t('catalog.back_home')}</Link>}>
+          {t('collection.empty_history')}
+        </EmptyState>
+      )}
       {groups.map((g) => (
         <section key={g.key} className={c.section}>
           <h2 className={c.day}>{g.title}</h2>
@@ -189,8 +194,18 @@ function Reacted({ reaction }: { reaction: 'like' | 'dislike' }) {
         </div>
       )}
       <FormError>{list.error ? errorText(list.error) : null}</FormError>
+      {list.isPending && <PageSkeleton />}
       {list.isSuccess && tracks.length === 0 && (
-        <div className={s.empty}>{t(reaction === 'like' ? 'collection.empty_likes' : 'collection.empty_dislikes')}</div>
+        <EmptyState
+          icon={reaction === 'like' ? likeFillIcon : dislikeFillIcon}
+          action={
+            <Link to="/search" search={{ q: '' }}>
+              {t('playlists.find_tracks')}
+            </Link>
+          }
+        >
+          {t(reaction === 'like' ? 'collection.empty_likes' : 'collection.empty_dislikes')}
+        </EmptyState>
       )}
       {tracks.length > 0 && (
         <TrackList

apps/web/src/pages/HomePage.tsx

@@ -21,7 +21,7 @@ import {
   waveSunIcon,
   waveWeekendIcon,
 } from '../shared/ui/icons';
-import { cx, FormError, Icon } from '../shared/ui/ui';
+import { cx, FormError, Icon, Skeleton } from '../shared/ui/ui';
 import { WaveButton } from '../widgets/wave/WaveButton';
 import s from './home.module.css';
 import { Onboarding } from './Onboarding';
@@ -52,8 +52,16 @@ export function HomePage() {
   const onboarding = useQuery({
     queryKey: ['onboarding'],
     queryFn: async () => unwrap(await session.client.GET('/api/v1/onboarding')),
-    staleTime: Infinity,
+    staleTime: 0,
+    refetchInterval: 30_000,
   });
+  if (onboarding.isPending) {
+    return (
+      <div className={s.home}>
+        <Skeleton round style={{ width: 320, height: 320, maxWidth: '70vw', maxHeight: '70vw' }} />
+      </div>
+    );
+  }
   if (onboarding.data?.required) {
     return (
       <Onboarding
@@ -136,6 +144,12 @@ function WaveHome() {
       {st.error === 'wave.empty' && <p className={s.note}>{t('wave.empty')}</p>}
       <FormError>{error ? errorText(error) : null}</FormError>
 
+      {options.isPending && (showActivities || showMoods) && (
+        <div className={s.picker}>
+          <Skeleton style={{ width: 280, height: 38, borderRadius: 999 }} />
+          <Skeleton style={{ width: 240, height: 38, borderRadius: 999 }} />
+        </div>
+      )}
       {options.data && (showActivities || showMoods) && (
         <div className={s.picker}>
           {showActivities && (

apps/web/src/pages/Onboarding.tsx

@@ -1,5 +1,5 @@
 import type { components } from '@pipu/api-client';
-import { unwrap } from '@pipu/core';
+import { AGE_GROUPS, GENDERS, unwrap } from '@pipu/core';
 import { useMutation } from '@tanstack/react-query';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -20,17 +20,19 @@ const MIN_ARTISTS = 3;
  * Онбординг вкуса (docs/recommendations.md#7): исполнители и жанры библиотеки — начальный вкус «Моей волны»,
  * пока своей истории почти нет. Пропуск тоже запоминается: второй раз не спросим.
  */
-export function Onboarding({ options, onDone }: { options: Options; onDone: () => void }) {
+export function Onboarding({ options, onDone, editing = false }: { options: Options; onDone: () => void; editing?: boolean }) {
   const { t } = useTranslation();
   const session = useSession();
   const errorText = useErrorText();
-  const [artists, setArtists] = useState<Set<string>>(new Set());
-  const [genres, setGenres] = useState<Set<string>>(new Set());
+  const [artists, setArtists] = useState<Set<string>>(new Set(options.choice?.artist_ids));
+  const [genres, setGenres] = useState<Set<string>>(new Set(options.choice?.genres));
+  const [gender, setGender] = useState(options.choice?.gender ?? null);
+  const [ageGroup, setAgeGroup] = useState(options.choice?.age_group ?? null);
   const save = useMutation({
     mutationFn: async (skip: boolean) =>
       unwrap(
         await session.client.PUT('/api/v1/me/onboarding', {
-          body: skip ? { artist_ids: [], genres: [] } : { artist_ids: [...artists], genres: [...genres] },
+          body: skip ? { artist_ids: [], genres: [], gender: null, age_group: null } : { artist_ids: [...artists], genres: [...genres], gender, age_group: ageGroup },
         }),
       ),
     onSuccess: onDone,
@@ -43,7 +45,7 @@ export function Onboarding({ options, onDone }: { options: Options; onDone: () =
       else next.add(key);
       return next;
     });
-  const enough = artists.size >= MIN_ARTISTS || (artists.size > 0 && genres.size > 0);
+  const enough = editing || artists.size >= MIN_ARTISTS || (artists.size > 0 && genres.size > 0) || !!gender || !!ageGroup || options.artists.length === 0;
 
   return (
     <div className={s.page}>
@@ -52,6 +54,21 @@ export function Onboarding({ options, onDone }: { options: Options; onDone: () =
         <p>{t('onboarding.subtitle')}</p>
       </header>
 
+      <section aria-label={t('onboarding.gender')}>
+        <h2 className={s.label}>{t('onboarding.gender')}</h2>
+        <div className={s.genres}>
+          <button type="button" className={s.genre} aria-pressed={!gender} onClick={() => setGender(null)}>{t('onboarding.unspecified')}</button>
+          {GENDERS.map((g) => <button type="button" key={g} className={s.genre} aria-pressed={gender === g} onClick={() => setGender(g)}>{t(`onboarding.genders.${g}`)}</button>)}
+        </div>
+      </section>
+      <section aria-label={t('onboarding.age_group')}>
+        <h2 className={s.label}>{t('onboarding.age_group')}</h2>
+        <p>{t('onboarding.age_hint')}</p>
+        <div className={s.genres}>
+          <button type="button" className={s.genre} aria-pressed={!ageGroup} onClick={() => setAgeGroup(null)}>{t('onboarding.unspecified')}</button>
+          {AGE_GROUPS.map((g) => <button type="button" key={g} className={s.genre} aria-pressed={ageGroup === g} onClick={() => setAgeGroup(g)}>{t(`onboarding.ages.${g}`)}</button>)}
+        </div>
+      </section>
       <section aria-label={t('onboarding.artists')}>
         <h2 className={s.label}>{t('onboarding.artists')}</h2>
         <div className={s.artists}>
@@ -101,11 +118,11 @@ export function Onboarding({ options, onDone }: { options: Options; onDone: () =
 
       <FormError>{save.error ? errorText(save.error) : null}</FormError>
       <div className={s.actions}>
-        <Button variant="ghost" busy={save.isPending && save.variables} onClick={() => save.mutate(true)}>
-          {t('onboarding.skip')}
+        <Button variant="ghost" disabled={save.isPending} busy={save.isPending && save.variables} onClick={() => editing ? onDone() : save.mutate(true)}>
+          {t(editing ? 'form.cancel' : 'onboarding.skip')}
         </Button>
-        <Button variant="primary" busy={save.isPending && !save.variables} disabled={!enough} onClick={() => save.mutate(false)}>
-          {enough ? t('onboarding.done') : t('onboarding.pick_more', { count: MIN_ARTISTS - artists.size })}
+        <Button variant="primary" busy={save.isPending && !save.variables} disabled={!enough || save.isPending} onClick={() => save.mutate(false)}>
+          {enough ? t(editing ? 'settings.save' : 'onboarding.done') : t('onboarding.pick_more', { count: MIN_ARTISTS - artists.size })}
         </Button>
       </div>
     </div>

apps/web/src/pages/PlaylistsPage.tsx

@@ -1,16 +1,17 @@
 import { unwrap } from '@pipu/core';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { Link, useNavigate } from '@tanstack/react-router';
-import { useState } from 'react';
+import { useState, type MouseEvent } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useSession } from '../app/session';
 import { Cover, TrackList } from '../entities/catalog';
 import { PlaylistEditor, playlistInput, usePlaylist, usePlaylists, type Playlist } from '../entities/playlists';
+import type { components } from '@pipu/api-client';
 import { usePlayer } from '../player/context';
 import { useErrorText } from '../shared/lib/errors';
 import { formatDuration } from '../shared/lib/format';
-import { Button, Dialog, Field, FormError } from '../shared/ui/ui';
-import { playIcon, shuffleIcon } from '../shared/ui/icons';
+import { Button, Dialog, EmptyState, Field, FormError, Icon, PageSkeleton } from '../shared/ui/ui';
+import { playIcon, playlistAddIcon, searchIcon, shuffleIcon } from '../shared/ui/icons';
 import c from './catalog.module.css';
 import s from './page.module.css';
 import p from './playlists.module.css';
@@ -27,13 +28,16 @@ export function PlaylistsPage() {
     <header className={s.toolbar}><h1>{t('playlists.title')}</h1><Button variant="primary" onClick={() => setCreate(true)}>{t('playlists.create')}</Button></header>
     <Field label={t('playlists.search')} value={search} onChange={setSearch} type="search" />
     <FormError>{list.error ? errorText(list.error) : null}</FormError>
-    {list.isPending && <p role="status">{t('playlists.loading')}</p>}
-    {list.isSuccess && !items.length && <p className={s.empty}>{t(search ? 'playlists.no_results' : 'playlists.empty')}</p>}
-    <div className={p.grid}>{items.map(item => <Link key={item.id} to="/playlist/$id" params={{ id: item.id }} className={p.card}>
-      <Cover album={item} size="100%" />
-      <strong>{item.name}</strong><span>{t('catalog.track_count', { count: item.track_count })} · {formatDuration(item.duration_ms)}</span>
-      {item.description && <span className={p.description}>{item.description}</span>}
-    </Link>)}</div>
+    {list.isPending && <PageSkeleton />}
+    {list.isSuccess && !items.length && (
+      <EmptyState
+        icon={search ? searchIcon : playlistAddIcon}
+        action={!search ? <Button variant="primary" onClick={() => setCreate(true)}>{t('playlists.create')}</Button> : undefined}
+      >
+        {t(search ? 'playlists.no_results' : 'playlists.empty')}
+      </EmptyState>
+    )}
+    <div className={p.grid}>{items.map(item => <PlaylistCard key={item.id} item={item} />)}</div>
     {create && <PlaylistEditor onClose={() => setCreate(false)} onSaved={item => { setCreate(false); void navigate({ to: '/playlist/$id', params: { id: item.id } }); }} />}
   </div>;
 }
@@ -45,7 +49,7 @@ export function PlaylistPage({ id }: { id: string }) {
   return <div className={s.page}>
     <Link to="/collection/playlists">← {t('playlists.title')}</Link>
     <FormError>{query.error ? errorText(query.error) : null}</FormError>
-    {query.isPending && <p role="status">{t('playlists.loading')}</p>}
+    {query.isPending && <PageSkeleton />}
     {query.data && <PlaylistDetail key={id} playlist={query.data} />}
   </div>;
 }
@@ -93,7 +97,11 @@ function PlaylistDetail({ playlist }: { playlist: Playlist }) {
       <Button variant="ghost" disabled={save.isPending} onClick={() => setRemove(true)}>{t('playlists.delete')}</Button>
     </div>
     <FormError>{save.error ? errorText(save.error) : null}</FormError>
-    {!playlist.tracks.length && <div className={s.empty}><p>{t('playlists.empty_tracks')}</p><Link to="/search" search={{ q: '' }}>{t('playlists.find_tracks')}</Link></div>}
+    {!playlist.tracks.length && (
+      <EmptyState icon={playlistAddIcon} action={<Link to="/search" search={{ q: '' }}>{t('playlists.find_tracks')}</Link>}>
+        {t('playlists.empty_tracks')}
+      </EmptyState>
+    )}
     <TrackList tracks={playlist.tracks} showAlbum context={context} lead={(_, i) => String(i + 1)}
       actions={manage ? (track, i) => <span className={p.actions}>
         <button type="button" disabled={i === 0 || save.isPending} aria-label={t('playlists.move_up', { name: track.title })} onClick={() => move(i, -1)}>↑</button>
@@ -101,9 +109,52 @@ function PlaylistDetail({ playlist }: { playlist: Playlist }) {
         <button type="button" disabled={save.isPending} aria-label={t('playlists.remove_track', { name: track.title })} onClick={() => save.mutate(playlist.tracks.filter(x => x.id !== track.id).map(x => x.id))}>×</button>
       </span> : undefined} />
     {edit && <PlaylistEditor playlist={playlist} onClose={() => setEdit(false)} onSaved={() => setEdit(false)} />}
-    {remove && <Dialog title={t('playlists.delete')} onClose={() => { if (!deletion.isPending) setRemove(false); }} footer={<>
-      <Button disabled={deletion.isPending} onClick={() => setRemove(false)}>{t('form.cancel')}</Button>
-      <Button variant="danger" busy={deletion.isPending} onClick={() => deletion.mutate()}>{t('playlists.delete')}</Button>
-    </>}><p>{t('playlists.delete_confirm', { name: playlist.name })}</p><FormError>{deletion.error ? errorText(deletion.error) : null}</FormError></Dialog>}
+    {remove && (
+      <Dialog
+        title={t('playlists.delete')}
+        onClose={() => {
+          if (!deletion.isPending) setRemove(false);
+        }}
+        footer={
+          <>
+            <Button disabled={deletion.isPending} onClick={() => setRemove(false)}>{t('form.cancel')}</Button>
+            <Button variant="danger" busy={deletion.isPending} onClick={() => deletion.mutate()}>{t('playlists.delete')}</Button>
+          </>
+        }
+      >
+        <p>{t('playlists.delete_confirm', { name: playlist.name })}</p>
+        <FormError>{deletion.error ? errorText(deletion.error) : null}</FormError>
+      </Dialog>
+    )}
   </>;
 }
+
+function PlaylistCard({ item }: { item: components['schemas']['PlaylistSummary'] }) {
+  const { t } = useTranslation();
+  const session = useSession();
+  const player = usePlayer();
+  const play = (e: MouseEvent) => {
+    e.preventDefault();
+    e.stopPropagation();
+    void (async () => {
+      const full = unwrap(await session.client.GET('/api/v1/me/playlists/{id}', { params: { path: { id: item.id } } }));
+      const tracks = full.tracks.filter((x) => x.available);
+      if (tracks.length) player.playList(tracks, 0, { type: 'collection', id: item.id, label: item.name });
+    })();
+  };
+  return (
+    <Link to="/playlist/$id" params={{ id: item.id }} className={p.card}>
+      <span className={p.coverWrap}>
+        <Cover album={item} size="100%" />
+        {item.track_count > 0 && (
+          <button type="button" className={p.play} aria-label={t('catalog.play')} onClick={play}>
+            <Icon src={playIcon} size={22} />
+          </button>
+        )}
+      </span>
+      <strong>{item.name}</strong>
+      <span>{t('catalog.track_count', { count: item.track_count })} · {formatDuration(item.duration_ms)}</span>
+      {item.description && <span className={p.description}>{item.description}</span>}
+    </Link>
+  );
+}

apps/web/src/pages/SearchPage.tsx

@@ -6,7 +6,8 @@ import { useTranslation } from 'react-i18next';
 import { useSession } from '../app/session';
 import { AlbumGrid, ArtistChip, TrackList } from '../entities/catalog';
 import { useErrorText } from '../shared/lib/errors';
-import { Button, FormError } from '../shared/ui/ui';
+import { searchIcon } from '../shared/ui/icons';
+import { Button, EmptyState, FormError, PageSkeleton } from '../shared/ui/ui';
 import s from './page.module.css';
 import c from './catalog.module.css';
 
@@ -68,7 +69,11 @@ export function SearchPage({ q, type }: { q: string; type: SearchType }) {
       </div>
 
       <FormError>{results.error ? errorText(results.error) : null}</FormError>
-      {empty && <div className={s.empty}>{t('search.nothing')}</div>}
+      {query === '' && <EmptyState icon={searchIcon}>{t('search.type_query')}</EmptyState>}
+      {query !== '' && results.isPending && <PageSkeleton />}
+      {empty && (
+        <EmptyState icon={searchIcon}>{t('search.nothing')}</EmptyState>
+      )}
 
       {artists.length > 0 && (
         <section className={c.section}>

apps/web/src/pages/SettingsPage.tsx

@@ -12,6 +12,7 @@ import { formatDateTime } from '../shared/lib/format';
 import { Button, Field, FormError, Segmented } from '../shared/ui/ui';
 import { LanguageSwitch } from '../widgets/LanguageSwitch';
 import s from './page.module.css';
+import { Onboarding } from './Onboarding';
 
 type Theme = NonNullable<components['schemas']['UiPrefs']['theme']>;
 type WaveVariant = NonNullable<components['schemas']['UiPrefs']['wave_variant']>;
@@ -24,6 +25,7 @@ export function SettingsPage() {
         <h1>{t('settings.title')}</h1>
       </div>
       <ProfileSection />
+      <RecommendationSettings />
       <AppearanceSection />
       <PasswordSection />
       <SessionsSection />
@@ -357,3 +359,17 @@ function SessionsSection() {
     </section>
   );
 }
+
+function RecommendationSettings() {
+  const { t } = useTranslation();
+  const session = useSession();
+  const queryClient = useQueryClient();
+  const [editing, setEditing] = useState(false);
+  const errorText = useErrorText();
+  const options = useQuery({ queryKey: ['onboarding'], queryFn: async () => unwrap(await session.client.GET('/api/v1/onboarding')), staleTime: 0 });
+  return <section className={s.section}>
+    {editing && options.data ? <Onboarding key={JSON.stringify(options.data.choice)} options={options.data} editing onDone={() => { setEditing(false); void queryClient.invalidateQueries({ queryKey: ['onboarding'] }); }} />
+      : <Button busy={options.isFetching} onClick={() => { void options.refetch().then((result) => { if (result.data && !result.error) setEditing(true); }); }}>{t('onboarding.edit')}</Button>}
+    <FormError>{options.error ? errorText(options.error) : null}</FormError>
+  </section>;
+}

apps/web/src/pages/TrackPage.tsx

@@ -4,8 +4,12 @@ import { Link } from '@tanstack/react-router';
 import { useTranslation } from 'react-i18next';
 
 import { useSession } from '../app/session';
-import { ArtistLinks, Cover, TrackList } from '../entities/catalog';
+import { ArtistLinks, Cover, coverSrc } from '../entities/catalog';
+import { AddToPlaylist } from '../entities/playlists';
+import { usePlayer, usePlayerState } from '../player/context';
 import { formatDuration } from '../shared/lib/format';
+import { pauseIcon, playIcon } from '../shared/ui/icons';
+import { Button, PageSkeleton } from '../shared/ui/ui';
 import { NotFound } from './NotFound';
 import s from './page.module.css';
 import c from './catalog.module.css';
@@ -14,27 +18,63 @@ import { TrackGenius } from './TrackGenius';
 export function TrackPage({ id }: { id: string }) {
   const { t } = useTranslation();
   const session = useSession();
+  const player = usePlayer();
+  const st = usePlayerState();
   const track = useQuery({
     queryKey: ['track', id],
     queryFn: async () => unwrap(await session.client.GET('/api/v1/tracks/{id}', { params: { path: { id } } })),
   });
+  if (track.isPending) {
+    return (
+      <div className={s.page}>
+        <PageSkeleton />
+      </div>
+    );
+  }
   if (track.isError) return <NotFound error={track.error} />;
   const tr = track.data;
+  if (!tr) return null;
+  const ctx = { type: 'queue' as const };
+  const current = st.track?.id === tr.id;
+  const playing = current && st.playing;
   return (
     <div className={s.page}>
-      <header className={c.hero}>
-        {tr && <Cover album={tr.album} size={200} />}
-        <div className={c.heroBody}>
-          <span className={c.kind}>{t('player.track_page')}</span>
-          <h1 className={c.heroTitle}>{tr?.title ?? '…'}</h1>
-          {tr && <>
-            <span className={c.heroMeta}><ArtistLinks artists={tr.artists} /> · {formatDuration(tr.duration_ms)}</span>
-            <Link to="/album/$id" params={{ id: tr.album.id }}>{tr.album.title}</Link>
-          </>}
+      <div className={c.listen}>
+        <header className={c.hero}>
+          {tr.album.cover_url && (
+            <span className={c.heroBg} aria-hidden>
+              <img src={coverSrc(tr.album.cover_url, 300)} alt="" />
+            </span>
+          )}
+          <Cover album={tr.album} size={280} className={c.heroCover} />
+          <div className={c.heroBody}>
+            <span className={c.kind}>{t('player.track_page')}</span>
+            <h1 className={c.heroTitle}>{tr.title}</h1>
+            <span className={c.heroMeta}>
+              <ArtistLinks artists={tr.artists} /> · {formatDuration(tr.duration_ms)}
+            </span>
+            <Link to="/album/$id" params={{ id: tr.album.id }}>
+              {tr.album.title}
+            </Link>
+            <div className={c.heroActions}>
+              {tr.available && (
+                <Button
+                  variant="primary"
+                  className={c.pill}
+                  icon={playing ? pauseIcon : playIcon}
+                  onClick={() => (current ? player.toggle() : player.playList([tr], 0, ctx))}
+                >
+                  {t(playing ? 'player.pause' : 'catalog.play')}
+                </Button>
+              )}
+              <AddToPlaylist trackIds={[tr.id]} />
+            </div>
+          </div>
+        </header>
+        <div className={c.listenLyrics}>
+          <TrackGenius id={id} />
         </div>
-      </header>
-      {tr && <TrackList tracks={[tr]} context={{ type: 'queue' }} />}
-      {tr && <TrackGenius id={id} />}
+      </div>
     </div>
   );
 }

apps/web/src/pages/admin/AdminSettingsPage.tsx

@@ -1,7 +1,7 @@
 import { useTranslation } from 'react-i18next';
 
 import s from '../page.module.css';
-import { UploadSettingsSection } from './UploadQueuePage';
+import { UploadSettingsSection } from '../../features/uploads/UploadSettingsSection';
 
 /** «Настройки» админки: параметры сервера, которые меняет администратор (пока — очередь на добавление). */
 export function AdminSettingsPage() {

apps/web/src/pages/admin/AuditPage.tsx

@@ -6,7 +6,7 @@ import { useTranslation } from 'react-i18next';
 import { useSession } from '../../app/session';
 import { useErrorText } from '../../shared/lib/errors';
 import { formatDateTime } from '../../shared/lib/format';
-import { Button, FormError } from '../../shared/ui/ui';
+import { Button, EmptyState, FormError, PageSkeleton } from '../../shared/ui/ui';
 import s from '../page.module.css';
 
 type Entry = components['schemas']['AuditEntry'];
@@ -67,8 +67,8 @@ export function AuditPage() {
             ))}
           </tbody>
         </table>
-        {list.isSuccess && entries.length === 0 && <div className={s.empty}>{t('audit.empty')}</div>}
-        {list.isPending && <div className={s.empty}>{t('common:loading')}</div>}
+        {list.isSuccess && entries.length === 0 && <EmptyState>{t('audit.empty')}</EmptyState>}
+        {list.isPending && <PageSkeleton />}
       </div>
       {list.hasNextPage && (
         <Button className={s.more} busy={list.isFetchingNextPage} onClick={() => void list.fetchNextPage()}>

apps/web/src/pages/admin/SourcesPage.tsx

@@ -9,7 +9,7 @@ import { useSession, useUser } from '../../app/session';
 import { GeniusPanel } from './GeniusPanel';
 import { useErrorText, useFieldError } from '../../shared/lib/errors';
 import { addIcon, chevronRightIcon, folderIcon, moreIcon, refreshIcon } from '../../shared/ui/icons';
-import { Button, Dialog, Field, FormError, Icon, Menu, Segmented, type MenuItem } from '../../shared/ui/ui';
+import { Button, Dialog, EmptyState, Field, FormError, Icon, Menu, Segmented, type MenuItem } from '../../shared/ui/ui';
 import s from '../page.module.css';
 import l from './library.module.css';
 import { ScanLine, StatusBadge } from './ScanStatus';
@@ -46,7 +46,11 @@ export function SourcesPage() {
       </div>
       <FormError>{sources.error ? errorText(sources.error) : null}</FormError>
       {user.role === 'admin' && <GeniusPanel />}
-      {sources.isSuccess && sources.data.length === 0 && <div className={s.empty}>{t('sources.empty')}</div>}
+      {sources.isSuccess && sources.data.length === 0 && (
+        <EmptyState icon={folderIcon} action={<Button variant="primary" onClick={() => setEditing('new')}>{t('sources.add')}</Button>}>
+          {t('sources.empty')}
+        </EmptyState>
+      )}
       <div className={l.list}>
         {sources.data?.map((src) => (
           <SourceCard key={src.id} source={src} onEdit={() => setEditing(src)} />

apps/web/src/pages/admin/UploadQueuePage.tsx

@@ -1,640 +1,3 @@
-import type { components } from '@pipu/api-client';
-import { ApiError, unwrap } from '@pipu/core';
-import { useInfiniteQuery, useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
-import { useEffect, useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
+import { UploadQueue } from '../../features/uploads/UploadQueue';
 
-import { useSession } from '../../app/session';
-import { needsFormatAttention } from '../../features/uploads/files';
-import { useErrorText, useFieldError } from '../../shared/lib/errors';
-import { formatBytes, formatDateTime, formatDuration } from '../../shared/lib/format';
-import { checkIcon, closeIcon, editIcon, refreshIcon } from '../../shared/ui/icons';
-import { Button, cx, Dialog, Field, FormError, Icon } from '../../shared/ui/ui';
-import s from '../page.module.css';
-import { MOVING, QuotaMeter, UploadStatusBadge, useReasonText, type UploadFile, type UploadStatus } from '../uploads/common';
-import u from '../uploads/uploads.module.css';
-
-type Meta = components['schemas']['UploadMeta'];
-type Settings = components['schemas']['UploadSettings'];
-
-const TABS = {
-  review: ['pending_review'],
-  failed: ['import_failed'],
-  progress: ['uploading', 'processing', 'approved', 'importing'],
-  imported: ['imported'],
-  declined: ['rejected', 'duplicate', 'invalid', 'withdrawn', 'expired'],
-} satisfies Record<string, UploadStatus[]>;
-type Tab = keyof typeof TABS;
-
-/** «Очередь на добавление» (docs/uploads.md#8): рассмотрение по пачкам, правка метаданных, массовые решения. */
-export function UploadQueuePage() {
-  const { t } = useTranslation(['admin', 'common']);
-  const session = useSession();
-  const queryClient = useQueryClient();
-  const errorText = useErrorText();
-  const [tab, setTab] = useState<Tab>('review');
-  const [onlyPossible, setOnlyPossible] = useState(false);
-  const [selected, setSelected] = useState<Set<string>>(new Set());
-  const [editing, setEditing] = useState<UploadFile | null>(null);
-  const [batchEdit, setBatchEdit] = useState<string | null>(null);
-  const [rejecting, setRejecting] = useState(false);
-
-  const list = useInfiniteQuery({
-    queryKey: ['admin-uploads', tab, onlyPossible],
-    initialPageParam: undefined as string | undefined,
-    queryFn: async ({ pageParam }) =>
-      unwrap(
-        await session.client.GET('/api/v1/admin/uploads', {
-          params: {
-            query: { status: [...TABS[tab]], possible_duplicate: onlyPossible || undefined, cursor: pageParam, limit: 100 },
-          },
-        }),
-      ),
-    getNextPageParam: (p) => p.next_cursor ?? undefined,
-    refetchInterval: (q) =>
-      q.state.data?.pages.some((p) => p.items.some((it) => MOVING.includes(it.status))) ? 5000 : false,
-  });
-  const items = useMemo(() => list.data?.pages.flatMap((p) => p.items) ?? [], [list.data]);
-  useEffect(() => setSelected(new Set()), [tab, onlyPossible]);
-
-  const refresh = async () => {
-    setSelected(new Set());
-    await queryClient.invalidateQueries({ queryKey: ['admin-uploads'] });
-    await queryClient.invalidateQueries({ queryKey: ['upload-quota'] });
-  };
-  const review = useMutation({
-    mutationFn: async (v: { decision: 'approve' | 'reject'; ids: string[]; reason?: string }) =>
-      unwrap(
-        await session.client.POST('/api/v1/admin/uploads/review', {
-          body: { file_ids: v.ids, decision: v.decision, reason: v.reason },
-        }),
-      ),
-    onSuccess: refresh,
-  });
-  const retry = useMutation({
-    mutationFn: async (id: string) =>
-      unwrap(await session.client.POST('/api/v1/admin/uploads/files/{id}/retry', { params: { path: { id } } })),
-    onSuccess: refresh,
-  });
-  const failed = review.data?.items.filter((r) => !r.ok) ?? [];
-
-  // Группировка по пачке: файлы одной загрузки (обычно альбом) рассматриваются вместе.
-  const batches = useMemo(() => {
-    const m = new Map<string, UploadFile[]>();
-    for (const f of items) m.set(f.batch_id, [...(m.get(f.batch_id) ?? []), f]);
-    return [...m.values()];
-  }, [items]);
-  const toggle = (ids: string[], on: boolean) =>
-    setSelected((cur) => {
-      const next = new Set(cur);
-      for (const id of ids) {
-        if (on) next.add(id);
-        else next.delete(id);
-      }
-      return next;
-    });
-  const selectable = tab === 'review' || tab === 'failed';
-  const ids = [...selected];
-
-  return (
-    <div className={s.page}>
-      <div className={s.head}>
-        <div>
-          <h1>{t('uploads.queue_title')}</h1>
-          <p className={s.subtitle}>{t('uploads.queue_subtitle')}</p>
-        </div>
-        <QuotaMeter />
-      </div>
-      <div className={s.toolbar}>
-        <div className={s.chips} role="group" aria-label={t('uploads.filter')}>
-          {(Object.keys(TABS) as Tab[]).map((k) => (
-            <button key={k} type="button" className={s.chip} aria-pressed={tab === k} onClick={() => setTab(k)}>
-              {t(`uploads.tab_${k}`)}
-            </button>
-          ))}
-        </div>
-        <span style={{ flex: 1 }} />
-        <label className={u.sub} style={{ display: 'flex', gap: 8, alignItems: 'center' }}>
-          <input type="checkbox" checked={onlyPossible} onChange={(e) => setOnlyPossible(e.target.checked)} />
-          {t('uploads.only_possible')}
-        </label>
-      </div>
-      <FormError>{(list.error ?? review.error ?? retry.error) ? errorText(list.error ?? review.error ?? retry.error) : null}</FormError>
-      {failed.length > 0 && (
-        <FormError>{t('uploads.review_failed', { count: failed.length, reason: failed[0]?.error ? errorText(problemError(failed[0].error)) : '' })}</FormError>
-      )}
-      {list.isSuccess && items.length === 0 && <div className={s.empty}>{t('uploads.queue_empty')}</div>}
-
-      {batches.map((files) => (
-        <BatchCard
-          key={files[0]!.batch_id}
-          files={files}
-          selectable={selectable}
-          selected={selected}
-          onToggle={toggle}
-          onEdit={setEditing}
-          onEditBatch={setBatchEdit}
-          onRetry={(id) => retry.mutate(id)}
-        />
-      ))}
-      {list.hasNextPage && (
-        <Button busy={list.isFetchingNextPage} onClick={() => void list.fetchNextPage()}>
-          {t('uploads.load_more')}
-        </Button>
-      )}
-
-      {ids.length > 0 && (
-        <div className={u.bulk} role="region" aria-label={t('uploads.bulk')}>
-          <span>{t('uploads.selected', { count: ids.length })}</span>
-          <span style={{ flex: 1 }} />
-          <Button variant="ghost" onClick={() => setSelected(new Set())}>
-            {t('common:form.cancel')}
-          </Button>
-          <Button variant="danger" icon={closeIcon} onClick={() => setRejecting(true)}>
-            {t('uploads.reject')}
-          </Button>
-          {tab === 'review' && (
-            <Button variant="primary" icon={checkIcon} busy={review.isPending} onClick={() => review.mutate({ decision: 'approve', ids })}>
-              {t('uploads.approve')}
-            </Button>
-          )}
-        </div>
-      )}
-
-      {batchEdit && (
-        <BatchEditDialog
-          batchId={batchEdit}
-          onClose={() => setBatchEdit(null)}
-          onSaved={() => {
-            setBatchEdit(null);
-            void refresh();
-          }}
-        />
-      )}
-
-      {editing && (
-        <EditDialog
-          file={editing}
-          onClose={() => setEditing(null)}
-          onSaved={() => {
-            review.reset();
-            void refresh();
-          }}
-        />
-      )}
-      {rejecting && (
-        <RejectDialog
-          count={ids.length}
-          busy={review.isPending}
-          onClose={() => setRejecting(false)}
-          onReject={(reason) => {
-            setRejecting(false);
-            review.mutate({ decision: 'reject', ids, reason });
-          }}
-        />
-      )}
-    </div>
-  );
-}
-
-/** Problem из ответа массового решения → объект, понятный useErrorText. */
-function problemError(p: components['schemas']['Problem']) {
-  return new ApiError(p.status, p.code, p.params ?? {});
-}
-
-function BatchCard({
-  files,
-  selectable,
-  selected,
-  onToggle,
-  onEdit,
-  onEditBatch,
-  onRetry,
-}: {
-  files: UploadFile[];
-  selectable: boolean;
-  selected: Set<string>;
-  onToggle: (ids: string[], on: boolean) => void;
-  onEdit: (f: UploadFile) => void;
-  onEditBatch: (batchId: string) => void;
-  onRetry: (id: string) => void;
-}) {
-  const { t, i18n } = useTranslation('admin');
-  const first = files[0]!;
-  const ids = files.map((f) => f.id);
-  const all = ids.every((id) => selected.has(id));
-  const size = files.reduce((n, f) => n + f.size_bytes, 0);
-  return (
-    <section className={u.batch} aria-label={t('uploads.batch_of', { author: first.author.username })}>
-      <div className={u.batchHead}>
-        {selectable && (
-          <input type="checkbox" aria-label={t('uploads.select_batch')} checked={all} onChange={(e) => onToggle(ids, e.target.checked)} />
-        )}
-        <b>{first.author.username}</b>
-        <span>{formatDateTime(first.created_at, i18n.language)}</span>
-        <span>{t('uploads.batch_size', { count: files.length, size: formatBytes(size, i18n.language) })}</span>
-        {first.batch_comment && <span className={u.comment}>«{first.batch_comment}»</span>}
-        <span style={{ flex: 1 }} />
-        {selectable && (
-          <Button variant="ghost" onClick={() => onEditBatch(first.batch_id)}>
-            {t('uploads.edit_batch')}
-          </Button>
-        )}
-      </div>
-      {files.map((f) => (
-        <QueueRow
-          key={f.id}
-          file={f}
-          selectable={selectable}
-          checked={selected.has(f.id)}
-          onCheck={(on) => onToggle([f.id], on)}
-          onEdit={() => onEdit(f)}
-          onRetry={() => onRetry(f.id)}
-        />
-      ))}
-    </section>
-  );
-}
-
-function QueueRow({
-  file: f,
-  selectable,
-  checked,
-  onCheck,
-  onEdit,
-  onRetry,
-}: {
-  file: UploadFile;
-  selectable: boolean;
-  checked: boolean;
-  onCheck: (on: boolean) => void;
-  onEdit: () => void;
-  onRetry: () => void;
-}) {
-  const { t, i18n } = useTranslation('admin');
-  const reason = useReasonText()(f.status_reason);
-  const m = f.metadata;
-  const quality = [
-    f.format?.toUpperCase(),
-    f.bitrate ? `${Math.round(f.bitrate / 1000)} kbps` : null,
-    f.sample_rate ? `${(f.sample_rate / 1000).toFixed(1)} kHz` : null,
-    f.bit_depth ? `${f.bit_depth} bit` : null,
-    f.duration_ms ? formatDuration(f.duration_ms) : null,
-    formatBytes(f.size_bytes, i18n.language),
-  ]
-    .filter(Boolean)
-    .join(' · ');
-  const editable = f.status === 'pending_review' || f.status === 'import_failed';
-  return (
-    <div className={u.queueRow}>
-      {selectable ? (
-        <input type="checkbox" aria-label={t('uploads.select_file', { name: f.original_name })} checked={checked} onChange={(e) => onCheck(e.target.checked)} />
-      ) : (
-        <span />
-      )}
-      <div className={u.meta}>
-        <span className={u.metaTitle}>{m ? `${m.artist} — ${m.title}` : f.original_name}</span>
-        {m && (
-          <span className={u.sub}>
-            {[m.album, m.year, m.disc && m.disc > 1 ? t('uploads.disc', { n: m.disc }) : null, m.track ? `#${m.track}` : null, m.genre]
-              .filter(Boolean)
-              .join(' · ')}
-            {f.metadata_edited && ` · ${t('uploads.edited')}`}
-          </span>
-        )}
-        <span className={u.sub}>{quality}</span>
-        <span className={u.sub} title={f.client_rel_path ?? undefined}>
-          {f.client_rel_path ?? f.original_name}
-        </span>
-      </div>
-      <div className={u.meta}>
-        <div className={u.flags}>
-          <UploadStatusBadge status={f.status} />
-          {needsFormatAttention(f.format, f.original_name) && (
-            <span className={cx(s.badge, u.tone_warn)} title={t('uploads.format_attention')}>
-              {t('uploads.flag_attention')}
-            </span>
-          )}
-          {f.possible_duplicate && <span className={cx(s.badge, u.tone_warn)}>{t('uploads.flag_possible')}</span>}
-          {f.quality_upgrade && <span className={cx(s.badge, u.tone_info)}>{t('uploads.flag_quality')}</span>}
-          {f.matched_album_id ? (
-            <span className={cx(s.badge, u.tone_info)}>{t('uploads.flag_existing_album')}</span>
-          ) : (
-            m && <span className={cx(s.badge, u.tone_muted)}>{t('uploads.flag_new_album')}</span>
-          )}
-        </div>
-        {f.target_rel_path && <span className={u.target}>{f.target_rel_path}</span>}
-        {reason && <span className={f.status === 'pending_review' ? u.warn : u.bad}>{reason}</span>}
-        {f.duplicate_level && f.status === 'duplicate' && (
-          <span className={u.sub}>{t(`uploads.dup_level_${f.duplicate_level}`)}</span>
-        )}
-      </div>
-      <div className={u.rowActions}>
-        {f.stream_url && (
-          <audio controls preload="none" src={f.stream_url} aria-label={t('uploads.listen', { name: f.original_name })} />
-        )}
-        {editable && (
-          <Button variant="ghost" aria-label={t('uploads.edit', { name: f.original_name })} onClick={onEdit}>
-            <Icon src={editIcon} size={18} />
-          </Button>
-        )}
-        {f.status === 'import_failed' && (
-          <Button variant="ghost" icon={refreshIcon} onClick={onRetry}>
-            {t('uploads.retry')}
-          </Button>
-        )}
-      </div>
-    </div>
-  );
-}
-
-const EMPTY_META: Meta = { artist: '', albumartist: '', album: '', title: '', genre: '', year: null, track: null, disc: null };
-
-function BatchEditDialog({ batchId, onClose, onSaved }: { batchId: string; onClose: () => void; onSaved: () => void }) {
-  const { t } = useTranslation(['admin', 'common']);
-  const session = useSession();
-  const errorText = useErrorText();
-  const [artist, setArtist] = useState('');
-  const [album, setAlbum] = useState('');
-  const [year, setYear] = useState('');
-  const [cover, setCover] = useState<string | null | undefined>(undefined);
-  const save = useMutation({
-    mutationFn: async () =>
-      unwrap(
-        await session.client.PATCH('/api/v1/admin/uploads/batches/{id}', {
-          params: { path: { id: batchId } },
-          body: {
-            ...(artist.trim() ? { artist: artist.trim() } : {}),
-            ...(album.trim() ? { album: album.trim() } : {}),
-            ...(year.trim() ? { year: Number.parseInt(year, 10) } : {}),
-            ...(cover !== undefined ? { cover_base64: cover } : {}),
-          },
-        }),
-      ),
-    onSuccess: onSaved,
-  });
-  const pickCover = (file: File | undefined) => {
-    if (!file) {
-      setCover(undefined);
-      return;
-    }
-    const reader = new FileReader();
-    reader.onload = () => {
-      const data = String(reader.result ?? '');
-      const comma = data.indexOf(',');
-      setCover(comma >= 0 ? data.slice(comma + 1) : data);
-    };
-    reader.readAsDataURL(file);
-  };
-  return (
-    <Dialog
-      title={t('uploads.batch_edit_title')}
-      onClose={onClose}
-      footer={
-        <>
-          <Button variant="ghost" onClick={onClose}>
-            {t('common:form.cancel')}
-          </Button>
-          <Button variant="primary" busy={save.isPending} onClick={() => save.mutate()}>
-            {t('uploads.save')}
-          </Button>
-        </>
-      }
-    >
-      <div className={s.sessions}>
-        <p className={s.note}>{t('uploads.batch_edit_hint')}</p>
-        <Field label={t('uploads.meta_artist')} value={artist} onChange={setArtist} maxLength={500} />
-        <Field label={t('uploads.meta_album')} value={album} onChange={setAlbum} maxLength={500} />
-        <Field label={t('uploads.meta_year')} value={year} inputMode="numeric" onChange={setYear} />
-        <label className={s.sessions}>
-          <span>{t('uploads.batch_cover')}</span>
-          <input type="file" accept="image/jpeg,image/png,image/webp" onChange={(e) => pickCover(e.target.files?.[0])} />
-        </label>
-        <Button variant="ghost" onClick={() => setCover(null)}>
-          {t('uploads.batch_cover_clear')}
-        </Button>
-        <FormError>{save.error ? errorText(save.error) : null}</FormError>
-      </div>
-    </Dialog>
-  );
-}
-
-function EditDialog({ file, onClose, onSaved }: { file: UploadFile; onClose: () => void; onSaved: () => void }) {
-  const { t } = useTranslation(['admin', 'common']);
-  const session = useSession();
-  const errorText = useErrorText();
-  const fieldError = useFieldError();
-  const [m, setM] = useState<Meta>(file.metadata ?? EMPTY_META);
-  const [source, setSource] = useState(file.target_source_id ?? '');
-  const sources = useQuery({
-    queryKey: ['sources'],
-    queryFn: async () => unwrap(await session.client.GET('/api/v1/admin/sources')).items,
-  });
-  const save = useMutation({
-    mutationFn: async () =>
-      unwrap(
-        await session.client.PATCH('/api/v1/admin/uploads/files/{id}', {
-          params: { path: { id: file.id } },
-          body: { metadata: m, ...(source ? { target_source_id: source } : {}) },
-        }),
-      ),
-    onSuccess: () => {
-      onSaved();
-      onClose();
-    },
-  });
-  const text = (k: 'artist' | 'albumartist' | 'album' | 'title' | 'genre') => (
-    <Field label={t(`uploads.meta_${k}`)} value={m[k]} onChange={(v) => setM({ ...m, [k]: v })} maxLength={500} />
-  );
-  const num = (k: 'year' | 'track' | 'disc') => (
-    <Field
-      label={t(`uploads.meta_${k}`)}
-      value={m[k] === null ? '' : String(m[k])}
-      inputMode="numeric"
-      onChange={(v) => setM({ ...m, [k]: v.trim() === '' ? null : Number.parseInt(v, 10) || null })}
-    />
-  );
-  const accepting = sources.data?.filter((x) => x.accepts_uploads) ?? [];
-  return (
-    <Dialog
-      title={t('uploads.edit_title')}
-      onClose={onClose}
-      footer={
-        <>
-          <Button variant="ghost" onClick={onClose}>
-            {t('common:form.cancel')}
-          </Button>
-          <Button variant="primary" busy={save.isPending} disabled={!m.artist.trim() || !m.title.trim()} onClick={() => save.mutate()}>
-            {t('uploads.save')}
-          </Button>
-        </>
-      }
-    >
-      <div className={s.sessions}>
-        <p className={s.note}>{file.client_rel_path ?? file.original_name}</p>
-        <div className={u.grid}>
-          {text('artist')}
-          {text('albumartist')}
-          {text('album')}
-          {text('title')}
-          {text('genre')}
-          {num('year')}
-          {num('track')}
-          {num('disc')}
-        </div>
-        <label className={s.sessions}>
-          <span>{t('uploads.target_source')}</span>
-          <select className={s.select} value={source} onChange={(e) => setSource(e.target.value)}>
-            <option value="">{t('uploads.target_default')}</option>
-            {accepting.map((x) => (
-              <option key={x.id} value={x.id}>
-                {x.name}
-              </option>
-            ))}
-          </select>
-        </label>
-        <p className={s.note}>{t('uploads.tags_note')}</p>
-        <FormError>{save.error ? (fieldError(save.error, 'metadata') ?? errorText(save.error)) : null}</FormError>
-      </div>
-    </Dialog>
-  );
-}
-
-function RejectDialog({
-  count,
-  busy,
-  onClose,
-  onReject,
-}: {
-  count: number;
-  busy: boolean;
-  onClose: () => void;
-  onReject: (reason: string) => void;
-}) {
-  const { t } = useTranslation(['admin', 'common']);
-  const [reason, setReason] = useState('');
-  return (
-    <Dialog
-      title={t('uploads.reject_title', { count })}
-      onClose={onClose}
-      footer={
-        <>
-          <Button variant="ghost" onClick={onClose}>
-            {t('common:form.cancel')}
-          </Button>
-          <Button variant="danger" busy={busy} onClick={() => onReject(reason)}>
-            {t('uploads.reject')}
-          </Button>
-        </>
-      }
-    >
-      <label className={s.sessions}>
-        <span>{t('uploads.reject_reason')}</span>
-        <textarea className={u.textarea} value={reason} maxLength={1000} onChange={(e) => setReason(e.target.value)} />
-      </label>
-    </Dialog>
-  );
-}
-
-const GB = 1024 ** 3;
-
-/** Настройки очереди: общий лимит, лимит на модератора, размер файла, хранилище по умолчанию. */
-export function UploadSettingsSection() {
-  const { t } = useTranslation(['admin', 'common']);
-  const session = useSession();
-  const queryClient = useQueryClient();
-  const errorText = useErrorText();
-  const settings = useQuery({
-    queryKey: ['upload-settings'],
-    queryFn: async () => unwrap(await session.client.GET('/api/v1/admin/settings/uploads')),
-  });
-  const sources = useQuery({
-    queryKey: ['sources'],
-    queryFn: async () => unwrap(await session.client.GET('/api/v1/admin/sources')).items,
-  });
-  const [form, setForm] = useState<{ queue: string; perUser: string; maxFile: string; source: string; upgrade: boolean } | null>(null);
-  useEffect(() => {
-    if (settings.data) setForm(toForm(settings.data));
-  }, [settings.data]);
-
-  const save = useMutation({
-    mutationFn: async () => {
-      const f = form!;
-      const gb = (v: string) => Math.round(Number.parseFloat(v.replace(',', '.')) * GB);
-      return unwrap(
-        await session.client.PATCH('/api/v1/admin/settings/uploads', {
-          body: {
-            queue_limit_bytes: gb(f.queue),
-            max_file_bytes: gb(f.maxFile),
-            per_user_limit_bytes: f.perUser.trim() ? gb(f.perUser) : null,
-            default_source_id: f.source || null,
-            allow_quality_upgrade: f.upgrade,
-          },
-        }),
-      );
-    },
-    onSuccess: async (data) => {
-      queryClient.setQueryData(['upload-settings'], data);
-      await queryClient.invalidateQueries({ queryKey: ['upload-quota'] });
-    },
-  });
-  if (!form) return null;
-  const valid = [form.queue, form.maxFile].every((v) => Number.parseFloat(v.replace(',', '.')) > 0) &&
-    (!form.perUser.trim() || Number.parseFloat(form.perUser.replace(',', '.')) > 0);
-  const dirty = settings.data ? JSON.stringify(toForm(settings.data)) !== JSON.stringify(form) : false;
-  return (
-    <section className={s.section}>
-      <h2>{t('uploads.settings_title')}</h2>
-      <div className={u.settingsGrid}>
-        <Field label={t('uploads.set_queue')} value={form.queue} onChange={(v) => setForm({ ...form, queue: v })} inputMode="decimal" />
-        <Field
-          label={t('uploads.set_per_user')}
-          value={form.perUser}
-          hint={t('uploads.set_per_user_hint')}
-          onChange={(v) => setForm({ ...form, perUser: v })}
-          inputMode="decimal"
-        />
-        <Field label={t('uploads.set_max_file')} value={form.maxFile} onChange={(v) => setForm({ ...form, maxFile: v })} inputMode="decimal" />
-        <label>
-          <span className={u.settingsLabel}>{t('uploads.set_source')}</span>
-          <select className={s.select} value={form.source} onChange={(e) => setForm({ ...form, source: e.target.value })}>
-            <option value="">{t('uploads.set_source_auto')}</option>
-            {sources.data
-              ?.filter((x) => x.accepts_uploads)
-              .map((x) => (
-                <option key={x.id} value={x.id}>
-                  {x.name}
-                </option>
-              ))}
-          </select>
-        </label>
-        <div>
-          <label className={u.settingsCheck}>
-            <input type="checkbox" checked={form.upgrade} onChange={(e) => setForm({ ...form, upgrade: e.target.checked })} />
-            <span>{t('uploads.set_upgrade')}</span>
-          </label>
-        </div>
-      </div>
-      <p className={s.note}>{t('uploads.set_note')}</p>
-      <div className={s.toolbar}>
-        <span style={{ flex: 1 }} />
-        <Button variant="primary" busy={save.isPending} disabled={!dirty || !valid} onClick={() => save.mutate()}>
-          {t('uploads.save')}
-        </Button>
-      </div>
-      {save.isSuccess && !dirty && <span className={s.ok}>{t('uploads.saved')}</span>}
-      <FormError>{save.error ? errorText(save.error) : null}</FormError>
-    </section>
-  );
-}
-
-function toForm(st: Settings) {
-  const gb = (n: number) => String(Math.round((n / GB) * 100) / 100);
-  return {
-    queue: gb(st.queue_limit_bytes),
-    perUser: st.per_user_limit_bytes === null ? '' : gb(st.per_user_limit_bytes),
-    maxFile: gb(st.max_file_bytes),
-    source: st.default_source_id ?? '',
-    upgrade: st.allow_quality_upgrade,
-  };
-}
+export function UploadQueuePage() { return <UploadQueue />; }

apps/web/src/pages/admin/UsersPage.tsx

@@ -9,7 +9,7 @@ import { useErrorText, useFieldError } from '../../shared/lib/errors';
 import { formatRelative } from '../../shared/lib/format';
 import { assignableRoles, canManageUser, type Role } from '../../shared/lib/policy';
 import { addIcon, checkIcon, copyIcon, lockResetIcon, moreIcon, refreshIcon, searchIcon } from '../../shared/ui/icons';
-import { Avatar, Button, cx, Dialog, Field, FormError, Icon, Menu, type MenuItem } from '../../shared/ui/ui';
+import { Avatar, Button, cx, Dialog, EmptyState, Field, FormError, Icon, Menu, PageSkeleton, type MenuItem } from '../../shared/ui/ui';
 import s from '../page.module.css';
 
 type AdminUser = components['schemas']['AdminUser'];
@@ -232,8 +232,8 @@ export function UsersPage() {
             })}
           </tbody>
         </table>
-        {list.isSuccess && users.length === 0 && <div className={s.empty}>{t('users.empty')}</div>}
-        {list.isPending && <div className={s.empty}>{t('common:loading')}</div>}
+        {list.isSuccess && users.length === 0 && <EmptyState icon={searchIcon}>{t('users.empty')}</EmptyState>}
+        {list.isPending && <PageSkeleton />}
       </div>
       {list.hasNextPage && (
         <Button className={s.more} busy={list.isFetchingNextPage} onClick={() => void list.fetchNextPage()}>

apps/web/src/pages/auth.module.css

@@ -20,6 +20,15 @@
   filter: blur(30px);
 }
 
+.waveDecor {
+  position: absolute;
+  left: 50%;
+  top: 46%;
+  transform: translate(-50%, -50%);
+  opacity: 0.55;
+  filter: blur(0);
+}
+
 .blob1 {
   width: 62vmax;
   height: 62vmax;
@@ -244,6 +253,12 @@
   gap: 8px;
 }
 
+.otherBlock {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+
 .otherTitle {
   margin: 8px 0 0;
   color: var(--text3);
@@ -272,6 +287,20 @@
   font-weight: 500;
 }
 
+.older {
+  font-size: 13px;
+  color: var(--text3);
+}
+
+.older summary {
+  cursor: pointer;
+  font-weight: 600;
+}
+
+.older .downloadAlt {
+  margin-top: 8px;
+}
+
 .link {
   align-self: center;
 }

apps/web/src/pages/catalog.module.css

@@ -60,12 +60,23 @@
 
 .heroBg {
   position: absolute;
-  inset: 0;
-  opacity: 0.35;
+  inset: -20%;
+  opacity: 0.4;
   filter: blur(60px);
   pointer-events: none;
 }
 
+.heroBg img {
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+}
+
+.heroCover {
+  position: relative;
+  z-index: 1;
+}
+
 .tint {
   position: absolute;
   inset: 0;
@@ -81,12 +92,40 @@
 
 .heroBody {
   position: relative;
+  z-index: 1;
   display: flex;
   flex-direction: column;
   gap: 8px;
   min-width: 0;
 }
 
+.listen {
+  display: grid;
+  gap: 28px;
+}
+
+.listenLyrics {
+  min-width: 0;
+}
+
+@media (min-width: 900px) {
+  .listen {
+    grid-template-columns: minmax(240px, 300px) minmax(0, 1fr);
+    align-items: start;
+  }
+
+  .listen .hero {
+    flex-direction: column;
+    align-items: stretch;
+    margin: 0;
+    padding: 0;
+  }
+
+  .listen .heroTitle {
+    font-size: clamp(28px, 3vw, 40px);
+  }
+}
+
 .kind {
   font-size: 12px;
   font-weight: 700;

apps/web/src/pages/home.module.css

@@ -98,6 +98,10 @@
   background: var(--surface3);
 }
 
+.chip:active {
+  transform: scale(0.97);
+}
+
 .chipOn,
 .chipOn:hover {
   background: var(--accent-fill);

apps/web/src/pages/playlists.module.css

@@ -1,9 +1,16 @@
 .grid { display: grid; grid-template-columns: repeat(auto-fill, minmax(160px, 1fr)); gap: 24px; margin-top: 24px; }
-.card { display: flex; flex-direction: column; gap: 8px; color: inherit; text-decoration: none; min-width: 0; border-radius: 16px; padding: 12px; background: var(--surface, #ffffff08); }
-.card > :first-child { aspect-ratio: 1; border-radius: 12px; }
+.card { display: flex; flex-direction: column; gap: 8px; color: inherit; text-decoration: none; min-width: 0; border-radius: 16px; padding: 12px; background: var(--surface); animation: pipuIn 0.2s ease-out both; }
+.coverWrap { position: relative; aspect-ratio: 1; border-radius: 12px; overflow: hidden; }
+.coverWrap > :first-child { width: 100%; height: 100%; }
 .card strong { overflow-wrap: anywhere; }
 .card span { font-size: 13px; }
-.card:hover { background: #ffffff10; }
+.card:hover { background: var(--hover); }
+.play {
+  position: absolute; right: 10px; bottom: 10px; z-index: 1; display: grid; place-items: center;
+  width: 44px; height: 44px; border-radius: 50%; background: #fff; color: #05070d;
+  opacity: 0; transform: translateY(6px); transition: opacity 0.18s, transform 0.18s;
+}
+.card:hover .play, .card:focus-within .play, .play:focus-visible { opacity: 1; transform: none; }
 .description { white-space: pre-wrap; overflow-wrap: anywhere; }
 .card .description { overflow: hidden; display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; }
 .actions { display: flex; align-items: center; }
@@ -11,4 +18,4 @@
 .actions button:disabled { opacity: .3; cursor: default; }
 .hero { overflow-wrap: anywhere; }
 @media (max-width: 600px) { .hero { flex-direction: column; align-items: flex-start; gap: 16px; } .hero > div { width: 100%; } }
-@media (max-width: 600px) { .grid { grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 8px; } .card { padding: 8px; } }
+@media (max-width: 600px) { .grid { grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 8px; } .card { padding: 8px; } .play { opacity: 1; transform: none; } }

apps/web/src/pages/uploads/MyUploadsPage.tsx

@@ -8,7 +8,7 @@ import { useSession } from '../../app/session';
 import { useErrorText } from '../../shared/lib/errors';
 import { formatBytes, formatDateTime } from '../../shared/lib/format';
 import { addIcon } from '../../shared/ui/icons';
-import { Button, cx, FormError } from '../../shared/ui/ui';
+import { Button, cx, EmptyState, FormError } from '../../shared/ui/ui';
 import s from '../page.module.css';
 import { MOVING, QuotaMeter, UploadStatusBadge, useReasonText, type UploadFile, type UploadStatus } from './common';
 import u from './uploads.module.css';
@@ -86,7 +86,11 @@ export function MyUploadsPage() {
         </Link>
       </div>
       <FormError>{(list.error ?? withdraw.error) ? errorText(list.error ?? withdraw.error) : null}</FormError>
-      {list.isSuccess && items.length === 0 && <div className={s.empty}>{t('uploads.mine_empty')}</div>}
+      {list.isSuccess && items.length === 0 && (
+        <EmptyState icon={addIcon} action={<Link to="/uploads/new">{t('uploads.suggest_title')}</Link>}>
+          {t('uploads.mine_empty')}
+        </EmptyState>
+      )}
       {items.length > 0 && (
         <div className={s.tableWrap}>
           <table className={s.table}>

apps/web/src/pages/uploads/common.tsx

@@ -1,84 +1 @@
-import type { components } from '@pipu/api-client';
-import { unwrap } from '@pipu/core';
-import { useQuery } from '@tanstack/react-query';
-import { useId } from 'react';
-import { useTranslation } from 'react-i18next';
-
-import { useSession } from '../../app/session';
-import { formatBytes } from '../../shared/lib/format';
-import { cx } from '../../shared/ui/ui';
-import s from '../page.module.css';
-import u from './uploads.module.css';
-
-export type UploadStatus = components['schemas']['UploadStatus'];
-export type UploadFile = components['schemas']['UploadFile'];
-
-const TONE: Record<UploadStatus, 'ok' | 'warn' | 'bad' | 'info' | 'muted'> = {
-  uploading: 'info',
-  processing: 'info',
-  pending_review: 'warn',
-  approved: 'info',
-  importing: 'info',
-  imported: 'ok',
-  import_failed: 'bad',
-  duplicate: 'muted',
-  invalid: 'bad',
-  rejected: 'bad',
-  withdrawn: 'muted',
-  expired: 'muted',
-};
-
-/** Статусы, которые ещё меняются сами (обработка, импорт) — список опрашивается. */
-export const MOVING: UploadStatus[] = ['uploading', 'processing', 'approved', 'importing'];
-
-export function UploadStatusBadge({ status }: { status: UploadStatus }) {
-  const { t } = useTranslation('admin');
-  return <span className={cx(s.badge, u[`tone_${TONE[status]}`])}>{t(`uploads.status.${status}`)}</span>;
-}
-
-export function useUploadQuota() {
-  const session = useSession();
-  return useQuery({
-    queryKey: ['upload-quota'],
-    queryFn: async () => unwrap(await session.client.GET('/api/v1/uploads/quota')),
-  });
-}
-
-/** «Очередь: 6,2 ГБ из 10 ГБ» — видят модераторы и админ (docs/uploads.md#3). */
-export function QuotaMeter() {
-  const { t, i18n } = useTranslation('admin');
-  const quota = useUploadQuota();
-  const id = useId();
-  if (!quota.data) return null;
-  const q = quota.data;
-  const ratio = q.limit_bytes > 0 ? Math.min(q.used_bytes / q.limit_bytes, 1) : 1;
-  const fmt = (n: number) => formatBytes(n, i18n.language);
-  return (
-    <div className={u.quota}>
-      <span className={u.quotaText} id={id}>
-        {t('uploads.quota', { used: fmt(q.used_bytes), limit: fmt(q.limit_bytes) })}
-        {q.per_user_limit_bytes !== null &&
-          ` · ${t('uploads.quota_mine', { used: fmt(q.user_used_bytes), limit: fmt(q.per_user_limit_bytes) })}`}
-      </span>
-      <div className={u.progress} role="progressbar" aria-labelledby={id} aria-valuenow={Math.round(ratio * 100)} aria-valuemin={0} aria-valuemax={100}>
-        <span style={{ width: `${ratio * 100}%` }} />
-      </div>
-    </div>
-  );
-}
-
-/** Понятный текст причины: код из errors:<code> или текст отклонения админа. */
-export function useReasonText(): (reason: string | null) => string | null {
-  const { t, i18n } = useTranslation(['admin', 'errors']);
-  const tr = t as unknown as (k: string) => string;
-  return (reason) => {
-    if (!reason) return null;
-    const code = reason.split(':')[0]!.trim();
-    const key = `errors:${code}`;
-    if (i18n.exists(key)) {
-      const rest = reason.slice(code.length + 1).trim();
-      return rest ? `${tr(key)}: ${rest}` : tr(key);
-    }
-    return reason;
-  };
-}
+export * from '../../features/uploads/common';

apps/web/src/player/analysis.ts

@@ -0,0 +1,31 @@
+export class AudioAnalysis {
+  constructor(private readonly getAnalyser: () => AnalyserNode | null) {}
+  private spectrum = new Uint8Array(512);
+  private audioFrame = { bass: 0, mid: 0, treble: 0 };
+  private sampledAt = -Infinity;
+  /** Shared spectrum snapshot; animation consumers never trigger React renders. */
+  read = (active: boolean) => {
+    const now = performance.now();
+    if (now - this.sampledAt < 12) return this.audioFrame;
+    this.sampledAt = now;
+    const analyser = this.getAnalyser();
+    if (!active || !analyser) {
+      this.audioFrame.bass = this.audioFrame.mid = this.audioFrame.treble = 0;
+      return this.audioFrame;
+    }
+    analyser.getByteFrequencyData(this.spectrum);
+    const band = (low: number, high: number) => {
+      const hz = analyser.context.sampleRate / analyser.fftSize;
+      const start = Math.max(1, Math.ceil(low / hz));
+      const end = Math.min(this.spectrum.length, Math.ceil(high / hz));
+      let sum = 0;
+      for (let i = start; i < end; i++) sum += (this.spectrum[i]! / 255) ** 2;
+      return Math.sqrt(sum / Math.max(1, end - start));
+    };
+    this.audioFrame.bass = band(40, 220);
+    this.audioFrame.mid = band(220, 2500);
+    this.audioFrame.treble = band(2500, 10000);
+    return this.audioFrame;
+  };
+
+}

apps/web/src/player/audio.test.ts

@@ -1,48 +1,57 @@
-import type { AuthSession } from '@pipu/core';
 import { afterEach, describe, expect, it, vi } from 'vitest';
 
-import { Player } from './player';
+import { AudioAnalysis } from './analysis';
+import { AudioEngine } from './engine';
 
 afterEach(() => vi.restoreAllMocks());
 
 function fixture() {
-  const player = new Player({} as AuthSession, document.createElement('audio'));
   const sample = vi.fn((data: Uint8Array) => {
     data.fill(0);
     // 48 kHz / 1024: bins 1..4 cover the bass band.
     data.fill(255, 1, 5);
   });
-  Object.assign(player, {
-    state: { ...player.getState(), playing: true },
-    analyser: { context: { sampleRate: 48000 }, fftSize: 1024, getByteFrequencyData: sample },
-  });
-  return { player, sample };
+  const analyser = { context: { sampleRate: 48000 }, fftSize: 1024, getByteFrequencyData: sample } as unknown as AnalyserNode;
+  const analysis = new AudioAnalysis(() => analyser);
+  return { analysis, sample };
 }
 
 describe('audio reactivity', () => {
   it('separates bass from the other frequency bands and shares the frame', () => {
     vi.spyOn(performance, 'now').mockReturnValue(100);
-    const { player, sample } = fixture();
-    expect(player.readAudio()).toEqual({ bass: 1, mid: 0, treble: 0 });
-    player.readAudio();
+    const { analysis, sample } = fixture();
+    expect(analysis.read(true)).toEqual({ bass: 1, mid: 0, treble: 0 });
+    analysis.read(true);
     expect(sample).toHaveBeenCalledTimes(1);
   });
 
   it('returns silence after pausing or muting', () => {
     const clock = vi.spyOn(performance, 'now').mockReturnValue(100);
-    const { player, sample } = fixture();
-    player.readAudio();
-    Object.assign(player, { state: { ...player.getState(), playing: false } });
+    const { analysis, sample } = fixture();
+    analysis.read(true);
     clock.mockReturnValue(120);
-    expect(player.readAudio()).toEqual({ bass: 0, mid: 0, treble: 0 });
-    Object.assign(player, { state: { ...player.getState(), playing: true, muted: true } });
+    expect(analysis.read(false)).toEqual({ bass: 0, mid: 0, treble: 0 });
     clock.mockReturnValue(140);
-    expect(player.readAudio()).toEqual({ bass: 0, mid: 0, treble: 0 });
+    expect(analysis.read(false)).toEqual({ bass: 0, mid: 0, treble: 0 });
     expect(sample).toHaveBeenCalledTimes(1);
   });
 
   it('works when Web Audio is unavailable', () => {
-    const player = new Player({} as AuthSession, document.createElement('audio'));
-    expect(player.readAudio()).toEqual({ bass: 0, mid: 0, treble: 0 });
+    const analysis = new AudioAnalysis(() => null);
+    expect(analysis.read(false)).toEqual({ bass: 0, mid: 0, treble: 0 });
+  });
+});
+
+describe('audio engine lifetime', () => {
+  it('removes audio listeners on disposal', () => {
+    const audio = document.createElement('audio');
+    const engine = new AudioEngine(audio);
+    const playing = vi.fn();
+    engine.on('playing', playing);
+    audio.dispatchEvent(new Event('playing'));
+    expect(playing).toHaveBeenCalledTimes(1);
+    engine.dispose();
+    audio.dispatchEvent(new Event('playing'));
+    expect(playing).toHaveBeenCalledTimes(1);
   });
 });

apps/web/src/player/engine.ts

@@ -0,0 +1,66 @@
+import { AudioAnalysis } from './analysis';
+
+/** Browser audio graph and element lifetime; playback policy belongs to Player/core. */
+export class AudioEngine {
+  readonly audio: HTMLAudioElement;
+  readonly overlap: HTMLAudioElement;
+  private gain: GainNode | null = null;
+  private wired = false;
+  private analyser: AnalyserNode | null = null;
+  private audioContext: AudioContext | null = null;
+  readonly analysis = new AudioAnalysis(() => this.analyser);
+  private readonly unbind: (() => void)[] = [];
+  constructor(audio?: HTMLAudioElement) {
+    this.audio = audio ?? new Audio();
+    this.overlap = new Audio();
+    this.audio.preload = this.overlap.preload = 'auto';
+  }
+  resume() {
+    return this.audioContext?.state === 'suspended' ? this.audioContext.resume() : undefined;
+  }
+  on<K extends keyof HTMLMediaElementEventMap>(event: K, handler: (event: HTMLMediaElementEventMap[K]) => void) {
+    this.audio.addEventListener(event, handler);
+    this.unbind.push(() => this.audio.removeEventListener(event, handler));
+  }
+
+
+  applyLoudness(level: number) {
+    if (!this.wired && typeof AudioContext !== 'undefined') {
+      try {
+        const ctx = new AudioContext();
+        this.audioContext = ctx;
+        const src = ctx.createMediaElementSource(this.audio);
+        this.gain = ctx.createGain();
+        src.connect(this.gain);
+        this.gain.connect(ctx.destination);
+        this.analyser = ctx.createAnalyser();
+        this.analyser.fftSize = 1024;
+        this.analyser.smoothingTimeConstant = 0.55;
+        this.gain.connect(this.analyser);
+        // The overlap is already audible through its own output; analyse it only.
+        try {
+          const overlapSource = ctx.createMediaElementSource(this.overlap);
+          overlapSource.connect(ctx.destination);
+          overlapSource.connect(this.analyser);
+        } catch { /* Crossfade analysis is optional. */ }
+
+        this.audio.volume = 1;
+        this.wired = true;
+      } catch {
+        this.wired = true;
+      }
+    }
+    if (this.gain) this.gain.gain.value = level;
+    else this.audio.volume = Math.min(1, level);
+  }
+
+  dispose() {
+    for (const stop of this.unbind.splice(0)) stop();
+    for (const audio of [this.audio, this.overlap]) {
+      audio.pause();
+      audio.removeAttribute('src');
+      audio.load();
+    }
+    void this.audioContext?.close().catch(() => undefined);
+  }
+}

apps/web/src/player/media.ts

@@ -0,0 +1,105 @@
+import type { Track } from '@pipu/core';
+import { desktopHandle } from '../desktop';
+import type { PlayerState } from './types';
+
+export interface PlaybackControls {
+  play(): void; pause(): void; toggle(): void; next(): void; prev(): void; seek(ms: number): void;
+}
+
+export class MediaControls {
+  private lastDesktop: { id?: string; playing?: boolean } = {};
+  private desktopUnlisten: (() => void) | null = null;
+  private disposed = false;
+  constructor(
+    private readonly controls: PlaybackControls,
+    private readonly getState: () => PlayerState,
+    private readonly getAudio: () => HTMLAudioElement,
+  ) {
+    this.bindMediaSession();
+    this.bindDesktopMedia();
+  }
+
+  private bindDesktopMedia() {
+    void desktopHandle()?.listenMedia((action) => {
+      if (action === 'play') this.controls.play();
+      else if (action === 'pause' || action === 'stop') this.controls.pause();
+      else if (action === 'toggle') this.controls.toggle();
+      else if (action === 'next') this.controls.next();
+      else if (action === 'previous') this.controls.prev();
+    }).then((stop) => {
+      if (this.disposed) stop();
+      else this.desktopUnlisten = stop;
+    });
+  }
+
+  syncDesktopMedia() {
+    const desktop = desktopHandle();
+    const track = this.getState().track;
+    if (!desktop || !track) return;
+    if (this.lastDesktop.id === track.id && this.lastDesktop.playing === this.getState().playing) return;
+    this.lastDesktop = { id: track.id, playing: this.getState().playing };
+    desktop.setMedia({
+      title: track.title,
+      artist: track.artists.map((a) => a.name).join(', '),
+      album: track.album.title,
+      coverUrl: track.album.cover_url,
+      playing: this.getState().playing,
+    });
+  }
+
+  private bindMediaSession() {
+    const ms = typeof navigator !== 'undefined' ? navigator.mediaSession : undefined;
+    if (!ms) return;
+    const set = (action: MediaSessionAction, fn: MediaSessionActionHandler) => {
+      try {
+        ms.setActionHandler(action, fn);
+      } catch {
+        // действие не поддерживается браузером
+      }
+    };
+    set('play', () => this.controls.play());
+    set('pause', () => this.controls.pause());
+    set('nexttrack', () => this.controls.next());
+    set('previoustrack', () => this.controls.prev());
+    set('seekbackward', (d) => this.controls.seek(this.getState().positionMs - (d.seekOffset ?? 10) * 1000));
+    set('seekforward', (d) => this.controls.seek(this.getState().positionMs + (d.seekOffset ?? 10) * 1000));
+    set('seekto', (d) => d.seekTime !== undefined && this.controls.seek(d.seekTime * 1000));
+  }
+
+  updateMediaMetadata(track: Track) {
+    if (typeof navigator === 'undefined' || !navigator.mediaSession || typeof MediaMetadata === 'undefined') return;
+    const cover = track.album.cover_url;
+    navigator.mediaSession.metadata = new MediaMetadata({
+      title: track.title,
+      artist: track.artists.map((a) => a.name).join(', '),
+      album: track.album.title,
+      artwork: cover
+        ? [
+            { src: `${cover}&size=300`, sizes: '300x300', type: 'image/webp' },
+            { src: `${cover}&size=1200`, sizes: '1200x1200', type: 'image/webp' },
+          ]
+        : [],
+    });
+  }
+
+  updatePositionState() {
+    const ms = typeof navigator !== 'undefined' ? navigator.mediaSession : undefined;
+    const d = this.getAudio().duration;
+    if (!ms?.setPositionState || !Number.isFinite(d) || d <= 0) return;
+    try {
+      ms.setPositionState({ duration: d, position: Math.min(this.getAudio().currentTime, d), playbackRate: 1 });
+    } catch {
+      // некорректная позиция во время смены трека
+    }
+  }
+
+  dispose() {
+    this.disposed = true;
+    this.desktopUnlisten?.();
+    this.desktopUnlisten = null;
+    const ms = typeof navigator !== 'undefined' ? navigator.mediaSession : undefined;
+    for (const action of ['play', 'pause', 'nexttrack', 'previoustrack', 'seekbackward', 'seekforward', 'seekto'] as const) {
+      try { ms?.setActionHandler(action, null); } catch { /* Unsupported action. */ }
+    }
+  }
+}

apps/web/src/player/persistence.ts

@@ -0,0 +1,127 @@
+import { unwrap, type AuthSession, type PlayContext, type RepeatMode } from '@pipu/core';
+import type { PlayerState } from './types';
+
+const LOCAL_KEY = 'pipu.player';
+/** Сохраняем не больше этого числа треков очереди (лимит сервера — 500). */
+const MAX_SAVED_QUEUE = 500;
+
+export interface Saved {
+  queue: string[];
+  index: number;
+  positionMs: number;
+  context: PlayContext | null;
+  volume: number;
+  shuffle: boolean;
+  repeat: RepeatMode;
+  savedAt: string;
+}
+
+function deviceId(): string {
+  try {
+    let id = localStorage.getItem('pipu.device');
+    if (!id) {
+      id = crypto.randomUUID();
+      localStorage.setItem('pipu.device', id);
+    }
+    return id;
+  } catch {
+    return 'web';
+  }
+}
+
+export class PlaybackPersistence {
+  private readonly device = deviceId();
+  lastServerSave = 0;
+  constructor(private readonly session: AuthSession, private readonly getState: () => PlayerState) {}
+  snapshot(state: PlayerState): Saved {
+    const ids = state.queue.map((t) => t.id);
+    const start = Math.max(0, Math.min(state.index - Math.floor(MAX_SAVED_QUEUE / 2), ids.length - MAX_SAVED_QUEUE));
+    return {
+      queue: ids.slice(start, start + MAX_SAVED_QUEUE),
+      index: state.index - start,
+      positionMs: state.positionMs,
+      context: state.context,
+      volume: state.volume,
+      shuffle: state.shuffle,
+      repeat: state.repeat,
+      savedAt: new Date().toISOString(),
+    };
+  }
+  saveLocal() {
+    if (!this.getState().track) return;
+    try {
+      localStorage.setItem(LOCAL_KEY, JSON.stringify(this.snapshot(this.getState())));
+    } catch {
+      // недоступное хранилище не мешает воспроизведению
+    }
+  }
+
+  private saveTimer: ReturnType<typeof setTimeout> | null = null;
+
+  saveSoon() {
+    if (this.saveTimer) clearTimeout(this.saveTimer);
+    this.saveTimer = setTimeout(() => this.saveServer(), 1000);
+  }
+
+  /** PUT /me/playback-state; keepalive — запрос переживёт закрытие вкладки. */
+  saveServer(keepalive = false) {
+    const cur = this.getState().track;
+    if (!cur) return;
+    this.lastServerSave = Date.now();
+    this.saveLocal();
+    const s = this.snapshot(this.getState());
+    void this.session.client
+      .PUT('/api/v1/me/playback-state', {
+        body: {
+          track_id: cur.id,
+          position_ms: s.positionMs,
+          queue: s.queue,
+          queue_index: s.index,
+          context: s.context ? { type: s.context.type, id: s.context.id, label: s.context.label } : undefined,
+          shuffle: s.shuffle,
+          repeat_mode: s.repeat,
+          volume: s.volume,
+          device_id: this.device,
+        },
+        keepalive,
+      })
+      .catch(() => undefined);
+  }
+
+  async restore(): Promise<Saved | null> {
+    let local: Saved | null = null;
+    try {
+      const raw = localStorage.getItem(LOCAL_KEY);
+      local = raw ? (JSON.parse(raw) as Saved) : null;
+    } catch {
+      local = null;
+    }
+    let saved = local;
+    try {
+      const server = unwrap(await this.session.client.GET('/api/v1/me/playback-state'));
+      if (
+        server.track_id &&
+        server.updated_at &&
+        (!local || (server.device_id !== this.device && server.updated_at > local.savedAt))
+      ) {
+        saved = {
+          queue: server.queue,
+          index: server.queue_index,
+          positionMs: server.position_ms,
+          context: (server.context?.type ? server.context : null) as PlayContext | null,
+          volume: server.volume,
+          shuffle: server.shuffle,
+          repeat: server.repeat_mode,
+          savedAt: server.updated_at,
+        };
+      }
+    } catch {
+      // офлайн — остаёмся с локальной копией
+    }
+    return saved;
+  }
+  dispose() {
+    if (this.saveTimer) clearTimeout(this.saveTimer);
+    this.saveTimer = null;
+  }
+}

apps/web/src/player/player.ts

@@ -1,5 +1,9 @@
 import {
   EventBuffer,
+  WaveCoordinator,
+  EARLY_SKIP_MS,
+  type WaveOutcome,
+  type WaveFeedback,
   normalizeGain,
   PlayAttempt,
   PlayQueue,
@@ -10,80 +14,29 @@ import {
   type Track,
 } from '@pipu/core';
 
-import { desktopHandle } from '../desktop';
+import { MediaControls } from './media';
+import type { PlayerState } from './types';
+import { AudioEngine } from './engine';
+import { PlaybackPersistence } from './persistence';
 
 export type { PlayContext, Track };
 
-export interface WaveInfo {
-  sessionId: string;
-  activity: string | null;
-  mood: string | null;
-  /** Рекомендатель недоступен — играет запасная волна. */
-  fallback: boolean;
-}
+export type { WaveInfo } from '@pipu/core';
 
-type WaveOutcome = 'complete' | 'skip' | 'skip_early' | 'like' | 'dislike';
+export type { PlayerState } from './types';
 
-/** Когда в очереди волны остаётся столько треков, просим следующую пачку. */
-const WAVE_REFILL_AT = 2;
-/** Скип раньше этого — «ранний» (сильный отрицательный сигнал). */
-const EARLY_SKIP_MS = 30_000;
-
-export interface PlayerState {
-  wave: WaveInfo | null;
-  track: Track | null;
-  queue: Track[];
-  index: number;
-  context: PlayContext | null;
-  playing: boolean;
-  loading: boolean;
-  positionMs: number;
-  durationMs: number;
-  volume: number;
-  muted: boolean;
-  shuffle: boolean;
-  repeat: RepeatMode;
-  error: string | null;
-}
-
-const LOCAL_KEY = 'pipu.player';
 const SAVE_EVERY_MS = 10_000;
 const FLUSH_EVERY_MS = 30_000;
 const PRELOAD_BEFORE_MS = 20_000;
-/** Сохраняем не больше этого числа треков очереди (лимит сервера — 500). */
-const MAX_SAVED_QUEUE = 500;
-
-interface Saved {
-  queue: string[];
-  index: number;
-  positionMs: number;
-  context: PlayContext | null;
-  volume: number;
-  shuffle: boolean;
-  repeat: RepeatMode;
-  savedAt: string;
-}
-
-function deviceId(): string {
-  try {
-    let id = localStorage.getItem('pipu.device');
-    if (!id) {
-      id = crypto.randomUUID();
-      localStorage.setItem('pipu.device', id);
-    }
-    return id;
-  } catch {
-    return 'web';
-  }
-}
 
 /**
  * Плеер веба. Логика очереди и учёта событий — из @pipu/core; здесь — адаптер к HTMLAudioElement,
  * Media Session и сохранение «трек и момент» (локально и на сервере).
  */
 export class Player {
-  private readonly audio: HTMLAudioElement;
-  private readonly overlap: HTMLAudioElement;
+  private readonly engine: AudioEngine;
+  private get audio() { return this.engine.audio; }
+  private get overlap() { return this.engine.overlap; }
   private fading = false;
   private ignoreEnded = false;
   private readonly queue = new PlayQueue();
@@ -92,13 +45,17 @@ export class Player {
   private context: PlayContext | null = null;
   private state: PlayerState;
   private readonly listeners = new Set<() => void>();
-  private readonly device = deviceId();
-  private lastServerSave = 0;
+  private readonly persistence: PlaybackPersistence;
   private preloaded: string | null = null;
   private refreshedFor: string | null = null;
   private timers: ReturnType<typeof setInterval>[] = [];
-  private waveFeedback: { track_id: string; outcome: WaveOutcome }[] = [];
-  private waveLoading = false;
+  private readonly wavePolicy = new WaveCoordinator({
+    next: async (id: string, feedback: WaveFeedback[]) => unwrap(
+      await this.session.client.POST('/api/v1/wave/sessions/{id}/next', {
+        params: { path: { id } }, body: { feedback },
+      }),
+    ),
+  });
   private restoreVersion = 0;
   /** Реакция сохранена на сервере — списки на экране нужно перечитать. */
   onReaction: (() => void) | null = null;
@@ -107,10 +64,7 @@ export class Player {
     private readonly session: AuthSession,
     audio?: HTMLAudioElement,
   ) {
-    this.audio = audio ?? new Audio();
-    this.audio.preload = 'auto';
-    this.overlap = new Audio();
-    this.overlap.preload = 'auto';
+    this.engine = new AudioEngine(audio);
     this.events = new EventBuffer({
       send: async (events) => {
         unwrap(await this.session.client.POST('/api/v1/events', { body: { events } }));
@@ -121,9 +75,9 @@ export class Player {
       track: null, queue: [], index: 0, context: null, playing: false, loading: false, positionMs: 0,
       durationMs: 0, volume: 1, muted: false, shuffle: false, repeat: 'off', error: null,
     };
+    this.persistence = new PlaybackPersistence(session, this.getState);
     this.bindAudio();
-    this.bindMediaSession();
-    this.bindDesktopMedia();
+    this.media = new MediaControls(this, this.getState, () => this.audio);
   }
 
   /** Запуск фоновой отправки событий (парный вызов — dispose). */
@@ -140,13 +94,12 @@ export class Player {
 
   getState = () => this.state;
 
-  private lastDesktop: { id?: string; playing?: boolean } = {};
-  private desktopUnlisten: (() => void) | null = null;
+  private readonly media: MediaControls;
 
   private update(patch: Partial<PlayerState>) {
     this.state = { ...this.state, ...patch };
     for (const fn of this.listeners) fn();
-    this.syncDesktopMedia();
+    this.media.syncDesktopMedia();
   }
 
   private syncQueue() {
@@ -183,16 +136,19 @@ export class Player {
     this.restoreVersion++;
     this.finishAttempt('skip');
     this.leaveWave();
+    const version = this.wavePolicy.version;
     const res = unwrap(
       await this.session.client.POST('/api/v1/wave/sessions', {
         body: { activity, mood, ...(seed ? { seed: { type: seed.type, id: seed.id } } : {}) },
       }),
     );
+    if (!this.wavePolicy.isCurrent(version)) return;
     const tracks = res.tracks.filter((t) => t.available && t.stream_url);
     if (!tracks.length) {
       this.update({ error: 'wave.empty' });
       return;
     }
+    this.wavePolicy.activate(res.session_id);
     this.context = { type: 'wave', id: res.session_id, label: seed?.label };
     this.queue.shuffle = false;
     this.queue.repeat = 'off';
@@ -210,12 +166,14 @@ export class Player {
     const wave = this.state.wave;
     if (!wave) return this.startWave(activity, mood);
     this.update({ wave: { ...wave, activity, mood } });
+    const version = this.wavePolicy.changeContext(wave.sessionId);
     const res = unwrap(
       await this.session.client.PATCH('/api/v1/wave/sessions/{id}', {
         params: { path: { id: wave.sessionId } },
         body: { activity, mood },
       }),
     );
+    if (!this.wavePolicy.isCurrent(version)) return;
     const fresh = res.tracks.filter((t) => t.available && t.stream_url);
     this.queue.dropUpcoming();
     this.queue.append(fresh);
@@ -236,8 +194,8 @@ export class Player {
 
   private leaveWave() {
     const wave = this.state.wave;
+    this.wavePolicy.activate(null);
     if (!wave) return;
-    this.waveFeedback = [];
     this.update({ wave: null });
     void this.session.client
       .DELETE('/api/v1/wave/sessions/{id}', { params: { path: { id: wave.sessionId } } })
@@ -245,7 +203,7 @@ export class Player {
   }
 
   private noteWave(trackId: string, outcome: WaveOutcome) {
-    if (this.state.wave) this.waveFeedback.push({ track_id: trackId, outcome });
+    this.wavePolicy.note(trackId, outcome);
   }
 
   /**
@@ -253,29 +211,12 @@ export class Player {
    * после лайка, дизлайка или раннего скипа очередь должна сразу отразить реакцию.
    */
   private async refillWave(refresh = false) {
-    const wave = this.state.wave;
-    if (!wave || this.waveLoading) return;
-    if (!refresh && this.queue.remaining > WAVE_REFILL_AT) return;
-    this.waveLoading = true;
-    const feedback = this.waveFeedback;
-    this.waveFeedback = [];
-    try {
-      const res = unwrap(
-        await this.session.client.POST('/api/v1/wave/sessions/{id}/next', {
-          params: { path: { id: wave.sessionId } },
-          body: { feedback },
-        }),
-      );
-      if (this.state.wave?.sessionId !== wave.sessionId) return; // волну уже выключили
+    await this.wavePolicy.refill(this.queue.remaining, refresh, (res) => {
       if (refresh) this.queue.dropUpcoming();
       this.queue.append(res.tracks.filter((t) => t.available && t.stream_url));
-      this.update({ wave: { ...this.state.wave, fallback: res.fallback } });
+      this.update({ wave: { ...this.state.wave!, fallback: res.fallback } });
       this.syncQueue();
-    } catch {
-      this.waveFeedback = [...feedback, ...this.waveFeedback]; // отправим со следующим запросом
-    } finally {
-      this.waveLoading = false;
-    }
+    });
   }
 
   toggle() {
@@ -289,7 +230,7 @@ export class Player {
       void this.load(true, this.state.positionMs);
       return;
     }
-    if (this.audioContext?.state === 'suspended') void this.audioContext.resume().catch(() => undefined);
+    void this.engine.resume()?.catch(() => undefined);
     // play() в старых браузерах и jsdom может вернуть undefined вместо промиса.
     void Promise.resolve(this.audio.play()).catch(() => this.update({ playing: false }));
   }
@@ -402,7 +343,7 @@ export class Player {
     // Keep the restored element's buffer when the user presses Play.
     if (this.audio.getAttribute('src') !== track.stream_url) this.audio.src = track.stream_url;
     if (this.audio.currentTime !== startMs / 1000) this.audio.currentTime = startMs / 1000;
-    this.updateMediaMetadata(track);
+    this.media.updateMediaMetadata(track);
     if (!autoplay) return;
     this.applyLoudness();
     this.attempt = new PlayAttempt(track, startMs);
@@ -418,7 +359,8 @@ export class Player {
     void this.refillWave();
     if (autoplay) {
       try {
-        if (this.audioContext?.state === 'suspended') await this.audioContext.resume();
+        const resumed = this.engine.resume();
+        if (resumed) await resumed;
         await this.audio.play();
       } catch {
         // Автозапуск заблокирован браузером — ждём нажатия «Слушать».
@@ -465,73 +407,11 @@ export class Player {
     return Math.min(6, Math.max(0, this.prefs()?.crossfade_s ?? 0));
   }
 
-  /** Громкость пользователя × выравнивание к −14 LUFS. GainNode, если браузер его даёт. */
-  private gain: GainNode | null = null;
-  private wired = false;
-  private analyser: AnalyserNode | null = null;
-  private audioContext: AudioContext | null = null;
-  private spectrum = new Uint8Array(512);
-  private audioFrame = { bass: 0, mid: 0, treble: 0 };
-  private sampledAt = -Infinity;
-
-  /** Shared spectrum snapshot; animation consumers never trigger React renders. */
-  readAudio = () => {
-    const now = performance.now();
-    if (now - this.sampledAt < 12) return this.audioFrame;
-    this.sampledAt = now;
-    const active = this.state.playing && !this.state.loading && !this.state.muted;
-    const analyser = this.analyser;
-    if (!active || !analyser) {
-      this.audioFrame.bass = this.audioFrame.mid = this.audioFrame.treble = 0;
-      return this.audioFrame;
-    }
-    analyser.getByteFrequencyData(this.spectrum);
-    const band = (low: number, high: number) => {
-      const hz = analyser.context.sampleRate / analyser.fftSize;
-      const start = Math.max(1, Math.ceil(low / hz));
-      const end = Math.min(this.spectrum.length, Math.ceil(high / hz));
-      let sum = 0;
-      for (let i = start; i < end; i++) sum += (this.spectrum[i]! / 255) ** 2;
-      return Math.sqrt(sum / Math.max(1, end - start));
-    };
-    this.audioFrame.bass = band(40, 220);
-    this.audioFrame.mid = band(220, 2500);
-    this.audioFrame.treble = band(2500, 10000);
-    return this.audioFrame;
-  };
-
+  readAudio = () => this.engine.analysis.read(this.state.playing && !this.state.loading && !this.state.muted);
 
   private applyLoudness(mix = 1) {
-    const track = this.state.track;
     const user = this.state.muted ? 0 : this.state.volume;
-    const level = user * normalizeGain(track?.features?.loudness_lufs, this.normalizeOn()) * mix;
-    if (!this.wired && typeof AudioContext !== 'undefined') {
-      try {
-        const ctx = new AudioContext();
-        this.audioContext = ctx;
-        const src = ctx.createMediaElementSource(this.audio);
-        this.gain = ctx.createGain();
-        src.connect(this.gain);
-        this.gain.connect(ctx.destination);
-        this.analyser = ctx.createAnalyser();
-        this.analyser.fftSize = 1024;
-        this.analyser.smoothingTimeConstant = 0.55;
-        this.gain.connect(this.analyser);
-        // The overlap is already audible through its own output; analyse it only.
-        try {
-          const overlapSource = ctx.createMediaElementSource(this.overlap);
-          overlapSource.connect(ctx.destination);
-          overlapSource.connect(this.analyser);
-        } catch { /* Crossfade analysis is optional. */ }
-
-        this.audio.volume = 1;
-        this.wired = true;
-      } catch {
-        this.wired = true;
-      }
-    }
-    if (this.gain) this.gain.gain.value = level;
-    else this.audio.volume = Math.min(1, level);
+    this.engine.applyLoudness(user * normalizeGain(this.state.track?.features?.loudness_lufs, this.normalizeOn()) * mix);
   }
 
   /** В конце трека накладывает следующий на crossfade_s секунд. */
@@ -590,7 +470,7 @@ export class Player {
     this.applyLoudness();
     this.attempt = new PlayAttempt(next, Math.round(at * 1000));
     this.update({ track: next, loading: false, playing: true, positionMs: Math.round(at * 1000), durationMs: next.duration_ms });
-    this.updateMediaMetadata(next);
+    this.media.updateMediaMetadata(next);
     void this.audio.play().finally(() => {
       this.fading = false;
       this.ignoreEnded = false;
@@ -599,13 +479,13 @@ export class Player {
 
   private bindAudio() {
     const a = this.audio;
-    a.addEventListener('playing', () => {
+    this.engine.on('playing', () => {
       this.update({ playing: true, loading: false });
       if (this.attempt && this.state.positionMs > 0 && a.currentTime > 0.5) {
         this.events.push({ type: 'resume', track_id: this.attempt.track.id, position_ms: this.state.positionMs });
       }
     });
-    a.addEventListener('pause', () => {
+    this.engine.on('pause', () => {
       if (a.ended) return;
       this.update({ playing: false });
       const t = this.queue.current;
@@ -614,22 +494,22 @@ export class Player {
         this.saveServer();
       }
     });
-    a.addEventListener('waiting', () => {
+    this.engine.on('waiting', () => {
       if (this.attempt) this.update({ loading: true });
     });
-    a.addEventListener('timeupdate', () => {
+    this.engine.on('timeupdate', () => {
       const ms = Math.round(a.currentTime * 1000);
       this.attempt?.tick(ms);
       this.update({ positionMs: ms });
-      this.updatePositionState();
+      this.media.updatePositionState();
       if (this.state.playing) {
         this.maybePreload(ms);
         this.maybeCrossfade(ms);
       }
-      if (this.state.playing && Date.now() - this.lastServerSave > SAVE_EVERY_MS) this.saveServer();
+      if (this.state.playing && Date.now() - this.persistence.lastServerSave > SAVE_EVERY_MS) this.saveServer();
       this.saveLocal();
     });
-    a.addEventListener('ended', () => {
+    this.engine.on('ended', () => {
       if (this.ignoreEnded || this.fading || !this.attempt) return;
       this.finishAttempt('play_end');
       if (this.queue.next(true)) {
@@ -640,7 +520,7 @@ export class Player {
         this.saveServer();
       }
     });
-    a.addEventListener('error', () => void this.onError());
+    this.engine.on('error', () => void this.onError());
   }
 
   /** Ссылка могла истечь (12 ч) — один раз берём свежую; иначе пропускаем трек. */
@@ -683,138 +563,11 @@ export class Player {
     void fetch(next.stream_url, { headers: { Range: 'bytes=0-0' } }).catch(() => undefined);
   }
 
-  // --- Media Session ---
-
-  private bindDesktopMedia() {
-    void desktopHandle()?.listenMedia((action) => {
-      if (action === 'play') this.play();
-      else if (action === 'pause' || action === 'stop') this.pause();
-      else if (action === 'toggle') this.toggle();
-      else if (action === 'next') this.next();
-      else if (action === 'previous') this.prev();
-    }).then((stop) => {
-      this.desktopUnlisten = stop;
-    });
-  }
-
-  private syncDesktopMedia() {
-    const desktop = desktopHandle();
-    const track = this.state.track;
-    if (!desktop || !track) return;
-    if (this.lastDesktop.id === track.id && this.lastDesktop.playing === this.state.playing) return;
-    this.lastDesktop = { id: track.id, playing: this.state.playing };
-    desktop.setMedia({
-      title: track.title,
-      artist: track.artists.map((a) => a.name).join(', '),
-      album: track.album.title,
-      coverUrl: track.album.cover_url,
-      playing: this.state.playing,
-    });
-  }
-
-  private bindMediaSession() {
-    const ms = typeof navigator !== 'undefined' ? navigator.mediaSession : undefined;
-    if (!ms) return;
-    const set = (action: MediaSessionAction, fn: MediaSessionActionHandler) => {
-      try {
-        ms.setActionHandler(action, fn);
-      } catch {
-        // действие не поддерживается браузером
-      }
-    };
-    set('play', () => this.play());
-    set('pause', () => this.pause());
-    set('nexttrack', () => this.next());
-    set('previoustrack', () => this.prev());
-    set('seekbackward', (d) => this.seek(this.state.positionMs - (d.seekOffset ?? 10) * 1000));
-    set('seekforward', (d) => this.seek(this.state.positionMs + (d.seekOffset ?? 10) * 1000));
-    set('seekto', (d) => d.seekTime !== undefined && this.seek(d.seekTime * 1000));
-  }
-
-  private updateMediaMetadata(track: Track) {
-    if (typeof navigator === 'undefined' || !navigator.mediaSession || typeof MediaMetadata === 'undefined') return;
-    const cover = track.album.cover_url;
-    navigator.mediaSession.metadata = new MediaMetadata({
-      title: track.title,
-      artist: track.artists.map((a) => a.name).join(', '),
-      album: track.album.title,
-      artwork: cover
-        ? [
-            { src: `${cover}&size=300`, sizes: '300x300', type: 'image/webp' },
-            { src: `${cover}&size=1200`, sizes: '1200x1200', type: 'image/webp' },
-          ]
-        : [],
-    });
-  }
-
-  private updatePositionState() {
-    const ms = typeof navigator !== 'undefined' ? navigator.mediaSession : undefined;
-    const d = this.audio.duration;
-    if (!ms?.setPositionState || !Number.isFinite(d) || d <= 0) return;
-    try {
-      ms.setPositionState({ duration: d, position: Math.min(this.audio.currentTime, d), playbackRate: 1 });
-    } catch {
-      // некорректная позиция во время смены трека
-    }
-  }
-
   // --- сохранение состояния ---
 
-  private snapshot(): Saved {
-    const ids = this.queue.tracks.map((t) => t.id);
-    const start = Math.max(0, Math.min(this.queue.index - Math.floor(MAX_SAVED_QUEUE / 2), ids.length - MAX_SAVED_QUEUE));
-    return {
-      queue: ids.slice(start, start + MAX_SAVED_QUEUE),
-      index: this.queue.index - start,
-      positionMs: this.state.positionMs,
-      context: this.context,
-      volume: this.state.volume,
-      shuffle: this.queue.shuffle,
-      repeat: this.queue.repeat,
-      savedAt: new Date().toISOString(),
-    };
-  }
-
-  private saveLocal() {
-    if (!this.queue.current) return;
-    try {
-      localStorage.setItem(LOCAL_KEY, JSON.stringify(this.snapshot()));
-    } catch {
-      // недоступное хранилище не мешает воспроизведению
-    }
-  }
-
-  private saveTimer: ReturnType<typeof setTimeout> | null = null;
-
-  private saveSoon() {
-    if (this.saveTimer) clearTimeout(this.saveTimer);
-    this.saveTimer = setTimeout(() => this.saveServer(), 1000);
-  }
-
-  /** PUT /me/playback-state; keepalive — запрос переживёт закрытие вкладки. */
-  saveServer(keepalive = false) {
-    const cur = this.queue.current;
-    if (!cur) return;
-    this.lastServerSave = Date.now();
-    this.saveLocal();
-    const s = this.snapshot();
-    void this.session.client
-      .PUT('/api/v1/me/playback-state', {
-        body: {
-          track_id: cur.id,
-          position_ms: s.positionMs,
-          queue: s.queue,
-          queue_index: s.index,
-          context: s.context ? { type: s.context.type, id: s.context.id, label: s.context.label } : undefined,
-          shuffle: s.shuffle,
-          repeat_mode: s.repeat,
-          volume: s.volume,
-          device_id: this.device,
-        },
-        keepalive,
-      })
-      .catch(() => undefined);
-  }
+  private saveLocal() { this.persistence.saveLocal(); }
+  private saveSoon() { this.persistence.saveSoon(); }
+  saveServer(keepalive = false) { this.persistence.saveServer(keepalive); }
 
   /** Уход со страницы: дослать события и состояние. */
   onHide() {
@@ -828,35 +581,7 @@ export class Player {
    */
   async restore() {
     const version = ++this.restoreVersion;
-    let local: Saved | null = null;
-    try {
-      const raw = localStorage.getItem(LOCAL_KEY);
-      local = raw ? (JSON.parse(raw) as Saved) : null;
-    } catch {
-      local = null;
-    }
-    let saved = local;
-    try {
-      const server = unwrap(await this.session.client.GET('/api/v1/me/playback-state'));
-      if (
-        server.track_id &&
-        server.updated_at &&
-        (!local || (server.device_id !== this.device && server.updated_at > local.savedAt))
-      ) {
-        saved = {
-          queue: server.queue,
-          index: server.queue_index,
-          positionMs: server.position_ms,
-          context: (server.context?.type ? server.context : null) as PlayContext | null,
-          volume: server.volume,
-          shuffle: server.shuffle,
-          repeat: server.repeat_mode,
-          savedAt: server.updated_at,
-        };
-      }
-    } catch {
-      // офлайн — остаёмся с локальной копией
-    }
+    const saved = await this.persistence.restore();
     if (version !== this.restoreVersion || !saved?.queue.length) return;
     const res = unwrap(await this.session.client.POST('/api/v1/tracks/batch', { body: { ids: saved.queue } }));
     if (version !== this.restoreVersion) return;
@@ -872,25 +597,21 @@ export class Player {
     const pos = tracks[idx]?.id === wanted ? saved.positionMs : 0;
     this.syncQueue();
     this.update({ positionMs: pos, durationMs: tracks[idx]!.duration_ms, volume: saved.volume });
-    this.updateMediaMetadata(tracks[idx]!);
+    this.media.updateMediaMetadata(tracks[idx]!);
     // Prepare at the saved position without creating a listening attempt.
     await this.load(false, pos);
   }
 
   dispose() {
     this.restoreVersion++;
+    this.wavePolicy.activate(null);
     this.fading = false;
     this.finishAttempt('skip');
-    this.audio.pause();
-    this.audio.removeAttribute('src');
-    this.audio.load();
-    this.overlap.pause();
-    this.overlap.removeAttribute('src');
-    this.overlap.load();
+    this.engine.dispose();
+    this.persistence.dispose();
     for (const t of this.timers) clearInterval(t);
     this.timers = [];
-    this.desktopUnlisten?.();
-    this.desktopUnlisten = null;
+    this.media.dispose();
     void this.events.flush();
   }
 }

apps/web/src/player/types.ts

@@ -0,0 +1,18 @@
+import type { WaveInfo, Track, PlayContext, RepeatMode } from '@pipu/core';
+
+export interface PlayerState {
+  wave: WaveInfo | null;
+  track: Track | null;
+  queue: Track[];
+  index: number;
+  context: PlayContext | null;
+  playing: boolean;
+  loading: boolean;
+  positionMs: number;
+  durationMs: number;
+  volume: number;
+  muted: boolean;
+  shuffle: boolean;
+  repeat: RepeatMode;
+  error: string | null;
+}

apps/web/src/shared/ui/ui.module.css

@@ -41,7 +41,12 @@
   transition:
     background 0.15s,
     box-shadow 0.15s,
-    opacity 0.15s;
+    opacity 0.15s,
+    transform 0.12s;
+}
+
+.button:active:not(:disabled) {
+  transform: scale(0.97);
 }
 
 .button:disabled {
@@ -53,6 +58,115 @@
   cursor: progress;
 }
 
+.spinner {
+  width: 16px;
+  height: 16px;
+  border: 2px solid currentColor;
+  border-right-color: transparent;
+  border-radius: 50%;
+  animation: pipuSpin 0.6s linear infinite;
+}
+
+@keyframes pipuSpin {
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+.empty {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 12px;
+  padding: 48px 16px;
+  text-align: center;
+  color: var(--text3);
+}
+
+.emptyIcon {
+  color: var(--text3);
+  opacity: 0.7;
+}
+
+.emptyText {
+  margin: 0;
+  max-width: 28rem;
+  font-size: 15px;
+  line-height: 1.45;
+}
+
+.empty a,
+.empty button {
+  color: var(--accent2);
+  font-weight: 600;
+  text-decoration: none;
+}
+
+.empty a:hover {
+  text-decoration: underline;
+}
+
+.skeleton {
+  display: block;
+  background: var(--surface3);
+  border-radius: 8px;
+  animation: pipuShimmer 1.2s ease-in-out infinite;
+}
+
+.skeletonRound {
+  border-radius: 50%;
+}
+
+@keyframes pipuShimmer {
+  0%,
+  100% {
+    opacity: 0.45;
+  }
+  50% {
+    opacity: 0.9;
+  }
+}
+
+@media (prefers-reduced-motion: reduce) {
+  .skeleton {
+    animation: none;
+  }
+}
+
+.pageSkel {
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+}
+
+.skelHero {
+  display: flex;
+  align-items: flex-end;
+  gap: 24px;
+  margin-bottom: 8px;
+}
+
+.skelCover {
+  width: 160px;
+  height: 160px;
+  border-radius: 12px;
+  flex: none;
+}
+
+.skelCopy {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+  flex: 1;
+  padding-bottom: 8px;
+}
+
+.skelRow {
+  display: flex;
+  align-items: center;
+  gap: 14px;
+}
+
 .primary {
   background: var(--accent-fill);
   color: #fff;

apps/web/src/shared/ui/ui.tsx

@@ -4,6 +4,7 @@ import {
   useRef,
   useState,
   type ButtonHTMLAttributes,
+  type CSSProperties,
   type InputHTMLAttributes,
   type KeyboardEvent as ReactKeyboardEvent,
   type ReactNode,
@@ -52,7 +53,7 @@ export function Button({ variant = 'secondary', icon, busy, className, children,
       aria-busy={busy || undefined}
       className={cx(s.button, s[variant], className)}
     >
-      {icon && <Icon src={icon} size={18} />}
+      {busy ? <span className={s.spinner} aria-hidden /> : icon ? <Icon src={icon} size={18} /> : null}
       {children}
     </button>
   );
@@ -283,6 +284,61 @@ export function Menu({
   );
 }
 
+/** Пустой список: иконка, текст и действие (docs/design.md#5). */
+export function EmptyState({
+  icon,
+  children,
+  action,
+}: {
+  icon?: string;
+  children: ReactNode;
+  action?: ReactNode;
+}) {
+  return (
+    <div className={s.empty} role="status">
+      {icon && <Icon src={icon} size={40} className={s.emptyIcon} />}
+      <p className={s.emptyText}>{children}</p>
+      {action}
+    </div>
+  );
+}
+
+export function Skeleton({
+  className,
+  style,
+  round,
+}: {
+  className?: string;
+  style?: CSSProperties;
+  round?: boolean;
+}) {
+  return <span className={cx(s.skeleton, round && s.skeletonRound, className)} style={style} aria-hidden />;
+}
+
+/** Каркас героя и строк списка, пока страница ещё грузится. */
+export function PageSkeleton() {
+  const { t } = useTranslation();
+  return (
+    <div className={s.pageSkel} role="status" aria-busy="true" aria-label={t('loading')}>
+      <div className={s.skelHero}>
+        <Skeleton className={s.skelCover} />
+        <div className={s.skelCopy}>
+          <Skeleton style={{ width: 72, height: 12 }} />
+          <Skeleton style={{ width: '55%', height: 28 }} />
+          <Skeleton style={{ width: '38%', height: 14 }} />
+        </div>
+      </div>
+      {Array.from({ length: 6 }, (_, i) => (
+        <div key={i} className={s.skelRow}>
+          <Skeleton style={{ width: 40, height: 40 }} />
+          <Skeleton style={{ flex: 1, height: 14 }} />
+          <Skeleton style={{ width: 36, height: 12 }} />
+        </div>
+      ))}
+    </div>
+  );
+}
+
 export function Avatar({ name, size = 32 }: { name: string; size?: number }) {
   const initials = name
     .split(/[\s._-]+/)

apps/web/src/test/fakeApi.ts

@@ -70,6 +70,7 @@ export function makeUser(username: string, role: Role, extra: Partial<FakeUser>
  */
 export function fakeApi(initial: FakeUser[]) {
   const users = new Map(initial.map((u) => [u.id, { ...u }]));
+  const onboarding = new Map<string, components['schemas']['OnboardingChoice'] | null>();
   const prefs = new Map<string, components['schemas']['UiPrefs']>();
   let current: string | null = null; // id вошедшего (одна сессия на тест)
   let token = 0;
@@ -122,7 +123,13 @@ export function fakeApi(initial: FakeUser[]) {
           version_code: 1_030_099,
           notes_md: '',
           clients: [
-            { client: 'windows', filename: 'pipu-music_1.3.0_x64-setup.exe', size: 20_000_000, download_url: '/api/v1/app/download/windows/1.3.0' },
+            {
+              client: 'windows',
+              filename: 'pipu-music_1.3.0_x64-setup.exe',
+              size: 20_000_000,
+              download_url: '/api/v1/app/download/windows/1.3.0',
+              older: [{ version: '1.2.0', filename: 'pipu-music_1.2.0_x64-setup.exe', size: 19_000_000, download_url: '/api/v1/app/download/windows/1.2.0' }],
+            },
             { client: 'linux', filename: 'pipu-music_1.3.0_amd64.deb', size: 4_000_000, download_url: '/api/v1/app/download/linux/1.3.0' },
             { client: 'macos', filename: 'pipu-music_1.3.0_aarch64.dmg', size: 22_000_000, download_url: '/api/v1/app/download/macos/1.3.0' },
             { client: 'android', filename: 'pipu-music-1.3.0.apk', size: 12_000_000, sha256: 'ab'.repeat(32), download_url: '/api/v1/app/download/android/1.3.0' },
@@ -200,7 +207,10 @@ export function fakeApi(initial: FakeUser[]) {
       case 'POST /api/v1/uploads/seen':
         return new Response(null, { status: 204 });
       case 'GET /api/v1/onboarding':
-        return json({ required: false, artists: [], genres: [] });
+        return json({ required: onboarding.get(user!.id) === null, artists: [], genres: [], choice: onboarding.get(user!.id) ?? undefined });
+      case 'PUT /api/v1/me/onboarding':
+        onboarding.set(user!.id, body as components['schemas']['OnboardingChoice']);
+        return new Response(null, { status: 204 });
       case 'GET /api/v1/me/likes':
       case 'GET /api/v1/me/dislikes':
       case 'GET /api/v1/me/history':
@@ -279,8 +289,10 @@ export function fakeApi(initial: FakeUser[]) {
       case `GET /api/v1/artists/${kino.id}/albums`:
         return json({ items: [albumSummary] });
     }
-    if (req.method === 'POST' && /^\/api\/v1\/admin\/users\/[^/]+\/reset-recommendations$/.test(path))
+    if (req.method === 'POST' && /^\/api\/v1\/admin\/users\/[^/]+\/reset-recommendations$/.test(path)) {
+      onboarding.set(path.split('/')[5]!, null);
       return new Response(null, { status: 204 });
+    }
     const userPath = /^\/api\/v1\/admin\/users\/([^/]+)$/.exec(path);
     if (userPath && req.method === 'PATCH') {
       if (!user || user.role === 'user') return problem(403, 'auth.forbidden');

apps/web/src/widgets/AppShell.module.css

@@ -227,12 +227,33 @@
   color: var(--accent2);
 }
 
+.skip {
+  position: absolute;
+  left: 12px;
+  top: 8px;
+  z-index: 50;
+  padding: 8px 14px;
+  border-radius: 10px;
+  background: var(--elev);
+  color: var(--text);
+  font-weight: 600;
+  text-decoration: none;
+  transform: translateY(-120%);
+}
+
+.skip:focus {
+  transform: none;
+}
+
 .content {
   grid-area: content;
   min-width: 0;
   min-height: 0;
   overflow-y: auto;
   padding: 32px 36px;
+}
+
+.routeIn {
   animation: pipuIn 0.2s ease-out;
 }
 

apps/web/src/widgets/AppShell.tsx

@@ -1,7 +1,7 @@
 import { queueIcon } from '../shared/ui/icons';
 import { unwrap } from '@pipu/core';
 import { useQuery } from '@tanstack/react-query';
-import { Link, Outlet, useNavigate } from '@tanstack/react-router';
+import { Link, Outlet, useNavigate, useRouterState } from '@tanstack/react-router';
 import { Suspense, useCallback, useState, type ReactNode } from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -30,7 +30,7 @@ import {
   chevronRightIcon,
   storageFillIcon,
   storageIcon, inboxFillIcon, inboxIcon, myUploadsFillIcon, myUploadsIcon, uploadFillIcon, uploadIcon, tuneFillIcon, tuneIcon} from '../shared/ui/icons';
-import { Avatar, cx, Dialog, Icon, Logo, Menu } from '../shared/ui/ui';
+import { Avatar, cx, Dialog, Icon, Logo, Menu, PageSkeleton } from '../shared/ui/ui';
 import { LanguageSwitch } from './LanguageSwitch';
 import { PlayerProvider, usePlayer, usePlayerState } from '../player/context';
 import { Ambient } from './Ambient';
@@ -226,6 +226,9 @@ function Shell() {
   return (
     <div className={cx(s.shell, island && s.island)}>
       {user.ui_prefs.ambient !== false && <ShellAmbient />}
+      <a href="#content" className={s.skip}>
+        {t('nav.skip')}
+      </a>
       <header className={s.top}>
         <div className={s.topLeft}>
           <Link to="/" className={s.logoLink}>
@@ -284,17 +287,26 @@ function Shell() {
         </Dialog>
       )}
 
-      <main className={s.content}>
-        <Suspense fallback={null}>
-          <Outlet />
-        </Suspense>
-      </main>
+      <ShellMain />
 
       <PlayerBar variant={island ? 'island' : 'bar'} />
     </div>
   );
 }
 
+function ShellMain() {
+  const key = useRouterState({ select: (st) => st.location.pathname });
+  return (
+    <main id="content" className={s.content} tabIndex={-1}>
+      <div key={key} className={s.routeIn}>
+        <Suspense fallback={<PageSkeleton />}>
+          <Outlet />
+        </Suspense>
+      </div>
+    </main>
+  );
+}
+
 /** Третье пятно фона — в цвете обложки текущего трека. */
 function ShellAmbient() {
   const player = usePlayer();

apps/web/src/widgets/PlayerBar.module.css

@@ -149,6 +149,115 @@ a.source:hover {
   transform: scale(1.06);
 }
 
+.play:active {
+  transform: scale(0.94);
+}
+
+.nowArt {
+  position: relative;
+  display: grid;
+  place-items: center;
+  flex: none;
+  padding: 0;
+  border-radius: 10px;
+}
+
+.nowEq {
+  position: absolute;
+  right: -2px;
+  bottom: -2px;
+  padding: 2px 4px;
+  border-radius: 6px;
+  background: var(--surface);
+}
+
+.coverLive {
+  animation: pipuCoverPulse 2.4s ease-in-out infinite;
+}
+
+@keyframes pipuCoverPulse {
+  50% {
+    filter: brightness(1.12);
+  }
+}
+
+.queueScrim,
+.sheetScrim {
+  position: fixed;
+  inset: 0;
+  z-index: 15;
+  background: var(--overlay);
+  animation: pipuIn 0.18s ease-out;
+}
+
+.sheet {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 16;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 16px;
+  max-height: min(92dvh, 760px);
+  padding: 12px 20px calc(24px + env(safe-area-inset-bottom, 0px));
+  border-radius: 24px 24px 0 0;
+  background: var(--glass);
+  backdrop-filter: blur(28px) saturate(1.3);
+  animation: pipuIn 0.22s ease-out;
+}
+
+.sheetHead {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  width: 100%;
+  font-weight: 600;
+}
+
+.sheetCover {
+  width: min(240px, 56vw) !important;
+  height: min(240px, 56vw) !important;
+  border-radius: 16px;
+}
+
+.sheetMeta {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 4px;
+  text-align: center;
+  min-width: 0;
+  max-width: 100%;
+}
+
+.sheetTitle {
+  font-family: var(--font-display);
+  font-size: 22px;
+  font-weight: 600;
+  color: inherit;
+  text-decoration: none;
+}
+
+.sheetControls,
+.sheetExtra {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 8px;
+  width: 100%;
+}
+
+.sheet .progress {
+  max-width: none;
+}
+
+.sheet .volume {
+  flex: 1;
+  max-width: 160px;
+}
+
 .play[aria-busy='true'] {
   opacity: 0.7;
 }
@@ -218,6 +327,10 @@ a.source:hover {
 }
 
 @media (max-width: 767px) {
+  .now {
+    cursor: pointer;
+  }
+
   .bar {
     grid-template-columns: minmax(0, 1fr) auto;
     padding: 0 12px;
@@ -228,7 +341,7 @@ a.source:hover {
   .right,
   .controls > :first-child,
   .controls > :last-child,
-  .now > button {
+  .now > button:not(.nowArt) {
     display: none;
   }
 }
@@ -237,7 +350,7 @@ a.source:hover {
   position: fixed;
   right: 16px;
   bottom: 100px;
-  z-index: 6;
+  z-index: 16;
   display: flex;
   flex-direction: column;
   width: min(380px, calc(100% - 32px));

apps/web/src/widgets/PlayerBar.tsx

@@ -3,7 +3,7 @@ import { createPortal } from 'react-dom';
 import { Link } from '@tanstack/react-router';
 import { useTranslation } from 'react-i18next';
 
-import { ArtistLinks, Cover } from '../entities/catalog';
+import { ArtistLinks, Cover, Equalizer } from '../entities/catalog';
 import { AddToPlaylist } from '../entities/playlists';
 import { usePlayer, usePlayerState } from '../player/context';
 import { formatDuration } from '../shared/lib/format';
@@ -37,6 +37,8 @@ export function PlayerBar({ variant = 'bar' }: { variant?: 'bar' | 'island' }) {
   const { t } = useTranslation();
   const player = usePlayer();
   const st = usePlayerState();
+  const narrow = useNarrow();
+  const [sheetOpen, setSheetOpen] = useState(false);
   const [queueOpen, setQueueOpen] = useState(false);
   const [shareStatus, setShareStatus] = useState<'copied' | 'error' | null>(null);
   const [sharing, setSharing] = useState(false);
@@ -97,8 +99,24 @@ export function PlayerBar({ variant = 'bar' }: { variant?: 'bar' | 'island' }) {
 
   return (
     <footer className={cx(s.bar, variant === 'island' && s.island)} aria-label={t('player.label')}>
-      <div className={s.now}>
-        <Cover album={track.album} size={52} />
+      <div
+        className={s.now}
+        onClick={
+          narrow
+            ? (e) => {
+                if (!(e.target as HTMLElement).closest('a, button')) setSheetOpen(true);
+              }
+            : undefined
+        }
+      >
+        {narrow ? (
+          <button type="button" className={s.nowArt} aria-label={t('player.expand')} onClick={() => setSheetOpen(true)}>
+            <Cover album={track.album} size={52} className={st.playing ? s.coverLive : undefined} />
+            {st.playing && <span className={s.nowEq}><Equalizer playing /></span>}
+          </button>
+        ) : (
+          <Cover album={track.album} size={52} className={st.playing ? s.coverLive : undefined} />
+        )}
         <div className={s.meta}>
           <span className={s.title}>{track.title}</span>
           <span className={s.artists}>
@@ -232,12 +250,150 @@ export function PlayerBar({ variant = 'bar' }: { variant?: 'bar' | 'island' }) {
           style={{ '--pct': `${(st.muted ? 0 : st.volume) * 100}%` } as CSSProperties}
         />
       </div>
+      {sheetOpen && narrow && (
+        <NowPlayingSheet
+          variant={variant}
+          onClose={() => setSheetOpen(false)}
+          share={share}
+          sharing={sharing}
+        />
+      )}
       {queueOpen && <QueueDrawer id={queueId} variant={variant} onClose={closeQueue} />}
       {shareStatus && <span className={s.shareStatus} role="status">{t(shareStatus === 'copied' ? 'player.link_copied' : 'player.share_error')}</span>}
     </footer>
   );
 }
 
+function useNarrow() {
+  const [narrow, setNarrow] = useState(false);
+  useEffect(() => {
+    const mq = window.matchMedia?.('(max-width: 767px)');
+    if (!mq) return;
+    const sync = () => setNarrow(mq.matches);
+    sync();
+    mq.addEventListener?.('change', sync);
+    return () => mq.removeEventListener?.('change', sync);
+  }, []);
+  return narrow;
+}
+
+function NowPlayingSheet({
+  variant,
+  onClose,
+  share,
+  sharing,
+}: {
+  variant: 'bar' | 'island';
+  onClose: () => void;
+  share: () => Promise<void>;
+  sharing: boolean;
+}) {
+  const { t } = useTranslation();
+  const player = usePlayer();
+  const st = usePlayerState();
+  const track = st.track;
+  useEffect(() => {
+    const onKey = (e: KeyboardEvent) => {
+      if (e.key === 'Escape') onClose();
+    };
+    document.addEventListener('keydown', onKey);
+    const prev = document.body.style.overflow;
+    document.body.style.overflow = 'hidden';
+    return () => {
+      document.removeEventListener('keydown', onKey);
+      document.body.style.overflow = prev;
+    };
+  }, [onClose]);
+  if (!track) return null;
+  const react = (r: 'like' | 'dislike') => void player.react(track, track.reaction === r ? null : r).catch(() => undefined);
+  const repeatLabel = t(`player.repeat_${st.repeat}`);
+  return createPortal(
+    <div className={s.sheetScrim} onClick={onClose}>
+      <div
+        className={cx(s.sheet, variant === 'island' && s.sheetIsland)}
+        role="dialog"
+        aria-modal="true"
+        aria-label={t('player.now_playing')}
+        onClick={(e) => e.stopPropagation()}
+      >
+        <div className={s.sheetHead}>
+          <span>{t('player.now_playing')}</span>
+          <button type="button" className={s.icon} aria-label={t('form.close')} onClick={onClose}>
+            <Icon src={closeIcon} size={20} />
+          </button>
+        </div>
+        <Cover album={track.album} size={240} className={cx(s.sheetCover, st.playing && s.coverLive)} />
+        <div className={s.sheetMeta}>
+          <Link to="/track/$id" params={{ id: track.id }} className={s.sheetTitle} onClick={onClose}>
+            {track.title}
+          </Link>
+          <span className={s.artists}>
+            <ArtistLinks artists={track.artists} />
+          </span>
+        </div>
+        <div className={s.progress}>
+          <span className={s.time}>{formatDuration(st.positionMs)}</span>
+          <input
+            type="range"
+            className={s.range}
+            min={0}
+            max={st.durationMs || track.duration_ms}
+            step={1000}
+            value={Math.min(st.positionMs, st.durationMs || track.duration_ms)}
+            aria-label={t('player.progress')}
+            onChange={(e) => player.seek(Number(e.target.value))}
+            style={{ '--pct': `${(st.positionMs / (st.durationMs || track.duration_ms)) * 100}%` } as CSSProperties}
+          />
+          <span className={s.time}>{formatDuration(st.durationMs || track.duration_ms)}</span>
+        </div>
+        <div className={s.sheetControls}>
+          <button type="button" className={cx(s.icon, track.reaction === 'dislike' && s.danger)} aria-label={t(track.reaction === 'dislike' ? 'player.undislike' : 'player.dislike')} aria-pressed={track.reaction === 'dislike'} onClick={() => react('dislike')}>
+            <Icon src={track.reaction === 'dislike' ? dislikeFillIcon : dislikeIcon} />
+          </button>
+          <button type="button" className={s.icon} aria-label={t('player.prev')} onClick={() => player.prev()}>
+            <Icon src={prevIcon} size={28} />
+          </button>
+          <button type="button" className={s.play} aria-label={t(st.playing ? 'player.pause' : 'player.play')} onClick={() => player.toggle()}>
+            <Icon src={st.playing ? pauseIcon : playIcon} size={32} />
+          </button>
+          <button type="button" className={s.icon} aria-label={t('player.next')} onClick={() => player.next()}>
+            <Icon src={nextIcon} size={28} />
+          </button>
+          <button type="button" className={cx(s.icon, track.reaction === 'like' && s.accent)} aria-label={t(track.reaction === 'like' ? 'player.unlike' : 'player.like')} aria-pressed={track.reaction === 'like'} onClick={() => react('like')}>
+            <Icon src={track.reaction === 'like' ? likeFillIcon : likeIcon} />
+          </button>
+        </div>
+        <div className={s.sheetExtra}>
+          <button type="button" className={cx(s.icon, st.shuffle && s.accent)} aria-label={t('player.shuffle')} aria-pressed={st.shuffle} onClick={() => player.toggleShuffle()}>
+            <Icon src={shuffleIcon} size={22} />
+          </button>
+          <button type="button" className={cx(s.icon, st.repeat !== 'off' && s.accent)} aria-label={repeatLabel} onClick={() => player.cycleRepeat()}>
+            <Icon src={st.repeat === 'one' ? repeatOneIcon : repeatIcon} size={22} />
+          </button>
+          <button type="button" className={s.icon} aria-label={t('player.share')} disabled={sharing} onClick={() => void share()}>
+            <Icon src={shareIcon} size={20} />
+          </button>
+          <button type="button" className={s.icon} aria-label={t(st.muted ? 'player.unmute' : 'player.mute')} onClick={() => player.toggleMute()}>
+            <Icon src={st.muted || st.volume === 0 ? volumeOffIcon : volumeIcon} size={22} />
+          </button>
+          <input
+            type="range"
+            className={cx(s.range, s.volume)}
+            min={0}
+            max={1}
+            step={0.01}
+            value={st.muted ? 0 : st.volume}
+            aria-label={t('player.volume')}
+            onChange={(e) => player.setVolume(Number(e.target.value))}
+            style={{ '--pct': `${(st.muted ? 0 : st.volume) * 100}%` } as CSSProperties}
+          />
+        </div>
+      </div>
+    </div>,
+    document.body,
+  );
+}
+
 /** Очередь воспроизведения (выдвижная панель справа): что играет и что дальше, клик — перейти к треку. */
 function QueueDrawer({ id, variant, onClose }: { id: string; variant: 'bar' | 'island'; onClose: () => void }) {
   const { t } = useTranslation();
@@ -256,7 +412,9 @@ function QueueDrawer({ id, variant, onClose }: { id: string; variant: 'bar' | 'i
   }, [onClose]);
   // Портал: у плеера backdrop-filter, а он делает fixed-потомков относительными к себе.
   return createPortal(
-    <aside id={id} className={cx(s.drawer, variant === 'island' && s.drawerIsland)} aria-label={t('player.queue')}>
+    <>
+      <div className={s.queueScrim} onClick={onClose} />
+      <aside id={id} className={cx(s.drawer, variant === 'island' && s.drawerIsland)} aria-label={t('player.queue')}>
       <div className={s.drawerHead}>
         <span>{t('player.queue')}</span>
         <button ref={close} type="button" className={s.icon} aria-label={t('form.close')} onClick={onClose}>
@@ -282,7 +440,8 @@ function QueueDrawer({ id, variant, onClose }: { id: string; variant: 'bar' | 'i
         ))}
       </div>
       {st.wave && <p className={s.drawerNote}>{t('player.queue_wave')}</p>}
-    </aside>,
+    </aside>
+    </>,
     document.body,
   );
 }

apps/web/src/widgets/SearchBox.tsx

@@ -6,6 +6,7 @@ import { useTranslation } from 'react-i18next';
 
 import { useSession } from '../app/session';
 import { Cover } from '../entities/catalog';
+import { usePlayer } from '../player/context';
 import { formatDuration } from '../shared/lib/format';
 import { searchIcon } from '../shared/ui/icons';
 import { cx, Icon } from '../shared/ui/ui';
@@ -36,6 +37,7 @@ export function SearchBox({
 }) {
   const { t } = useTranslation();
   const session = useSession();
+  const player = usePlayer();
   const navigate = useNavigate();
   const listId = useId();
   const inputRef = useRef<HTMLInputElement>(null);
@@ -118,8 +120,7 @@ export function SearchBox({
         title: tr.title,
         subtitle: `${tr.artists.map((a) => a.name).join(', ')} · ${formatDuration(tr.duration_ms)}`,
         cover: tr.album,
-        // Воспроизведение — M3; пока трек открывает свой альбом.
-        go: () => void navigate({ to: '/album/$id', params: { id: tr.album.id } }),
+        go: () => player.playList([tr], 0, { type: 'search', id: debounced, label: debounced }),
       });
   }
 
@@ -149,7 +150,8 @@ export function SearchBox({
     }
   };
 
-  const showList = open && debounced !== '' && data !== undefined;
+  const showPopover = open && debounced !== '';
+  const showList = showPopover && data !== undefined;
   const groups: Item['group'][] = ['artists', 'albums', 'tracks'];
   const optionId = (i: number) => `${listId}-${i}`;
 
@@ -188,12 +190,17 @@ export function SearchBox({
       <kbd className={s.kbd} aria-hidden>
         /
       </kbd>
-      {showList && (
+      {showPopover && (
         <div className={s.popover}>
-          {data.corrected_query && (
+          {showPopover && !showList && (
+            <div className={s.nothing} role="status">
+              {t('search.searching')}
+            </div>
+          )}
+          {data?.corrected_query && (
             <div className={s.corrected}>{t('search.corrected', { query: data.corrected_query })}</div>
           )}
-          <div id={listId} role="listbox" aria-label={t('search.label')}>
+          {showList && <div id={listId} role="listbox" aria-label={t('search.label')}>
             {items.length === 0 && <div className={s.nothing}>{t('search.nothing')}</div>}
             {groups.map((g) => {
               const groupItems = items.map((it, i) => ({ it, i })).filter(({ it }) => it.group === g);
@@ -221,7 +228,7 @@ export function SearchBox({
                 </div>
               );
             })}
-          </div>
+          </div>}
           <button
             type="button"
             className={s.all}

apps/web/src/widgets/wave/WaveButton.tsx

@@ -129,6 +129,15 @@ export function WaveButton(props: WaveButtonProps) {
       aria-pressed={interactive ? !!props.playing : undefined}
       aria-hidden={interactive ? undefined : true}
       onMouseMove={interactive ? onMove : undefined}
+      onFocus={interactive ? () => (s.hoverT = 1) : undefined}
+      onBlur={
+        interactive
+          ? () => {
+              s.hoverT = 0;
+              s.pressT = 0;
+            }
+          : undefined
+      }
       onMouseEnter={interactive ? () => (s.hoverT = 1) : undefined}
       onMouseLeave={
         interactive

docs/admin-guide.md

@@ -104,7 +104,9 @@
 Android-приложение обновляется само: при запуске оно сверяется с сервером и предлагает новый APK.
 Раздать приложение — ссылка `https://<ваш-домен>/download` (без входа; `/android` перенаправляет сюда):
 сборка под систему посетителя, остальные платформы ниже, адрес сервера для копирования и короткая инструкция.
-APK, Linux (`.deb`) и Windows (NSIS) прикладываются к релизу Gitea автоматически. Та же страница — внизу экрана входа
+APK, Linux (`.deb`) и Windows (NSIS) прикладываются к релизу Gitea автоматически. После каждого релиза CI
+оставляет файлы только у последних 8 релизов и последние 8 прогонов Actions (теги и заметки не удаляет).
+Та же страница — внизу экрана входа
 и в меню профиля.
 
 ## 7. Наблюдение

docs/api.md

@@ -106,8 +106,8 @@
 ### Мобильное обновление — [mobile.md](mobile.md#самообновление)
 | Метод | Путь | Описание |
 |---|---|---|
-| GET | `/app/clients` | `{version, version_code, notes_md, clients:[{client, filename, size, sha256?, download_url}]}` — Android, Windows, Linux, macOS |
-| GET | `/app/download/{client}/{version}` | файл клиента (прокси / кэш релиза Gitea) |
+| GET | `/app/clients` | `{version, version_code, notes_md, clients:[{client, filename, size, sha256?, download_url, older:[{version, filename, size, download_url}]}]}` — до 8 релизов на платформу |
+| GET | `/app/download/{client}/{version}` | файл клиента этой версии (прокси / кэш релиза Gitea) |
 | GET | `/app/android/latest` | `{version, version_code, notes_md, size, sha256, download_url, min_supported}` |
 | GET | `/app/android/download/{version}` | APK (прокси / кэш релиза Gitea) |
 

docs/architecture.md

@@ -31,11 +31,11 @@
 | Сервис | Язык | Ответственность |
 |---|---|---|
 | `nginx` | — | TLS, раздача SPA, reverse proxy на `api`, отдача аудиофайлов и обложек через `X-Accel-Redirect` (internal locations), gzip/brotli, кэш статики. |
-| `api` | Go | Весь публичный REST API: auth, пользователи, каталог, поиск (прокси к Meilisearch), коллекция, состояние плеера, события прослушиваний, админка, фоновые задачи (сканер, транскодинг) через очередь River (на Postgres). |
+| `api` | Go | Весь публичный REST API: auth, пользователи, каталог, поиск (прокси к Meilisearch), коллекция, состояние плеера, события прослушиваний, админка, фоновые задачи: сканер внутри процесса, upload-воркеры со статусами в PostgreSQL. |
 | `storage-agent` | Go | Единственный привилегированный контейнер: монтирует / размонтирует NFS-шары в `/library/<source_id>`, проверяет доступность, **записывает одобренные загрузки** в принимающие хранилища (только создание новых файлов). Принимает команды только от `api` по внутренней сети. |
 | `recommender` | Python | Онлайн-сервис рекомендаций: генерация кандидатов, ранжирование, пачки для «Моей волны», обработка обратной связи в реальном времени; ночное обучение моделей (ALS, LightGBM). |
 | `analyzer` | Python | Воркер аудиоанализа: Essentia — BPM, энергия, танцевальность, настроение, эмбеддинги. Тот же образ, что `recommender`, другая команда запуска. |
-| `postgres` | — | Основное хранилище, pgvector для эмбеддингов, очередь задач River. |
+| `postgres` | — | Основное хранилище, pgvector для эмбеддингов, состояния upload/analysis jobs. |
 | `redis` | — | Rate limiting, кэш, Redis Streams для событий в `recommender`, сессионные векторы волны. |
 | `meilisearch` | — | Полнотекстовый поиск с опечатками и автокомплитом. |
 
@@ -60,7 +60,7 @@
 
 ### 3.3 Сканирование библиотеки
 1. Админ добавляет хранилище → `api` → `storage-agent` монтирует NFS.
-2. `api` ставит задачу `scan_source` в River → обход файлов, чтение тегов (Go, `dhowden/tag` + `ffprobe`),
+2. `api` запускает `Scanner.Start` в процессе → обход файлов, чтение тегов (Go, `dhowden/tag` + `ffprobe`),
    применение шаблонов путей, upsert в БД, индексирование в Meilisearch.
 3. Для новых / изменённых треков создаётся задача анализа (таблица `analysis_jobs`) → `analyzer`.
 
@@ -94,11 +94,10 @@ pipu-music/
 │   │   ├── cmd/api/            # main сервиса
 │   │   ├── cmd/storage-agent/  # main агента хранилищ
 │   │   ├── internal/
-│   │   │   ├── auth/  users/  library/  catalog/  search/
-│   │   │   ├── playback/  collection/  events/  wave/  admin/  uploads/
+│   │   │   ├── auth/  library/  search/  genius/
+│   │   │   ├── playback/  wave/  uploads/  appupdate/  system/
 │   │   │   └── platform/       # db, redis, config, logging, http, jobs
-│   │   ├── migrations/         # goose SQL-миграции
-│   │   └── queries/            # sqlc SQL
+│   │   └── migrations/         # goose SQL-миграции; SQL-запросы — в адаптерах internal/
 │   └── recommender/            # Python (uv)
 │       ├── pipu_rec/
 │       │   ├── api/            # FastAPI
@@ -120,16 +119,35 @@ pipu-music/
 ## 5. Архитектурный стиль
 
 - **Модульный монолит** в `api`: каждый модуль в `internal/<module>` — `handler` (HTTP) → `service`
-  (бизнес-логика, интерфейсы) → `repository` (sqlc). Модули общаются через интерфейсы сервисов,
-  не лезут в чужие таблицы напрямую.
+  (операции приложения) → `store` (ручной SQL через pgx). Узкие порты отделяют изменяемые операции
+  от адаптеров; миграция существующих модулей постепенная. Read-проекции могут делать JOIN между областями.
 - **Contract-first**: `api/openapi.yaml` — источник истины. Go-сервер генерирует типы и интерфейс
   хендлеров (`oapi-codegen`, strict server), TS-клиент генерируется в `packages/api-client`.
   Сгенерированный код совпадает с контрактом.
 - **Внутренний API** `api ↔ recommender` и `api ↔ storage-agent` — HTTP/JSON во внутренней docker-сети,
-  описан отдельными `internal-*.yaml` спеками.
+  реализован Go/Python DTO и обработчиками; отдельных `internal-*.yaml` сейчас нет.
 - **Идемпотентность**: события и мутирующие запросы клиентов принимают `Idempotency-Key` / `event_id` (UUIDv7),
   что важно для офлайн-синхронизации мобильного.
 - **Деградация**: если `recommender` недоступен, `api` отдаёт волну по упрощённому fallback-алгоритму
   (похожие по жанрам + лайки + случайное), приложение продолжает работать.
 - **Наблюдаемость**: структурированные JSON-логи (`slog`, `structlog`), `/healthz` и `/readyz` у каждого сервиса,
   метрики Prometheus `/metrics` (опционально подключаются Grafana / Prometheus).
+
+## 6. Реализация и планы
+
+Точки изменения после выделения обязанностей:
+
+- `apps/web/src/player/player.ts` — фасад воспроизведения; `engine.ts`, `analysis.ts`, `media.ts`, `persistence.ts` — браузерные адаптеры. Типы состояния — `types.ts`.
+- `packages/core/src/wave.ts` — общая политика refill/feedback и поколения сессий. Web и Android сохраняют собственные очереди.
+- `apps/web/src/features/uploads` — API, queries, экран очереди, диалоги и настройки. Страница очереди только собирает feature.
+- `services/api/internal/library`: `sources.go`, `templates.go`, `scans.go`, `schedule.go` — отдельные сценарии; `Service` сохраняет фасад для HTTP и сборки приложения.
+- `services/api/internal/uploads`: `placement.go` планирует размещение через узкие порты, `persistence.go` владеет SQL-операциями и транзакциями.
+- `services/api/internal/playback/personalizer.go` персонализирует каталог независимо от HTTP; `events.go` принимает события в транзакции.
+
+`pnpm check:boundaries` проверяет новые границы без сборки приложений. Его отдельный CI workflow
+запускается при изменении соответствующих областей; read-проекции и composition root не запрещены.
+
+River и sqlc не используются. Сканер и расписание живут в процессе API; upload workers читают
+состояния PostgreSQL и пробуждаются каналами/таймерами. Анализатор использует `analysis_jobs`.
+Добавление устойчивой очереди или генератора SQL — отдельное архитектурное решение при появлении
+соответствующей потребности, не обязательная часть текущего рефакторинга.

docs/mobile.md

@@ -99,13 +99,13 @@
 
 ## Самообновление
 
-Первая установка — публичная страница `/download` веб-клиента (`/android` ведёт туда же): APK, десктопные сборки по ОС, адрес сервера и инструкция.
+Первая установка — публичная страница `/download` веб-клиента (`/android` ведёт туда же): APK, десктопные сборки по ОС, предыдущие версии (до 8 последних релизов, сколько есть), адрес сервера и инструкция.
 
 Приложение распространяется только через Gitea Releases (не Google Play).
 
 **Поток:**
 1. При запуске (не чаще раза в 6 ч) и вручную в профиле: `GET /api/v1/app/android/latest` на **сервере Pipu**.
-   Сервер сам опрашивает Gitea API (`GET /api/v1/repos/{owner}/{repo}/releases/latest`) с серверным токеном,
+   Сервер сам опрашивает Gitea API (список релизов, до 8 с файлами; fallback — `/releases/latest`) с серверным токеном,
    кэширует ответ на 10 мин и APK на диске. Так:
    - мобильному приложению не нужен доступ к Gitea и токен (репозиторий может быть приватным);
    - версия приложения согласована с версией сервера (`min_supported` из `server-info`).

docs/recommendations.md

@@ -219,10 +219,27 @@ MMR-разнообразие и квоты остаются. Пока модел
 - **Новый пользователь**: опциональный онбординг (выбрать 3+ жанра или исполнителя) → начальные центроиды.
   Без онбординга — первые пачки из `popular` и максимально разнообразных кластеров библиотеки
   (по одному треку из разных кластеров), exploration 40% на первые 30 треков.
-- Реализация онбординга: `GET /onboarding` (40 исполнителей с наибольшим числом треков, 24 жанра; `required` —
-  не пройден и своей истории < 10 треков), `PUT /me/onboarding` → `user_profiles_rec.onboarding`; пустой выбор —
-  пропуск. Рекомендатель, пока своих оценок < 30, добавляет псевдооценки: треки выбранных исполнителей +1,
-  жанров +0.5 (до 300 треков). Веб показывает онбординг на главной вместо волны.
+- Онбординг: `GET /onboarding` возвращает 40 исполнителей, 24 жанра, сохранённый `choice` и `required`.
+  Анкета показывается на главной в вебе/desktop и Android до первого заполнения или пропуска, независимо
+  от истории и наличия библиотеки. Её можно повторно открыть в настройках профиля.
+- `PUT /me/onboarding` сохраняет исполнителей, жанры, необязательный пол (`male`, `female`, `other`) и
+  возрастную группу (`under_13`, `13_19`, `20_29`, `30_39`, `40_49`, `50_59`, `60_plus`) в
+  `user_profiles_rec.onboarding`. Пустые списки и `null` для пола/возраста означают пропуск.
+- Вместе с исходной возрастной группой сервер сохраняет год выбора (`age_group_year`); клиент не может
+  подменить его. SQL-функция `rec_age_group` прибавляет прошедшие годы к середине выбранного диапазона
+  (для открытых диапазонов: 6 и 65 лет). Например, 13–19 лет в 2006 → примерно 30–39 лет в 2026.
+  API возвращает текущую приблизительную группу. При сохранении той же текущей группы исходная группа
+  и год остаются прежними; выбор другой группы задаёт новую точку отсчёта. Это оценка, не дата рождения.
+- Пока собственных оценок меньше 30, рекомендатель добавляет псевдооценки: исполнители +1, жанры +0.5,
+  а треки, понравившиеся минимум двум другим незаблокированным слушателям с тем же полом и текущей
+  возрастной группой, — до +0.25. Если указано одно поле, сравнивается только оно; если ни одного —
+  демографического сигнала нет. Личные оценки не перезаписываются, дизлайки исключаются.
+  На каждый источник действует лимит 300 треков. Музыкальные предпочтения пола/возраста заранее не задаются.
+- Запасная Go-волна учитывает выбранных исполнителей/жанры и те же демографические когорты после личных
+  лайков и любимых исполнителей. Случайные треки сохраняют разнообразие.
+- Администраторский сброс удаляет профиль целиком, включая все ответы и год выбора. Клиенты обновляют
+  состояние анкеты каждые 30 секунд, а веб также при возвращении на главную/в окно. Пользователь проходит
+  настройку снова; текущее воспроизведение не прерывается.
 - **Новый трек**: сразу доступен через `audio_sim` / `fresh` (как только проанализирован), без единого прослушивания.
 
 ## 8. Обучение на всех пользователях

docs/reviews/2026-10-22-review-1.md

@@ -0,0 +1,184 @@
+# Стоимость работы агентов и план SOLID-рефакторинга — 2026-10-22
+
+## Вывод и границы исходного исследования
+
+Проект уже имеет полезные границы: приложения разделены, есть общий `packages/core`, контракт OpenAPI, интерфейсы auth, отдельный Python-рекомендатель. Основная проблема — не количество технологий, а широкий контекст локальных изменений: несколько крупных оркестраторов смешивают правила, IO и состояние, а часть правил повторяется на клиентах.
+
+Проверены структура tracked-файлов, ключевые Go/TS/Python-компоненты, тесты, CI, документация и два примера изменений из git. Это архитектурное исследование с фокусом на трудоёмкости доработок, а не полный аудит безопасности, производительности или визуального UI. Непрочитанные исходники не считаются проверенными. На этапе исходного исследования код приложения не изменялся и тесты не запускались. Реализация и проверки следующего этапа описаны в конце отчёта.
+
+Фактические токены, стоимость и повторные попытки прошлых сессий не исследованы: в материалах проверки нет соответствующей телеметрии. Ниже — подтверждённые свойства репозитория и объяснение того, как они могут увеличивать работу агента. Процент экономии без замера не установлен.
+
+## Prior Reviews Summary
+
+В `docs/reviews/` найден один предыдущий отчёт: `2026-10-21-review-1.md`. Все 9 задач уже отмечены `[x]`, их повторно не открывали. Открытых задач для переноса: 0. Вновь подтверждённых исправлений ранее открытых задач: 0.
+
+## Измерения
+
+Снимок: HEAD `c84f90e`; локальные посторонние untracked-файлы не включены и не изменены.
+
+- 419 tracked-файлов.
+- 260 исходников с расширениями `.go`, `.ts`, `.tsx`, `.py`, `.rs`, исключая каталоги `gen`, `generated` и файлы `.gen.go`: 39 605 строк, включая тесты.
+- Из этих исходников 24 файла длиннее 400 строк, 9 — длиннее 600. Длина — сигнал для изучения обязанностей, не самостоятельное нарушение SOLID.
+- `services/api/internal/api/gen/api.gen.go`: 11 234 строки.
+- `packages/api-client/src/generated/schema.ts`: 4 599 строк.
+- `pnpm-lock.yaml`: 8 523 строки.
+- Итого эти три файла: 24 356 строк. Их полный вывод в контекст обычно избыточен; это не оценка числа токенов.
+- `api/openapi.yaml`: 3 717 строк. Контракт нужен, но обычно достаточно конкретной операции и связанных схем.
+
+Воспроизведение: список из `git ls-files`, подсчёт через `[System.IO.File]::ReadAllLines`, отбор расширений и указанных generated-путей. Это физические строки, без семантического анализа. Наличие файла в git не означает, что агент автоматически загружает его целиком.
+
+## Почему работа агента может быть дорогой
+
+### 1. Недостаточно локальной навигации
+
+В проверенном дереве не найдены `AGENTS.md`; корневой README даёт общие команды, `docs/README.md` — карту продуктовых документов. Нет краткой карты «задача → владельцы кода → инварианты → целевые проверки». Новая сессия вынуждена восстанавливать её поиском.
+
+Нужна короткая корневая инструкция и локальные инструкции по областям, с минимальным пересечением. Большая энциклопедия в корневом AGENTS сама увеличит постоянный контекст. Исключения для generated-кода должны означать «читать точечно при необходимости», а не запрещать проверку контракта.
+
+### 2. Документация описывает частично проектируемую архитектуру как существующую
+
+`docs/architecture.md:34`, `:63`, `:101`, `:123`, `:129` обещают River, sqlc, общение модулей через сервисные интерфейсы и отдельные внутренние YAML-спецификации. В проверенном `services/api/go.mod` нет River/sqlc, сканирование запускает `Scanner.Start` (`library/service.go:614`), SQL находится прямо в store/service, в `api/` найден публичный `openapi.yaml`.
+
+Агенту приходится перепроверять описание. Документ следует разделить на «реализовано» и «планируется», описать действующие очереди/воркеры и не внедрять River/sqlc только ради соответствия старому тексту.
+
+### 3. Слишком широкий контекст плеера
+
+`apps/web/src/player/player.ts:84` — 896 строк: очередь, волна, события, HTMLAudioElement, crossfade, preloading, Web Audio, Media Session, Tauri media, localStorage и серверное восстановление. Изменение одной обязанности требует проверки остальных.
+
+`apps/mobile/src/player/controller.ts:78` — 457 строк с похожей оркестрацией, но другим движком, офлайн-хранилищем и фоновым жизненным циклом. Одинаковые `WAVE_REFILL_AT`, `EARLY_SKIP_MS`, накопление feedback и `refillWave` находятся в обоих клиентах (`web:255`, `mobile:375`). Правку правила нужно сопоставлять в двух реализациях.
+
+### 4. Границы backend непоследовательны
+
+- `uploads/service.go:31–52` зависит от конкретных Store, library.Service и Scanner; `:328` обращается к `s.store.pool.Exec`, `:387` принимает `pgx.Tx` в бизнес-операции.
+- `library/service.go:49` объединяет источники, подключение, шаблоны, preview, сканирование, расписание и health-check; всего 829 строк.
+- `playback/handler.go:37` объединяет стриминг, персонализацию, события, состояние, историю и реакции; всего 609 строк, использует конкретный `library.Store`.
+- `cmd/api/main.go:157–160`: DTO ссылается на playback Handler, а Handler получает DTO через замыкание. Это усложняет сборку и изолированное тестирование. Это не цикл импортов Go.
+- `genius/service.go:27` сам создаёт внешний клиент, а также работает с БД и запускает worker. Прямая зависимость от внешнего клиента затрудняет его замену в тесте.
+
+Чтение чужих таблиц в поисковой проекции само по себе допустимо. Главный приоритет — изолировать бизнес-операции и записи; не вводить универсальные репозитории для всех JOIN.
+
+### 5. Проверки не всегда соответствуют границам изменений
+
+Уже есть полезные unit-, integration- и E2E-тесты; CI API и PostgreSQL integration разделены. Но `apps/mobile/test/screens.test.ts` проверяет offlineWave/releaseNeed, а не Controller. В проверенном наборе `apps/mobile/test` нет сценариев жизненного цикла Controller.
+
+`apps/web/src/player/audio.test.ts:15` подменяет внутреннее состояние Player через `Object.assign`. Это конкретный признак неудобной тестовой границы: тесту нужен маленький анализатор, но приходится собирать большой плеер и менять его внутренности.
+
+Без быстрых поведенческих проверок изменяемого модуля агенту требуется больше рассуждений и более широкий прогон. Наличие тестов не доказывает покрытие всех гонок.
+
+### 6. Часть ширины изменений оправдана продуктом
+
+Добавление Genius (`73ad61e`) затронуло 34 файла, включая миграцию, оба клиента, переводы и generated-код. Это сквозная возможность, и само число файлов не доказывает плохую архитектуру. Добавление текущего трека в плейлист (`fb20258`) затронуло 8 файлов, не потребовало переделки backend.
+
+Уменьшать нужно непредвиденную связанность и повторное открытие одних и тех же файлов, сохраняя необходимые контрактные, платформенные и локализационные изменения.
+
+## Phase 1: Code Quality / SOLID
+
+### S — одна причина для изменения
+
+Выделить у веб-плеера `AudioEngine`, `AudioAnalysis`, `PlaybackPersistence`, `MediaControls`. Player сохранить как фасад с текущим публичным API. Сначала вынести наиболее независимые обязанности с сохранением поведения; не переносить весь плеер за один PR.
+
+Разделить library по сценариям: управление источниками, шаблоны/preview, запуск сканов, расписание/проверки доступности. Простое разнесение методов того же Service по файлам улучшит поиск, но не уменьшит связанность без разделения зависимостей.
+
+### O — расширение через ограниченные точки замены
+
+Вынести одинаковую политику волны в `packages/core` как `WaveSession`/`WaveCoordinator`: session generation, feedback, пороги refill и отбрасывание устаревших ответов. Сетевой API передавать через небольшой `WaveGateway`.
+
+Web и Android применяют результат к собственным очередям. Native queue, offline playback и особенности ExoPlayer остаются в Android-адаптере; единый абстрактный движок для всех платформ заранее не нужен.
+
+### L — заменяемость
+
+Доказанных нарушений LSP в исследованной области не обнаружено. Для новых адаптеров проверять одинаковые обещания: порядок результатов, ошибки, отмену и отсутствие воздействия устаревшей сессии. Синхронный HTMLAudioElement и асинхронный native player нельзя объявлять взаимозаменяемыми без явного контракта.
+
+### I — узкие интерфейсы
+
+`auth/store.go:43` объединяет пользователей, refresh-токены, администрирование, audit и настройки; `WithTx` возвращает тот же широкий Store. Это кандидат на последующее разделение по потребителям, но auth уже имеет рабочий интерфейс и тестовый memstore — приоритет ниже плеера/uploads.
+
+Новые границы создавать по реально используемым операциям, например `SourceLookup`, `ScanStarter`, `PlacementCatalog`. Не копировать все методы конкретного Store в интерфейс.
+
+### D — зависимость от операций, а не инфраструктуры
+
+В uploads вынести SQL и pgx-транзакции в persistence-адаптер; сервису дать операции `UpdateMetadata`/`Approve`/`Reject` с согласованными результатами. Сохранить атомарность смены статуса, квот и метаданных решения. Интеграционный тест реальной БД обязателен для изменений транзакций.
+
+Выделить персонализацию каталога из HTTP Handler в самостоятельный объект; DTO и playback получают его при сборке. Конкретные зависимости в composition root (`main.go`, `server/router.go`) нормальны, массовое оборачивание всех конструкторов интерфейсами пользы не даст.
+
+### Performance / Correctness
+
+Новые подтверждённые runtime-дефекты и измеренные проблемы производительности этим исследованием не установлены. Размер SQL-запроса или исходника не считается доказательством медленной работы. Метрики качества рекомендаций и сетевого воспроизведения не измерялись.
+
+## Phase 2: Logical Consistency
+
+Целевой путь backend: HTTP handler → операция приложения → узкие порты → PostgreSQL/файлы/HTTP. Границы транзакций остаются явными. Межмодульные операции используют контракты потребителя; read-модели могут сохранять обоснованные JOIN.
+
+Целевой путь клиента: UI → фасад плеера/feature → общие правила → платформенный адаптер. Для каждого состояния нужен один владелец. На Android владельцем воспроизводимой очереди остаётся native player; общий core не становится второй конкурирующей очередью.
+
+Generated-типы оставить на HTTP-границах. Не создавать копии всех DTO ради формального разделения слоёв. Независимую модель вводить там, где правило использует небольшой стабильный набор полей.
+
+## Phase 3: UI/UX
+
+`apps/web/src/pages/admin/UploadQueuePage.tsx` содержит экран, строку очереди, пакетное редактирование, редактирование файла, отклонение и настройки загрузок (`:30`, `:205`, `:353`, `:422`, `:503`, `:542`), всего 640 строк. Настройки экспортируются из файла страницы очереди, сетевые вызовы находятся в компонентах.
+
+Вынести в `features/uploads`: API/queries, экран очереди, отдельные диалоги, настройки. Странице оставить сборку. Сохранять ключи React Query и правила invalidation; единый большой `useUploadsEverything` лишь переместит проблему.
+
+Новых визуальных и accessibility-дефектов не заявлено: браузерная проверка не проводилась. Закрытые задачи мобильного UI из прошлого ревью не дублировались.
+
+## Порядок внедрения и условия готовности
+
+1. **Навигация и достоверность.** Короткие инструкции по областям, актуальная архитектура, карта локальных проверок. Для типовой задачи понятны 2–5 начальных файлов и команды без чтения всех docs. Это ориентир, а не запрет на более широкий поиск.
+2. **Упростить Player, сохранив фасад.** Сначала persistence/media/analysis; отдельно engine/crossfade. Проверки: restore без autoplay, ошибка preload и повтор Play, пауза/seek, очистка обработчиков. Существующие тесты сохранить; новые нужны для поведения на новой границе.
+3. **Общая политика волны.** Сначала зафиксировать сценарии, затем подключать web и Android по отдельности. Проверки: поздний ответ после смены сессии, retry feedback, refresh очереди, ранний skip. На устройстве — background playback и offline→online.
+4. **Uploads.** Сначала выделить persistence-операции с сохранением транзакций, затем placement и worker-порты. Проверки: конкурирующие решения, квота, повторный import, восстановление после рестарта, очистка staging; результат на реальной БД и файловые побочные эффекты.
+5. **Library / playback / catalog.** Разделить use cases и убрать DTO→HTTP Handler из персонализации. Сохранить HTTP-контракт, подписи stream URL и поведение X-Accel. Проверять персонализацию батча, реакции, history/state и fallback wave.
+6. **Локализация UI и закрепление границ.** Разделить uploads feature. Добавить автоматическую проверку запрещённых зависимостей с точными исключениями для composition root и проекций. Отложить дробление auth до изменения соответствующей функциональности.
+
+Каждый шаг — отдельное ревьюируемое изменение. Сначала выделение границ без изменения поведения, затем новые возможности. Generated-файлы обновлять штатными генераторами; публичный OpenAPI не дробить до появления измеримой проблемы и готового процесса сборки спецификации.
+
+## Как проверить экономию
+
+Взять сравнимые задачи до/после: изменение порога волны на обоих клиентах, изменение правила размещения upload, добавление поля настроек загрузок. Не сравнивать эти разные задачи между собой; фиксировать модель, режим рассуждения и применённые навыки.
+
+Для каждой записывать input/cached input/output tokens, если доступны; отдельно число прочитанных файлов, объём вывода инструментов, повторные чтения, итерации исправлений, длительность проверок и затронутые модули. Сопоставлять распределение нескольких задач, а не один удачный запуск.
+
+Немедленные меры: `rg` по символам, чтение диапазонов, ограниченный вывод, исключение generated/lock из общего исследования, целевые проверки на промежуточных шагах и необходимые полные проверки перед сдачей. Крупные patch/diff тоже читать сначала без generated, затем отдельно проверять генерацию.
+
+Выбор workflow влияет независимо от кода: полный аудит полезен для такого исследования, но запуск всех его фаз на маленькой правке добавляет работы. Большой каталог навыков, системные инструкции и история чата также могут занимать контекст; их вклад и кэширование не измерены и не устраняются рефакторингом приложения.
+
+## Tasks
+
+Перенесено: 0. Новых задач: 8. Порядок — ожидаемая польза для локальности изменений; сроки и проценты экономии не оценивались.
+
+- [x] 1. [CodeQuality] Добавить короткую карту работы агентов: области, точки входа, источники истины и целевые проверки; новые локальные AGENTS держать компактными — `README.md` line 36.
+- [x] 2. [Logic] Привести архитектуру к реализации, явно отделить планы River/sqlc/internal specs — `docs/architecture.md` line 123.
+- [x] 3. [SOLID] Сохранить Player как фасад, выделить persistence/media/analysis/audio с независимыми зависимостями и проверками поведения — `apps/web/src/player/player.ts` line 84.
+- [x] 4. [SOLID] Вынести общую политику wave/feedback/refill в core, сохранив платформенные очереди и офлайн-адаптацию; покрыть смену сессии и retry — `apps/web/src/player/player.ts` line 255; `apps/mobile/src/player/controller.ts` line 375.
+- [x] 5. [SOLID] Убрать SQL/pgx из uploads use cases, выделить атомарные persistence-операции и узкие порты библиотеки/сканера, сохранить квоты и статусные переходы — `services/api/internal/uploads/service.go` line 328.
+- [x] 6. [SOLID] Разделить управление источниками, шаблоны и расписание сканов по обязанностям и зависимостям — `services/api/internal/library/service.go` line 49.
+- [x] 7. [SOLID] Выделить персонализацию из playback Handler, убрать циклическую сборку DTO через замыкание, постепенно отделить playback use cases от HTTP — `services/api/cmd/api/main.go` line 157; `services/api/internal/playback/handler.go` line 37.
+- [x] 8. [CodeQuality] Вынести uploads API/queries, диалоги и настройки в feature-модули с локальными тестами, оставить странице композицию — `apps/web/src/pages/admin/UploadQueuePage.tsx` line 30.
+
+
+## Исправления — 2026-10-22
+
+Реализованы все 8 задач по коду; внешняя проверка PostgreSQL и физического Android остаётся отдельным условием валидации. Исходные метрики и ссылки выше описывают состояние до исправлений.
+
+1. Добавлены компактные корневой и локальные `AGENTS.md`; README ссылается на карту работы. Общая инструкция не загружает всю документацию.
+2. Архитектура описывает реальные pgx-запросы, in-process scanner и статусные upload jobs; River/sqlc/internal YAML отделены от реализации. Добавлена актуальная карта компонентов.
+3. Player сохраняет прежний интерфейс, а аудиограф/элементы, анализ, Media Session/Tauri и сохранение выделены в `engine.ts`, `analysis.ts`, `media.ts`, `persistence.ts`. Типы состояния отделены. Обработчики аудио и media освобождаются, отложенное сохранение отменяется при dispose. Player: 896 → 617 строк; crossfade и оркестрация очереди остаются в фасаде.
+4. `WaveCoordinator` в core обслуживает пороги, feedback и версии запросов на обеих платформах. Поздние ответы/ошибки не меняют новую сессию; смена контекста сохраняет ещё не отправленный feedback. На Android добавлены проверки Controller после reset и ручного выбора списка, native queue остаётся владельцем воспроизведения.
+5. SQL и pgx убраны из uploads service/worker. `persistence.go` предоставляет атомарные операции изменения метаданных, решений и завершения импорта; транзакционный механизм Transition сохранён. Выделен PlacementPlanner и порты SourceCatalog/RootResolver/ImportedScanner. Guarded UPDATE теперь сообщает конфликт, если статус успел измениться. Добавлены integration-проверки rollback решения, конкурирующих отказов, quota и повторного завершения импорта; без PostgreSQL они не исполнялись.
+6. Library Service стал фасадом над SourceService, TemplateService, ScanService и Scheduler. Зависимости разделены интерфейсами. Результат health-check передаётся через канал, исключая общую запись из timeout и worker веток.
+7. Personalizer отделён от HTTP Handler, DTO собирается напрямую без замыкания. Приём событий выделен в EventService; остальные playback-сценарии остаются в существующем handler для постепенного дальнейшего разделения. Unit-тесты проверяют батч персонализации, недоступные треки и ошибки чтения.
+8. Страница очереди стала оболочкой из 3 строк; feature содержит экран (181 строка), отдельные диалоги, строки списка, настройки, API и queries. Ключи запросов и invalidation сохранены. Локальные тесты проверяют сохранение метаданных и сохранность формы при конфликте.
+
+Дополнительно: `pnpm check:boundaries` и отдельный CI workflow проверяют введённые границы без сборки всего проекта. Проверка целевая, не заменяет полноценный анализ графа импортов.
+
+### Проверки
+
+- Web typecheck и production build — успешно.
+- Web unit/component suite — 51 тест успешно; в том числе restore без autoplay, ошибки preload и новые диалоги.
+- Playwright — 10 сценариев успешно: desktop и mobile layouts, очередь/диалоги, навигация и плеер.
+- Core — 39 тестов успешно, включая 4 сценария WaveCoordinator.
+- Android typecheck — успешно; unit-тесты — 5 успешно, включая 2 сценария Controller с заглушкой native-плеера.
+- `go test ./...` и `go vet ./...` — успешно. Новые unit-тесты library/playback проходят.
+- Integration build — успешно; `TestMigrationsUpDownUp`, `TestLibraryAndUploads`, `TestPlaylistPersistenceAndIsolation`, `TestUserJourney` явно **SKIP**: не задан `TEST_DATABASE_URL`, Docker daemon недоступен. Результат не подтверждает транзакции на реальной БД.
+- Физический Android/background/offline→online не проверялся.
+- Публичный OpenAPI и generated-код не менялись. Экономия токенов после рефакторинга ещё не измерена.

package.json

@@ -6,6 +6,7 @@
     "node": ">=22"
   },
   "scripts": {
+    "check:boundaries": "node scripts/check-boundaries.mjs",
     "icons": "node scripts/generate-icons.mjs",
     "build": "turbo run build",
     "lint": "turbo run lint",

packages/api-client/src/generated/schema.ts

@@ -1225,8 +1225,9 @@ export interface paths {
             cookie?: never;
         };
         /**
-         * Онбординг вкуса — исполнители и жанры библиотеки для выбора
-         * @description `required` — показать онбординг: пользователь его не проходил и не пропускал, а своей истории почти нет.
+         * Анкета рекомендаций — варианты, сохранённые ответы и необходимость заполнения
+         * @description `required` — пользователь не проходил и не пропускал анкету либо администратор сбросил рекомендации.
+         *     `choice` содержит ответы с текущей приблизительной возрастной группой; исходная группа и год хранятся на сервере.
          */
         get: operations["getOnboarding"];
         put?: never;
@@ -1335,8 +1336,9 @@ export interface paths {
             cookie?: never;
         };
         /**
-         * Клиенты последнего релиза (Android и десктоп)
+         * Клиенты последних релизов (Android и десктоп)
          * @description Тот же релиз Gitea, что и для Android: APK, установщик Windows, .deb, DMG.
+         *     У каждой платформы `older` — предыдущие сборки (до 8 релизов, сколько есть с файлами).
          *     Нет настроек Gitea или файлов клиентов — `404 app.update_unavailable`.
          */
         get: operations["getAppClients"];
@@ -1471,6 +1473,7 @@ export interface components {
         };
         Onboarding: {
             required: boolean;
+            choice?: components["schemas"]["OnboardingChoice"];
             artists: {
                 /** Format: uuid */
                 id: string;
@@ -1486,6 +1489,15 @@ export interface components {
             }[];
         };
         OnboardingChoice: {
+            /** @enum {string|null} */
+            gender?: "male" | "female" | "other" | null;
+            /**
+             * @description Текущая приблизительная возрастная группа. Сервер хранит год выбора и учитывает прошедшие годы.
+             * @enum {string|null}
+             */
+            age_group?: "under_13" | "13_19" | "20_29" | "30_39" | "40_49" | "50_59" | "60_plus" | null;
+            /** @description Год последнего выбора возрастной группы. */
+            readonly age_group_year?: number;
             artist_ids: string[];
             genres: string[];
         };
@@ -2356,14 +2368,24 @@ export interface components {
         };
         /** @enum {string} */
         AppClient: "android" | "windows" | "linux" | "macos";
-        AppClientFile: {
-            client: components["schemas"]["AppClient"];
+        AppClientBuild: {
+            version: string;
             filename: string;
             /** Format: int64 */
             size: number;
             sha256?: string;
             download_url: string;
         };
+        AppClientFile: {
+            client: components["schemas"]["AppClient"];
+            version?: string;
+            filename: string;
+            /** Format: int64 */
+            size: number;
+            sha256?: string;
+            download_url: string;
+            older?: components["schemas"]["AppClientBuild"][];
+        };
         AppClients: {
             version: string;
             version_code: number;

packages/core/AGENTS.md

@@ -0,0 +1,6 @@
+# Общие правила клиентов
+
+- Очередь/учёт событий: `src/player.ts`; волна: `src/wave.ts`; сессия: `src/auth.ts`.
+- Не импортируй web, React Native или системные media API. Платформы передают IO через узкие порты.
+- Поздние ответы старой wave-сессии не меняют новую; feedback после ошибки возвращается только в ту же сессию.
+- `pnpm --filter @pipu/core test`, `pnpm --filter @pipu/core typecheck`; после изменения экспортов проверь web и mobile.

packages/core/src/index.ts

@@ -25,3 +25,7 @@ export { normalizeGain, TARGET_LUFS } from './gain';
 export { trackShareUrl } from './share';
 export { checkServer, normalizeServerUrl, type ServerCheck } from './server';
 export { initialWaveState, mix, rgb, rgba, step, WAVE_COLORS, waveScale, type Rgb, type WaveState } from './wave-anim';
+
+export { WaveCoordinator, EARLY_SKIP_MS, WAVE_REFILL_AT, type WaveInfo, type WaveOutcome, type WaveFeedback, type WaveGateway } from './wave';
+
+export { AGE_GROUPS, GENDERS } from './onboarding';

packages/core/src/onboarding.ts

@@ -0,0 +1,2 @@
+export const AGE_GROUPS = ['under_13', '13_19', '20_29', '30_39', '40_49', '50_59', '60_plus'] as const;
+export const GENDERS = ['male', 'female', 'other'] as const;

packages/core/src/wave.test.ts

@@ -0,0 +1,76 @@
+import { describe, expect, it, vi } from 'vitest';
+import { WaveCoordinator, type WaveFeedback } from './wave';
+
+function deferred<T>() {
+  let resolve!: (v: T) => void;
+  let reject!: (e: Error) => void;
+  const promise = new Promise<T>((yes, no) => { resolve = yes; reject = no; });
+  return { promise, resolve, reject };
+}
+
+describe('wave coordination', () => {
+  it('preserves unsent feedback when changing context in the same session', async () => {
+    const next = vi.fn().mockResolvedValue(1);
+    const wave = new WaveCoordinator<number>({ next });
+    wave.activate('a');
+    wave.note('track', 'like');
+    wave.changeContext('a');
+    await wave.refill(0, true, () => {});
+    expect(next).toHaveBeenCalledWith('a', [{ track_id: 'track', outcome: 'like' }]);
+  });
+  it('ignores late results and allows the new session to refill immediately', async () => {
+    const old = deferred<number>();
+    const next = vi.fn().mockReturnValueOnce(old.promise).mockResolvedValueOnce(2);
+    const wave = new WaveCoordinator<number>({ next });
+    const apply = vi.fn();
+    wave.activate('old');
+    const first = wave.refill(0, false, apply);
+    wave.activate('new');
+    await wave.refill(0, false, apply);
+    old.resolve(1);
+    await first;
+    expect(apply.mock.calls.map(([value]) => value)).toEqual([2]);
+  });
+
+  it('retries feedback in order and respects threshold, refresh and single in-flight request', async () => {
+    const request = deferred<number>();
+    const next = vi.fn().mockReturnValueOnce(request.promise).mockResolvedValueOnce(2);
+    const wave = new WaveCoordinator<number>({ next });
+    const apply = vi.fn();
+    wave.activate('a');
+    wave.note('one', 'skip_early');
+    await wave.refill(3, false, apply);
+    expect(next).not.toHaveBeenCalled();
+    const first = wave.refill(3, true, apply);
+    wave.note('two', 'like');
+    await wave.refill(0, false, apply);
+    expect(next).toHaveBeenCalledTimes(1);
+    request.reject(new Error('offline'));
+    await first;
+    await wave.refill(2, false, apply);
+    expect(next.mock.calls[1]).toEqual(['a', [
+      { track_id: 'one', outcome: 'skip_early' }, { track_id: 'two', outcome: 'like' },
+    ] satisfies WaveFeedback[]]);
+    expect(apply).toHaveBeenCalledTimes(1);
+  });
+
+  it('does not restore old feedback or clear a newer in-flight request after a stale failure', async () => {
+    const old = deferred<number>();
+    const fresh = deferred<number>();
+    const next = vi.fn().mockReturnValueOnce(old.promise).mockReturnValueOnce(fresh.promise);
+    const wave = new WaveCoordinator<number>({ next });
+    wave.activate('a');
+    wave.note('old', 'dislike');
+    const first = wave.refill(0, false, () => {});
+    wave.activate('a'); // same session, new context
+    wave.note('new', 'like');
+    const second = wave.refill(0, false, () => {});
+    old.reject(new Error('late failure'));
+    await first;
+    await wave.refill(0, false, () => {});
+    expect(next).toHaveBeenCalledTimes(2);
+    expect(next.mock.calls[1]?.[1]).toEqual([{ track_id: 'new', outcome: 'like' }]);
+    fresh.resolve(2);
+    await second;
+  });
+});

packages/core/src/wave.ts

@@ -0,0 +1,62 @@
+/** Policy shared by web and native players; queue ownership stays with the adapter. */
+export const EARLY_SKIP_MS = 30_000;
+export const WAVE_REFILL_AT = 2;
+export type WaveOutcome = 'complete' | 'skip' | 'skip_early' | 'like' | 'dislike';
+export interface WaveInfo {
+  sessionId: string;
+  activity: string | null;
+  mood: string | null;
+  fallback: boolean;
+}
+export interface WaveFeedback { track_id: string; outcome: WaveOutcome }
+export interface WaveGateway<T> {
+  next(sessionId: string, feedback: WaveFeedback[]): Promise<T>;
+}
+
+export class WaveCoordinator<T> {
+  private sessionId: string | null = null;
+  private generation = 0;
+  private pending: WaveFeedback[] = [];
+  private loading: number | null = null;
+
+  constructor(private readonly gateway: WaveGateway<T>) {}
+
+  get version() { return this.generation; }
+  isCurrent(version: number) { return version === this.generation; }
+
+  /** Also invalidates in-flight responses when the context changes within a session. */
+  activate(sessionId: string | null) {
+    this.sessionId = sessionId;
+    this.pending = [];
+    this.loading = null;
+    return ++this.generation;
+  }
+
+  changeContext(sessionId: string) {
+    const pending = this.sessionId === sessionId ? this.pending : [];
+    const version = this.activate(sessionId);
+    this.pending = pending;
+    return version;
+  }
+
+  note(trackId: string, outcome: WaveOutcome) {
+    if (this.sessionId) this.pending.push({ track_id: trackId, outcome });
+  }
+
+  async refill(remaining: number, refresh: boolean, apply: (result: T, current: () => boolean) => void | Promise<void>) {
+    const id = this.sessionId;
+    const version = this.generation;
+    if (!id || this.loading === version || (!refresh && remaining > WAVE_REFILL_AT)) return;
+    this.loading = version;
+    const feedback = this.pending;
+    this.pending = [];
+    try {
+      const result = await this.gateway.next(id, feedback);
+      if (this.isCurrent(version)) await apply(result, () => this.isCurrent(version));
+    } catch {
+      if (this.isCurrent(version)) this.pending = [...feedback, ...this.pending];
+    } finally {
+      if (this.loading === version) this.loading = null;
+    }
+  }
+}

packages/i18n/locales/en/auth.json

@@ -40,6 +40,7 @@
     },
     "version": "version {{version}}",
     "other": "Other platforms",
+    "older": "Previous versions",
     "step_install": {
       "android": "Open the downloaded file. If Android asks, allow installs from this source.",
       "windows": "Run the installer and follow the steps. pipu will appear in the Start menu.",

packages/i18n/locales/en/common.json

@@ -27,6 +27,7 @@
     "en": "English"
   },
   "nav": {
+    "skip": "Skip to content",
     "more": "More",
     "main": "Navigation",
     "home": "Home",
@@ -96,7 +97,9 @@
     "source_queue": "Queue",
     "queue": "Queue",
     "source_wave_seed": "Artist wave · {{label}}",
-    "queue_wave": "The wave never ends: next tracks are picked as you listen"
+    "queue_wave": "The wave never ends: next tracks are picked as you listen",
+    "now_playing": "Now playing",
+    "expand": "Open player"
   },
   "settings": {
     "title": "Settings",
@@ -161,6 +164,8 @@
     "tracks": "Tracks",
     "all": "All",
     "nothing": "Nothing found",
+    "searching": "Searching…",
+    "type_query": "Type a query in the search field above",
     "corrected": "Showing results for “{{query}}”",
     "show_all": "All results",
     "title": "Search: {{query}}",
@@ -313,7 +318,26 @@
     "pick_more_one": "Pick {{count}} more artist",
     "pick_more_few": "Pick {{count}} more artists",
     "pick_more_many": "Pick {{count}} more artists",
-    "pick_more_other": "Pick {{count}} more artists"
+    "pick_more_other": "Pick {{count}} more artists",
+    "gender": "Gender",
+    "age_group": "Age group",
+    "unspecified": "Prefer not to say",
+    "edit": "Recommendation preferences",
+    "age_hint": "Your group will advance approximately from the year selected. You can correct it in your profile.",
+    "genders": {
+      "male": "Male",
+      "female": "Female",
+      "other": "Other"
+    },
+    "ages": {
+      "under_13": "До 13",
+      "13_19": "13–19",
+      "20_29": "20–29",
+      "30_39": "30–39",
+      "40_49": "40–49",
+      "50_59": "50–59",
+      "60_plus": "60+"
+    }
   },
   "playlists": {
     "name": "Name",

packages/i18n/locales/ru/auth.json

@@ -40,6 +40,7 @@
     },
     "version": "версия {{version}}",
     "other": "Другие платформы",
+    "older": "Предыдущие версии",
     "step_install": {
       "android": "Откройте скачанный файл. Если Android спросит — разрешите установку из этого источника.",
       "windows": "Запустите установщик и следуйте шагам. pipu появится в меню Пуск.",

packages/i18n/locales/ru/common.json

@@ -27,6 +27,7 @@
     "en": "English"
   },
   "nav": {
+    "skip": "К содержимому",
     "more": "Ещё",
     "main": "Навигация",
     "home": "Главная",
@@ -96,7 +97,9 @@
     "source_queue": "Очередь",
     "queue": "Очередь",
     "source_wave_seed": "Волна по исполнителю · {{label}}",
-    "queue_wave": "Волна бесконечна: следующие треки подбираются по ходу прослушивания"
+    "queue_wave": "Волна бесконечна: следующие треки подбираются по ходу прослушивания",
+    "now_playing": "Сейчас играет",
+    "expand": "Открыть плеер"
   },
   "settings": {
     "title": "Настройки",
@@ -161,6 +164,8 @@
     "tracks": "Треки",
     "all": "Всё",
     "nothing": "Ничего не нашли",
+    "searching": "Ищем…",
+    "type_query": "Введите запрос в поиске сверху",
     "corrected": "Показаны результаты для «{{query}}»",
     "show_all": "Все результаты",
     "title": "Поиск: {{query}}",
@@ -313,7 +318,26 @@
     "pick_more_one": "Выберите ещё {{count}} исполнителя",
     "pick_more_few": "Выберите ещё {{count}} исполнителя",
     "pick_more_many": "Выберите ещё {{count}} исполнителей",
-    "pick_more_other": "Выберите ещё {{count}} исполнителя"
+    "pick_more_other": "Выберите ещё {{count}} исполнителя",
+    "gender": "Пол",
+    "age_group": "Возрастная группа",
+    "unspecified": "Не указывать",
+    "edit": "Настроить рекомендации",
+    "age_hint": "Группа будет обновляться приблизительно с учётом года выбора. Её можно исправить в профиле.",
+    "genders": {
+      "male": "Мужской",
+      "female": "Женский",
+      "other": "Другой"
+    },
+    "ages": {
+      "under_13": "До 13",
+      "13_19": "13–19",
+      "20_29": "20–29",
+      "30_39": "30–39",
+      "40_49": "40–49",
+      "50_59": "50–59",
+      "60_plus": "60+"
+    }
   },
   "playlists": {
     "name": "Название",

scripts/check-boundaries.mjs

@@ -0,0 +1,47 @@
+import { readdirSync, readFileSync } from 'node:fs';
+import { resolve, relative } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const root = fileURLToPath(new URL('../', import.meta.url));
+function sources(dir, extension) {
+  return readdirSync(resolve(root, dir), { withFileTypes: true }).flatMap((entry) => {
+    const path = `${dir}/${entry.name}`;
+    return entry.isDirectory() ? sources(path, extension) : path.endsWith(extension) ? [path] : [];
+  });
+}
+
+// Check the boundaries introduced by the refactor. Existing query projections and
+// composition roots are deliberately outside these use-case-specific rules.
+const rules = [
+  {
+    files: sources('packages/core/src', '.ts'),
+    forbidden: /(?:from\s*|import\s*)['"](?:[^'"]*apps\/|(?:@react-native[^'"]*|react(?:-native)?(?:[-\/]|['"]))|expo(?:[-\/]|['"])|\.\.[^'"]*(?:web|mobile|desktop)\/)/,
+    message: 'core must not import platform/UI implementations',
+  },
+  {
+    files: ['service.go', 'worker.go', 'placement.go', 'batch.go'].map((p) => `services/api/internal/uploads/${p}`),
+    forbidden: /github\.com\/jackc\/pgx|\.store\.pool\b|\b(?:tx|pool)\.(?:Exec|Query|QueryRow)\(/,
+    message: 'upload SQL and pgx belong in store/persistence adapters',
+  },
+  {
+    files: sources('apps/web/src/features/uploads', '.tsx').filter((p) => !p.endsWith('/common.tsx')),
+    forbidden: /\b(?:session|client)\.(?:GET|POST|PUT|PATCH|DELETE)\(/,
+    message: 'upload views must use feature API/queries',
+  },
+];
+
+const errors = [];
+for (const rule of rules) {
+  for (const path of rule.files) {
+    const text = readFileSync(resolve(root, path), 'utf8');
+    text.split(/\r?\n/).forEach((line, i) => {
+      if (rule.forbidden.test(line)) errors.push(`${relative(root, resolve(root, path))}:${i + 1}: ${rule.message}`);
+    });
+  }
+}
+if (errors.length) {
+  console.error(errors.join('\n'));
+  process.exitCode = 1;
+} else {
+  console.log('Module boundary checks passed.');
+}

scripts/release.mjs

@@ -4,6 +4,7 @@
 //   node scripts/release.mjs create                          — создать релиз по тегу (при перезапуске — обновить)
 //   node scripts/release.mjs android building|failure|cancelled — статус сборки APK в тексте релиза
 //   node scripts/release.mjs android success <file.apk>      — приложить APK и .sha256, статус «собран»
+//   node scripts/release.mjs prune                           — файлы только у последних 8 релизов, старые прогоны Actions
 // Окружение: GITEA_API (<server>/api/v1/repos/<owner>/<repo>), GITEA_TOKEN, TAG, VERSION, VERSION_CODE,
 // PRERELEASE (true|false), GITHUB_RUN_ID; для success — SIGNING (release|debug).
 // PUBLIC_URL — внешний адрес Gitea для ссылок в тексте (job ходит в API по внутреннему адресу, и html_url
@@ -30,6 +31,10 @@ const COMMIT_RE = /^(\w+)(?:\(([^)]+)\))?(!)?:\s*(.+)$/;
 export const STATUS_START = '<!-- android-status -->';
 export const STATUS_END = '<!-- /android-status -->';
 export const DESKTOP_PLATFORMS = ['linux', 'windows'];
+/** Сколько последних опубликованных релизов оставляем с файлами (APK, .deb, NSIS). */
+export const KEEP_RELEASE_FILES = 8;
+/** Сколько последних прогонов Actions оставляем (логи/статусы). */
+export const KEEP_ACTION_RUNS = 8;
 
 export function desktopStatusMarks(platform) {
   if (!DESKTOP_PLATFORMS.includes(platform)) throw new Error(`unknown desktop platform: ${platform}`);
@@ -194,6 +199,35 @@ export function renderNotes({
   return out.join('\n');
 }
 
+function publishedAt(item) {
+  return Date.parse(item.published_at || item.created_at || item.started_at || 0);
+}
+
+/** Релизы, с которых снимаем вложения: черновики не трогаем, текущий тег всегда оставляем. */
+export function staleReleases(releases, { keep = KEEP_RELEASE_FILES, currentTag } = {}) {
+  const published = releases.filter((r) => !r.draft);
+  published.sort((a, b) => publishedAt(b) - publishedAt(a));
+  const keepIds = new Set(published.slice(0, keep).map((r) => r.id));
+  const current = published.find((r) => r.tag_name === currentTag);
+  if (current) keepIds.add(current.id);
+  return published.filter((r) => !keepIds.has(r.id) && (r.assets?.length ?? 0) > 0);
+}
+
+/** Завершённые прогоны Actions, которые можно удалить (текущий прогон не трогаем). */
+export function staleActionRuns(runs, { keep = KEEP_ACTION_RUNS, currentRunId } = {}) {
+  const done = runs.filter((r) => r.status === 'completed' && String(r.id) !== String(currentRunId ?? ''));
+  done.sort((a, b) => publishedAt(b) - publishedAt(a));
+  const keepIds = new Set(done.slice(0, keep).map((r) => r.id));
+  return done.filter((r) => !keepIds.has(r.id));
+}
+
+function actionRunsFrom(body) {
+  if (Array.isArray(body)) return body;
+  if (Array.isArray(body?.workflow_runs)) return body.workflow_runs;
+  if (Array.isArray(body?.runs)) return body.runs;
+  return [];
+}
+
 // ---------------------------------------------------------------------------------------------------------
 // CLI
 
@@ -270,6 +304,41 @@ async function create() {
   console.log(`${release ? 'обновлён' : 'создан'} релиз ${saved.html_url}`);
 }
 
+async function listPages(path, itemsOf) {
+  const all = [];
+  for (let page = 1; page <= 40; page += 1) {
+    const sep = path.includes('?') ? '&' : '?';
+    const body = await api('GET', `${path}${sep}limit=50&page=${page}`);
+    const batch = itemsOf(body);
+    if (!batch.length) break;
+    all.push(...batch);
+    if (batch.length < 50) break;
+  }
+  return all;
+}
+
+async function prune() {
+  const tag = process.env.TAG;
+  const currentRunId = process.env.GITHUB_RUN_ID;
+  const releases = await listPages('/releases', (body) => (Array.isArray(body) ? body : []));
+  let files = 0;
+  for (const rel of staleReleases(releases, { currentTag: tag })) {
+    for (const a of rel.assets ?? []) {
+      await api('DELETE', `/releases/${rel.id}/assets/${a.id}`);
+      files += 1;
+      console.log(`удалён файл ${rel.tag_name}/${a.name}`);
+    }
+  }
+  const runs = await listPages('/actions/runs', actionRunsFrom);
+  let statuses = 0;
+  for (const run of staleActionRuns(runs, { currentRunId })) {
+    await api('DELETE', `/actions/runs/${run.id}`);
+    statuses += 1;
+    console.log(`удалён прогон Actions ${run.id} (${run.path ?? run.name ?? run.event ?? ''})`);
+  }
+  console.log(`очистка: файлов ${files}, прогонов ${statuses}`);
+}
+
 async function upload(release, file) {
   const name = basename(file);
   for (const old of release.assets ?? []) {
@@ -331,8 +400,9 @@ async function main() {
   if (cmd === 'desktop' && DESKTOP_PLATFORMS.includes(args[0]) && ['building', 'success', 'failure', 'cancelled'].includes(args[1])) {
     return desktop(args[0], args[1], args.slice(2));
   }
+  if (cmd === 'prune') return prune();
   throw new Error(
-    'использование: release.mjs create | android building|failure|cancelled | android success <file.apk> | desktop linux|windows building|failure|cancelled | desktop linux|windows success <file...>',
+    'использование: release.mjs create | android building|failure|cancelled | android success <file.apk> | desktop linux|windows building|failure|cancelled | desktop linux|windows success <file...> | prune',
   );
 }
 

scripts/release.test.mjs

@@ -9,6 +9,8 @@ import {
   replaceAndroidStatus,
   replaceDesktopStatus,
   desktopStatusMarks,
+  staleActionRuns,
+  staleReleases,
   STATUS_END,
   STATUS_START,
 } from './release.mjs';
@@ -131,6 +133,39 @@ test('release notes', () => {
   assert.doesNotMatch(notes, /Предварительная версия/);
 });
 
+test('keeps files on the newest eight releases', () => {
+  const releases = Array.from({ length: 10 }, (_, i) => ({
+    id: i + 1,
+    tag_name: `v1.0.${i}`,
+    draft: false,
+    published_at: `2026-01-${String(i + 1).padStart(2, '0')}T00:00:00Z`,
+    assets: i === 0 ? [] : [{ id: 100 + i, name: `a${i}.apk` }],
+  }));
+  const stale = staleReleases(releases, { keep: 8, currentTag: 'v1.0.9' });
+  assert.deepEqual(
+    stale.map((r) => r.tag_name).sort(),
+    ['v1.0.1'],
+  );
+});
+
+test('does not delete the current Actions run or unfinished jobs', () => {
+  const runs = [
+    { id: 20, status: 'completed', created_at: '2026-01-20T00:00:00Z' },
+    { id: 19, status: 'in_progress', created_at: '2026-01-19T00:00:00Z' },
+    ...Array.from({ length: 12 }, (_, i) => ({
+      id: i + 1,
+      status: 'completed',
+      created_at: `2026-01-${String(i + 1).padStart(2, '0')}T00:00:00Z`,
+    })),
+  ];
+  const stale = staleActionRuns(runs, { keep: 8, currentRunId: 20 });
+  assert.equal(stale.some((r) => r.id === 20 || r.id === 19), false);
+  assert.deepEqual(
+    stale.map((r) => r.id).sort((a, b) => a - b),
+    [1, 2, 3, 4],
+  );
+});
+
 test('release notes for a first prerelease without changes', () => {
   const notes = renderNotes({
     version: '0.1.0-rc.1',

services/api/AGENTS.md

@@ -0,0 +1,9 @@
+# Go API
+
+- Сборка зависимостей: `cmd/api/main.go`; маршрутизация: `internal/server/router.go`. Конкретные адаптеры здесь допустимы.
+- HTTP-типы: `internal/api/gen`; исходный контракт: корневой `api/openapi.yaml`. Генерация: `go generate ./...`.
+- Области: `auth`, `library`, `uploads`, `playback`, `wave`, `search`, `genius`. Начинай с handler → операция → store затронутого сценария.
+- SQL и pgx-транзакции принадлежат persistence-адаптерам. Смена статуса upload, reviewer metadata и квота должны сохранять атомарность. Read-проекции могут объединять таблицы модулей.
+- Целевая проверка: `go test ./internal/<module>/...`; перед сдачей Go-рефакторинга: `go test ./...`, `go vet ./...`.
+- PostgreSQL integration: `TEST_DATABASE_URL` и `go test -tags integration ./internal/dbtest ./internal/playback`. E2E API: `go test -tags integration ./cmd/api` (проверь заголовок теста/переменные окружения).
+- Сканер работает внутри процесса; upload jobs используют статусы PostgreSQL и worker loops. River/sqlc сейчас не используются.

services/api/cmd/api/e2e_test.go

@@ -29,6 +29,7 @@ import (
 	"github.com/redis/go-redis/v9"
 	"github.com/stretchr/testify/require"
 
+	"pipu/api/internal/api/gen"
 	"pipu/api/internal/library"
 	"pipu/api/internal/library/meta"
 	"pipu/api/internal/platform/config"
@@ -281,17 +282,41 @@ func TestUserJourney(t *testing.T) {
 
 	// 7½. Онбординг: варианты из библиотеки, выбор сохраняется, второй раз не предлагается.
 	var onb struct {
-		Required bool `json:"required"`
+		Choice   *gen.OnboardingChoice `json:"choice"`
+		Required bool                  `json:"required"`
 		Artists  []struct {
 			ID string `json:"id"`
 		} `json:"artists"`
 	}
 	c.ok("GET", "/api/v1/onboarding", nil, &onb)
 	require.NotEmpty(t, onb.Artists)
-	c.ok("PUT", "/api/v1/me/onboarding", map[string]any{"artist_ids": []string{onb.Artists[0].ID}, "genres": []string{}}, nil)
+	c.ok("PUT", "/api/v1/me/onboarding", map[string]any{"artist_ids": []string{onb.Artists[0].ID}, "genres": []string{}, "gender": "male", "age_group": "13_19", "age_group_year": 1900}, nil)
 	c.ok("GET", "/api/v1/onboarding", nil, &onb)
 	require.False(t, onb.Required)
 
+	require.NotNil(t, onb.Choice)
+	require.Equal(t, gen.Male, *onb.Choice.Gender)
+	require.Equal(t, gen.N1319, *onb.Choice.AgeGroup)
+	require.Greater(t, *onb.Choice.AgeGroupYear, 1900, "client cannot forge the selection year")
+	_, err = pool.Exec(ctx, `UPDATE user_profiles_rec SET onboarding = jsonb_set(onboarding,
+        '{age_group_year}', to_jsonb(EXTRACT(YEAR FROM CURRENT_DATE)::int - 20)) WHERE user_id = $1`, tokens.User.ID)
+	require.NoError(t, err)
+	c.ok("GET", "/api/v1/onboarding", nil, &onb)
+	require.Equal(t, gen.N3039, *onb.Choice.AgeGroup, "13–19 twenty years ago is approximately 30–39 now")
+	originalYear := *onb.Choice.AgeGroupYear
+	c.ok("PUT", "/api/v1/me/onboarding", onb.Choice, nil)
+	c.ok("GET", "/api/v1/onboarding", nil, &onb)
+	require.Equal(t, originalYear, *onb.Choice.AgeGroupYear, "editing tastes preserves the age anchor")
+	require.Equal(t, gen.N3039, *onb.Choice.AgeGroup)
+	c.ok("POST", "/api/v1/admin/users/"+tokens.User.ID+"/reset-recommendations", nil, nil)
+	onb.Choice = nil
+	c.ok("GET", "/api/v1/onboarding", nil, &onb)
+	require.True(t, onb.Required)
+	require.Nil(t, onb.Choice, "all onboarding answers are cleared")
+	c.ok("PUT", "/api/v1/me/onboarding", map[string]any{"artist_ids": []string{}, "genres": []string{}}, nil)
+	c.ok("GET", "/api/v1/onboarding", nil, &onb)
+	require.False(t, onb.Required, "skip is remembered")
+
 	// 8. «Моя волна»: рекомендатель недоступен — запасная волна из библиотеки.
 	var wave struct {
 		SessionID string  `json:"session_id"`

services/api/cmd/api/main.go

@@ -154,10 +154,10 @@ func newApp(ctx context.Context, cfg config.API, pool *pgxpool.Pool, rdb *redis.
 		}
 		return libSvc.Root(src)
 	}
-	var dto library.DTO
-	pb := playback.NewHandler(playback.NewStore(pool), libStore, func() library.DTO { return dto }, signer, transcoder,
+	pbStore := playback.NewStore(pool)
+	dto := library.DTO{Signer: signer, Personal: playback.NewPersonalizer(pbStore, signer)}
+	pb := playback.NewHandler(pbStore, libStore, dto, signer, transcoder,
 		rootFor, cfg.XAccel, log)
-	dto = library.DTO{Signer: signer, Personal: pb}
 	libSvc.OnCatalogChanged = indexer.Trigger
 	indexer.Trigger() // индекс мог отстать (новая версия, сбой Meilisearch) — пересобираем при старте
 	go libSvc.Restore(ctx)
@@ -169,7 +169,7 @@ func newApp(ctx context.Context, cfg config.API, pool *pgxpool.Pool, rdb *redis.
 	upSvc.Run(ctx)
 
 	wh := wave.NewHandler(pool, &wave.Recommender{URL: cfg.RecommenderURL, Token: cfg.InternalToken,
-		Client: &http.Client{}}, libStore, func() library.DTO { return dto }, log)
+		Client: &http.Client{}}, libStore, dto, log)
 	wh.Warm = pb.Prewarm
 	return server.NewRouter(server.Deps{
 		Genius:      genius.NewHandler(geniusSvc),

services/api/internal/api/gen/api.gen.go

@@ -53,6 +53,24 @@ const (
 	HealthStatusStatusOk HealthStatusStatus = "ok"
 )
 
+// Defines values for OnboardingChoiceAgeGroup.
+const (
+	N1319   OnboardingChoiceAgeGroup = "13_19"
+	N2029   OnboardingChoiceAgeGroup = "20_29"
+	N3039   OnboardingChoiceAgeGroup = "30_39"
+	N4049   OnboardingChoiceAgeGroup = "40_49"
+	N5059   OnboardingChoiceAgeGroup = "50_59"
+	N60Plus OnboardingChoiceAgeGroup = "60_plus"
+	Under13 OnboardingChoiceAgeGroup = "under_13"
+)
+
+// Defines values for OnboardingChoiceGender.
+const (
+	Female OnboardingChoiceGender = "female"
+	Male   OnboardingChoiceGender = "male"
+	Other  OnboardingChoiceGender = "other"
+)
+
 // Defines values for PlayEventContextType.
 const (
 	PlayEventContextTypeAlbum      PlayEventContextType = "album"
@@ -337,13 +355,24 @@ type AndroidRelease struct {
 // AppClient defines model for AppClient.
 type AppClient string
 
+// AppClientBuild defines model for AppClientBuild.
+type AppClientBuild struct {
+	DownloadUrl string  `json:"download_url"`
+	Filename    string  `json:"filename"`
+	Sha256      *string `json:"sha256,omitempty"`
+	Size        int64   `json:"size"`
+	Version     string  `json:"version"`
+}
+
 // AppClientFile defines model for AppClientFile.
 type AppClientFile struct {
-	Client      AppClient `json:"client"`
-	DownloadUrl string    `json:"download_url"`
-	Filename    string    `json:"filename"`
-	Sha256      *string   `json:"sha256,omitempty"`
-	Size        int64     `json:"size"`
+	Client      AppClient         `json:"client"`
+	DownloadUrl string            `json:"download_url"`
+	Filename    string            `json:"filename"`
+	Older       *[]AppClientBuild `json:"older,omitempty"`
+	Sha256      *string           `json:"sha256,omitempty"`
+	Size        int64             `json:"size"`
+	Version     *string           `json:"version,omitempty"`
 }
 
 // AppClients defines model for AppClients.
@@ -592,6 +621,7 @@ type Onboarding struct {
 		Name       string             `json:"name"`
 		TrackCount int                `json:"track_count"`
 	} `json:"artists"`
+	Choice *OnboardingChoice `json:"choice,omitempty"`
 	Genres []struct {
 		Name       string `json:"name"`
 		TrackCount int    `json:"track_count"`
@@ -601,10 +631,22 @@ type Onboarding struct {
 
 // OnboardingChoice defines model for OnboardingChoice.
 type OnboardingChoice struct {
-	ArtistIds []openapi_types.UUID `json:"artist_ids"`
-	Genres    []string             `json:"genres"`
+	// AgeGroup Текущая приблизительная возрастная группа. Сервер хранит год выбора и учитывает прошедшие годы.
+	AgeGroup *OnboardingChoiceAgeGroup `json:"age_group"`
+
+	// AgeGroupYear Год последнего выбора возрастной группы.
+	AgeGroupYear *int                    `json:"age_group_year,omitempty"`
+	ArtistIds    []openapi_types.UUID    `json:"artist_ids"`
+	Gender       *OnboardingChoiceGender `json:"gender"`
+	Genres       []string                `json:"genres"`
 }
 
+// OnboardingChoiceAgeGroup Текущая приблизительная возрастная группа. Сервер хранит год выбора и учитывает прошедшие годы.
+type OnboardingChoiceAgeGroup string
+
+// OnboardingChoiceGender defines model for OnboardingChoice.Gender.
+type OnboardingChoiceGender string
+
 // PathPattern defines model for PathPattern.
 type PathPattern struct {
 	IsEnabled bool   `json:"is_enabled"`
@@ -1778,7 +1820,7 @@ type ServerInterface interface {
 	// Последняя версия Android-приложения (из релизов Gitea через сервер)
 	// (GET /api/v1/app/android/latest)
 	GetAndroidLatest(w http.ResponseWriter, r *http.Request)
-	// Клиенты последнего релиза (Android и десктоп)
+	// Клиенты последних релизов (Android и десктоп)
 	// (GET /api/v1/app/clients)
 	GetAppClients(w http.ResponseWriter, r *http.Request)
 	// Файл клиента (кэшируется на сервере, поддерживает Range)
@@ -1871,7 +1913,7 @@ type ServerInterface interface {
 	// Завершить сессию на устройстве
 	// (DELETE /api/v1/me/sessions/{id})
 	RevokeMySession(w http.ResponseWriter, r *http.Request, id openapi_types.UUID)
-	// Онбординг вкуса — исполнители и жанры библиотеки для выбора
+	// Анкета рекомендаций — варианты, сохранённые ответы и необходимость заполнения
 	// (GET /api/v1/onboarding)
 	GetOnboarding(w http.ResponseWriter, r *http.Request)
 	// Страница поиска
@@ -2163,7 +2205,7 @@ func (_ Unimplemented) GetAndroidLatest(w http.ResponseWriter, r *http.Request)
 	w.WriteHeader(http.StatusNotImplemented)
 }
 
-// Клиенты последнего релиза (Android и десктоп)
+// Клиенты последних релизов (Android и десктоп)
 // (GET /api/v1/app/clients)
 func (_ Unimplemented) GetAppClients(w http.ResponseWriter, r *http.Request) {
 	w.WriteHeader(http.StatusNotImplemented)
@@ -2344,7 +2386,7 @@ func (_ Unimplemented) RevokeMySession(w http.ResponseWriter, r *http.Request, i
 	w.WriteHeader(http.StatusNotImplemented)
 }
 
-// Онбординг вкуса — исполнители и жанры библиотеки для выбора
+// Анкета рекомендаций — варианты, сохранённые ответы и необходимость заполнения
 // (GET /api/v1/onboarding)
 func (_ Unimplemented) GetOnboarding(w http.ResponseWriter, r *http.Request) {
 	w.WriteHeader(http.StatusNotImplemented)
@@ -8200,7 +8242,7 @@ type StrictServerInterface interface {
 	// Последняя версия Android-приложения (из релизов Gitea через сервер)
 	// (GET /api/v1/app/android/latest)
 	GetAndroidLatest(ctx context.Context, request GetAndroidLatestRequestObject) (GetAndroidLatestResponseObject, error)
-	// Клиенты последнего релиза (Android и десктоп)
+	// Клиенты последних релизов (Android и десктоп)
 	// (GET /api/v1/app/clients)
 	GetAppClients(ctx context.Context, request GetAppClientsRequestObject) (GetAppClientsResponseObject, error)
 	// Файл клиента (кэшируется на сервере, поддерживает Range)
@@ -8293,7 +8335,7 @@ type StrictServerInterface interface {
 	// Завершить сессию на устройстве
 	// (DELETE /api/v1/me/sessions/{id})
 	RevokeMySession(ctx context.Context, request RevokeMySessionRequestObject) (RevokeMySessionResponseObject, error)
-	// Онбординг вкуса — исполнители и жанры библиотеки для выбора
+	// Анкета рекомендаций — варианты, сохранённые ответы и необходимость заполнения
 	// (GET /api/v1/onboarding)
 	GetOnboarding(ctx context.Context, request GetOnboardingRequestObject) (GetOnboardingResponseObject, error)
 	// Страница поиска
@@ -10868,284 +10910,291 @@ func (sh *strictHandler) GetReadyz(w http.ResponseWriter, r *http.Request) {
 // Base64 encoded, gzipped, json marshaled Swagger object
 var swaggerSpec = []string{
 
-	"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",
+	"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",
+	"7iBqh3IBAA==",
 }
 
 // GetSwagger returns the content of the embedded swagger specification file

services/api/internal/appupdate/appupdate.go

@@ -15,6 +15,7 @@ import (
 	"os"
 	"path/filepath"
 	"regexp"
+	"sort"
 	"strconv"
 	"strings"
 	"sync"
@@ -30,6 +31,9 @@ const CodeUnavailable = "app.update_unavailable"
 
 const cacheTTL = 10 * time.Minute
 
+// keepClientReleases — сколько последних релизов с файлами отдаём на /download (как prune в CI).
+const keepClientReleases = 8
+
 var tagRe = regexp.MustCompile(`^v?(\d+)\.(\d+)\.(\d+)(?:-rc\.(\d+))?$`)
 
 // VersionCode — versionCode по тегу; та же формула, что в scripts/version.mjs:
@@ -68,9 +72,12 @@ type asset struct {
 }
 
 type release struct {
-	Tag    string  `json:"tag_name"`
-	Body   string  `json:"body"`
-	Assets []asset `json:"assets"`
+	Tag         string    `json:"tag_name"`
+	Body        string    `json:"body"`
+	Draft       bool      `json:"draft"`
+	PublishedAt time.Time `json:"published_at"`
+	CreatedAt   time.Time `json:"created_at"`
+	Assets      []asset   `json:"assets"`
 }
 
 type clientFile struct {
@@ -98,11 +105,16 @@ type Handler struct {
 	log    *slog.Logger
 
 	mu       sync.Mutex
-	cached   *Latest
+	cached   *catalog
 	cachedAt time.Time
 	dl       sync.Mutex
 }
 
+type catalog struct {
+	latest *Latest
+	all    []*Latest
+}
+
 // NewHandler создаёт обработчик.
 func NewHandler(cfg Config, log *slog.Logger) *Handler {
 	return &Handler{cfg: cfg, client: &http.Client{Timeout: 10 * time.Minute}, log: log}
@@ -196,7 +208,7 @@ func pickClientFiles(assets []asset) map[string]clientFile {
 	return out
 }
 
-func (h *Handler) latest(ctx context.Context) (*Latest, error) {
+func (h *Handler) catalog(ctx context.Context) (*catalog, error) {
 	if !h.configured() {
 		return nil, apperr.NotFound(CodeUnavailable, "gitea is not configured")
 	}
@@ -208,7 +220,8 @@ func (h *Handler) latest(ctx context.Context) (*Latest, error) {
 	ctx, cancel := context.WithTimeout(ctx, 15*time.Second)
 	defer cancel()
 	base := strings.TrimRight(h.cfg.GiteaURL, "/")
-	res, err := h.get(ctx, base+"/api/v1/repos/"+h.cfg.Repo+"/releases/latest")
+	repo := h.cfg.Repo
+	rels, err := h.listReleases(ctx, base, repo)
 	if err != nil {
 		h.log.WarnContext(ctx, "app update: gitea unavailable", "err", err)
 		if h.cached != nil {
@@ -216,37 +229,114 @@ func (h *Handler) latest(ctx context.Context) (*Latest, error) {
 		}
 		return nil, apperr.NotFound(CodeUnavailable, "release is unavailable")
 	}
-	var rel release
-	err = json.NewDecoder(res.Body).Decode(&rel)
-	_ = res.Body.Close()
-	if err != nil {
-		return nil, fmt.Errorf("gitea: decode release: %w", err)
+	var all []*Latest
+	for _, rel := range rels {
+		if rel.Draft {
+			continue
+		}
+		l := h.parseRelease(ctx, rel)
+		if l == nil {
+			continue
+		}
+		all = append(all, l)
+		if len(all) >= keepClientReleases {
+			break
+		}
 	}
+	if len(all) == 0 {
+		return nil, apperr.NotFound(CodeUnavailable, "release has no client builds")
+	}
+	cat := &catalog{latest: all[0], all: all}
+	h.cached = cat
+	h.cachedAt = time.Now()
+	return cat, nil
+}
+
+func (h *Handler) listReleases(ctx context.Context, base, repo string) ([]release, error) {
+	res, err := h.get(ctx, base+"/api/v1/repos/"+repo+"/releases?limit=20")
+	if err == nil {
+		var rels []release
+		decErr := json.NewDecoder(res.Body).Decode(&rels)
+		_ = res.Body.Close()
+		if decErr != nil {
+			return nil, fmt.Errorf("gitea: decode releases: %w", decErr)
+		}
+		sort.SliceStable(rels, func(i, j int) bool {
+			ti, tj := rels[i].PublishedAt, rels[j].PublishedAt
+			if ti.IsZero() {
+				ti = rels[i].CreatedAt
+			}
+			if tj.IsZero() {
+				tj = rels[j].CreatedAt
+			}
+			return ti.After(tj)
+		})
+		return rels, nil
+	}
+	res, err = h.get(ctx, base+"/api/v1/repos/"+repo+"/releases/latest")
+	if err != nil {
+		return nil, err
+	}
+	var rel release
+	decErr := json.NewDecoder(res.Body).Decode(&rel)
+	_ = res.Body.Close()
+	if decErr != nil {
+		return nil, fmt.Errorf("gitea: decode release: %w", decErr)
+	}
+	return []release{rel}, nil
+}
+
+func (h *Handler) parseRelease(ctx context.Context, rel release) *Latest {
 	version, code, err := VersionCode(rel.Tag)
 	if err != nil {
-		return nil, apperr.NotFound(CodeUnavailable, err.Error())
+		return nil
 	}
 	files := pickClientFiles(rel.Assets)
 	if len(files) == 0 {
-		return nil, apperr.NotFound(CodeUnavailable, "release has no client builds")
+		return nil
 	}
 	if apk, ok := files["android"]; ok {
 		if apk.ChecksumURL == "" {
 			delete(files, "android")
 		} else if digest, err := h.readDigest(ctx, apk.ChecksumURL); err != nil {
-			h.log.WarnContext(ctx, "app update: apk checksum unavailable", "err", err)
+			h.log.WarnContext(ctx, "app update: apk checksum unavailable", "err", err, "version", version)
 			delete(files, "android")
 		} else {
 			apk.SHA256 = digest
 			files["android"] = apk
 		}
-		if len(files) == 0 {
-			return nil, apperr.NotFound(CodeUnavailable, "release has no APK yet")
+	}
+	if len(files) == 0 {
+		return nil
+	}
+	return &Latest{Version: version, VersionCode: code, Notes: rel.Body, Files: files}
+}
+
+func (h *Handler) latest(ctx context.Context) (*Latest, error) {
+	cat, err := h.catalog(ctx)
+	if err != nil {
+		return nil, err
+	}
+	return cat.latest, nil
+}
+
+func (c *catalog) release(version string) *Latest {
+	for _, l := range c.all {
+		if l.Version == version {
+			return l
 		}
 	}
-	h.cached = &Latest{Version: version, VersionCode: code, Notes: rel.Body, Files: files}
-	h.cachedAt = time.Now()
-	return h.cached, nil
+	return nil
+}
+
+func (c *catalog) keepNames() map[string]struct{} {
+	out := map[string]struct{}{}
+	for _, l := range c.all {
+		for _, f := range l.Files {
+			out[f.Name] = struct{}{}
+		}
+	}
+	return out
 }
 
 func (h *Handler) readDigest(ctx context.Context, url string) (string, error) {
@@ -272,33 +362,73 @@ func (h *Handler) fileURL(kind, version string) string {
 
 // GetAppClients реализует gen.StrictServerInterface.
 func (h *Handler) GetAppClients(ctx context.Context, _ gen.GetAppClientsRequestObject) (gen.GetAppClientsResponseObject, error) {
-	l, err := h.latest(ctx)
+	cat, err := h.catalog(ctx)
 	if err != nil {
 		return nil, err
 	}
+	l := cat.latest
 	order := []string{"windows", "macos", "linux", "android"}
-	clients := make([]gen.AppClientFile, 0, len(l.Files))
+	clients := make([]gen.AppClientFile, 0, len(order))
 	for _, kind := range order {
-		f, ok := l.Files[kind]
+		item, ok := h.clientWithOlder(cat, kind)
 		if !ok {
 			continue
 		}
-		item := gen.AppClientFile{
-			Client:      gen.AppClient(kind),
-			Filename:    f.Name,
-			Size:        f.Size,
-			DownloadUrl: h.fileURL(kind, l.Version),
-		}
-		if f.SHA256 != "" {
-			item.Sha256 = &f.SHA256
-		}
 		clients = append(clients, item)
 	}
+	if len(clients) == 0 {
+		return nil, apperr.NotFound(CodeUnavailable, "release has no client builds")
+	}
 	return gen.GetAppClients200JSONResponse{
 		Version: l.Version, VersionCode: l.VersionCode, NotesMd: l.Notes, Clients: clients,
 	}, nil
 }
 
+func (h *Handler) clientWithOlder(cat *catalog, kind string) (gen.AppClientFile, bool) {
+	var head *Latest
+	var file clientFile
+	var older []gen.AppClientBuild
+	for _, rel := range cat.all {
+		f, ok := rel.Files[kind]
+		if !ok {
+			continue
+		}
+		if head == nil {
+			head, file = rel, f
+			continue
+		}
+		older = append(older, gen.AppClientBuild{
+			Version:     rel.Version,
+			Filename:    f.Name,
+			Size:        f.Size,
+			DownloadUrl: h.fileURL(kind, rel.Version),
+			Sha256:      shaPtr(f.SHA256),
+		})
+	}
+	if head == nil {
+		return gen.AppClientFile{}, false
+	}
+	item := gen.AppClientFile{
+		Client:      gen.AppClient(kind),
+		Version:     &head.Version,
+		Filename:    file.Name,
+		Size:        file.Size,
+		DownloadUrl: h.fileURL(kind, head.Version),
+		Sha256:      shaPtr(file.SHA256),
+	}
+	if len(older) > 0 {
+		item.Older = &older
+	}
+	return item, true
+}
+
+func shaPtr(s string) *string {
+	if s == "" {
+		return nil
+	}
+	return &s
+}
+
 // GetAndroidLatest реализует gen.StrictServerInterface.
 func (h *Handler) GetAndroidLatest(ctx context.Context, _ gen.GetAndroidLatestRequestObject) (gen.GetAndroidLatestResponseObject, error) {
 	l, err := h.latest(ctx)
@@ -359,16 +489,20 @@ func (h *Handler) ensure(ctx context.Context, f clientFile) (string, error) {
 }
 
 func (h *Handler) cleanup(keepName string) {
+	keep := map[string]struct{}{keepName: {}}
+	h.mu.Lock()
+	if h.cached != nil {
+		for name := range h.cached.keepNames() {
+			keep[name] = struct{}{}
+		}
+	}
+	h.mu.Unlock()
 	matches, _ := filepath.Glob(filepath.Join(h.cfg.Dir, "pipu-music-*"))
-	ver := versionFromName(keepName)
 	for _, m := range matches {
-		base := filepath.Base(m)
-		if ver != "" && strings.Contains(base, ver) {
+		if _, ok := keep[filepath.Base(m)]; ok {
 			continue
 		}
-		if base != keepName {
-			_ = os.Remove(m)
-		}
+		_ = os.Remove(m)
 	}
 }
 
@@ -382,7 +516,7 @@ func versionFromName(name string) string {
 
 func (h *Handler) serveFile(ctx context.Context, l *Latest, kind string) (fileResponse, error) {
 	f, ok := l.Files[kind]
-	if !ok || (kind == "android" && f.SHA256 == "") {
+	if !ok {
 		return fileResponse{}, apperr.NotFound(CodeUnavailable, "client build is unavailable")
 	}
 	path, err := h.ensure(ctx, f)
@@ -393,26 +527,31 @@ func (h *Handler) serveFile(ctx context.Context, l *Latest, kind string) (fileRe
 	return fileResponse{path: path, name: f.Name, req: httpx.RequestFrom(ctx)}, nil
 }
 
-// DownloadAndroidApk реализует gen.StrictServerInterface. Отдаётся только последняя версия.
+// DownloadAndroidApk реализует gen.StrictServerInterface. Версия должна быть в каталоге (до 8 релизов).
 func (h *Handler) DownloadAndroidApk(ctx context.Context, req gen.DownloadAndroidApkRequestObject) (gen.DownloadAndroidApkResponseObject, error) {
-	l, err := h.latest(ctx)
+	cat, err := h.catalog(ctx)
 	if err != nil {
 		return nil, err
 	}
-	if req.Version != l.Version {
-		return nil, apperr.NotFound(CodeUnavailable, "only the latest version is available")
+	l := cat.release(req.Version)
+	if l == nil {
+		return nil, apperr.NotFound(CodeUnavailable, "this version is no longer available")
+	}
+	if _, ok := l.android(); !ok {
+		return nil, apperr.NotFound(CodeUnavailable, "client build is unavailable")
 	}
 	return h.serveFile(ctx, l, "android")
 }
 
 // DownloadAppClient реализует gen.StrictServerInterface.
 func (h *Handler) DownloadAppClient(ctx context.Context, req gen.DownloadAppClientRequestObject) (gen.DownloadAppClientResponseObject, error) {
-	l, err := h.latest(ctx)
+	cat, err := h.catalog(ctx)
 	if err != nil {
 		return nil, err
 	}
-	if req.Version != l.Version {
-		return nil, apperr.NotFound(CodeUnavailable, "only the latest version is available")
+	l := cat.release(req.Version)
+	if l == nil {
+		return nil, apperr.NotFound(CodeUnavailable, "this version is no longer available")
 	}
 	return h.serveFile(ctx, l, string(req.Client))
 }

services/api/internal/appupdate/appupdate_test.go

@@ -10,10 +10,13 @@ import (
 	"net/http/httptest"
 	"os"
 	"path/filepath"
+	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"pipu/api/internal/api/gen"
 )
 
 func TestPickClientFiles(t *testing.T) {
@@ -51,19 +54,30 @@ func TestLatestAndDownload(t *testing.T) {
 	var srv *httptest.Server
 	srv = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		assert.Equal(t, "token secret", r.Header.Get("Authorization"))
+		assets := []map[string]any{
+			{"name": "pipu-music-0.6.1.apk", "size": len(apk), "browser_download_url": srv.URL + "/apk"},
+			{"name": "pipu-music-0.6.1.apk.sha256", "size": 65, "browser_download_url": srv.URL + "/sum"},
+		}
 		switch r.URL.Path {
+		case "/api/v1/repos/o/r/releases":
+			_ = json.NewEncoder(w).Encode([]map[string]any{
+				{"tag_name": "v0.6.1", "body": "## Новое", "draft": false, "published_at": "2026-01-02T00:00:00Z", "assets": assets},
+				{"tag_name": "v0.6.0", "body": "", "draft": false, "published_at": "2026-01-01T00:00:00Z", "assets": []map[string]any{
+					{"name": "pipu-music-0.6.0.apk", "size": 8, "browser_download_url": srv.URL + "/apk-old"},
+					{"name": "pipu-music-0.6.0.apk.sha256", "size": 65, "browser_download_url": srv.URL + "/sum-old"},
+					{"name": "pipu-music-0.6.0-windows-setup.exe", "size": 9, "browser_download_url": srv.URL + "/exe-old"},
+				}},
+			})
 		case "/api/v1/repos/o/r/releases/latest":
 			_ = json.NewEncoder(w).Encode(map[string]any{
-				"tag_name": "v0.6.1", "body": "## Новое",
-				"assets": []map[string]any{
-					{"name": "pipu-music-0.6.1.apk", "size": len(apk), "browser_download_url": srv.URL + "/apk"},
-					{"name": "pipu-music-0.6.1.apk.sha256", "size": 65, "browser_download_url": srv.URL + "/sum"},
-				},
+				"tag_name": "v0.6.1", "body": "## Новое", "assets": assets,
 			})
 		case "/apk":
 			_, _ = w.Write(apk)
 		case "/sum":
 			_, _ = w.Write([]byte(hex.EncodeToString(sum[:]) + "\n"))
+		case "/sum-old":
+			_, _ = w.Write([]byte(strings.Repeat("ab", 32) + "\n"))
 		default:
 			http.NotFound(w, r)
 		}
@@ -91,4 +105,23 @@ func TestLatestAndDownload(t *testing.T) {
 	assert.ErrorContains(t, err, "checksum mismatch")
 	_, statErr := os.Stat(filepath.Join(dir, "pipu-music-0.6.1.apk"))
 	assert.True(t, os.IsNotExist(statErr))
+
+	out, err := h.GetAppClients(context.Background(), gen.GetAppClientsRequestObject{})
+	require.NoError(t, err)
+	body := out.(gen.GetAppClients200JSONResponse)
+	var androidClient, windowsClient *gen.AppClientFile
+	for i := range body.Clients {
+		switch body.Clients[i].Client {
+		case gen.AppClientAndroid:
+			androidClient = &body.Clients[i]
+		case gen.AppClientWindows:
+			windowsClient = &body.Clients[i]
+		}
+	}
+	require.NotNil(t, androidClient)
+	require.NotNil(t, androidClient.Older)
+	assert.Equal(t, "0.6.0", (*androidClient.Older)[0].Version)
+	require.NotNil(t, windowsClient)
+	assert.Contains(t, windowsClient.Filename, "0.6.0")
+	assert.True(t, windowsClient.Older == nil || len(*windowsClient.Older) == 0)
 }

services/api/internal/dbtest/integration_test.go

@@ -12,6 +12,7 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
+	"sync"
 	"testing"
 	"time"
 
@@ -227,12 +228,77 @@ func TestLibraryAndUploads(t *testing.T) {
 	assert.Empty(t, stale, "only uploading files expire")
 	up.Audit(ctx, &author, "upload.test", fileID, map[string]any{"ok": true})
 
-	// Импорт: связь с файлом библиотеки, место освобождено.
-	require.NoError(t, up.Transition(ctx, fileID, []uploads.Status{uploads.StatusPendingReview}, uploads.StatusApproved, nil))
-	require.NoError(t, up.Transition(ctx, fileID, []uploads.Status{uploads.StatusApproved}, uploads.StatusImporting, nil))
-	require.NoError(t, up.Transition(ctx, fileID, []uploads.Status{uploads.StatusImporting}, uploads.StatusImported,
-		func(tx pgx.Tx) error { return uploads.MarkImported(ctx, tx, fileID, fileIDs[1]) }))
+	// A failure writing reviewer metadata must roll back both status and quota.
+	require.Error(t, up.Decide(ctx, fileID, uuid.New(), false, "invalid reviewer"))
+	f, err = up.File(ctx, fileID)
+	require.NoError(t, err)
+	assert.Equal(t, uploads.StatusPendingReview, f.Status)
+	assert.Nil(t, f.ReviewedBy)
+	used, _, err = up.Usage(ctx, author)
+	require.NoError(t, err)
+	assert.EqualValues(t, 400, used)
+
+	// Import operations retain the status/reason/link and quota invariants.
+	require.NoError(t, up.Decide(ctx, fileID, author, true, "discard on approval"))
+	f, err = up.File(ctx, fileID)
+	require.NoError(t, err)
+	require.NotNil(t, f.ReviewedBy)
+	assert.Equal(t, author, *f.ReviewedBy)
+	assert.Nil(t, f.StatusReason)
+	require.NoError(t, up.ChangeStatus(ctx, fileID, []uploads.Status{uploads.StatusApproved}, uploads.StatusImporting))
+	require.NoError(t, up.FailImport(ctx, fileID, "retryable failure"))
+	f, err = up.File(ctx, fileID)
+	require.NoError(t, err)
+	assert.Equal(t, uploads.StatusImportFailed, f.Status)
+	require.NotNil(t, f.StatusReason)
+	assert.Equal(t, "retryable failure", *f.StatusReason)
+	require.NoError(t, up.ChangeStatus(ctx, fileID, []uploads.Status{uploads.StatusImportFailed}, uploads.StatusApproved))
+	require.NoError(t, up.ChangeStatus(ctx, fileID, []uploads.Status{uploads.StatusApproved}, uploads.StatusImporting))
+	require.NoError(t, up.CompleteImport(ctx, fileID, src.ID, "Кино - Группа крови.flac", fileIDs[1]))
+	require.ErrorIs(t, up.CompleteImport(ctx, fileID, src.ID, "ignored.flac", fileIDs[1]), uploads.ErrWrongStatus)
+
 	used, _, err = up.Usage(ctx, author)
 	require.NoError(t, err)
 	assert.EqualValues(t, 0, used)
+	// Two reviewers cannot both decide the same pending file or release quota twice.
+	secondHash := sha256.Sum256([]byte("concurrent decision"))
+	_, reserved, err := up.CreateBatch(ctx, author, nil, []uploads.NewFile{
+		{ClientID: "race", Name: "race.flac", Size: 300, SHA256: secondHash[:]},
+	}, settings)
+	require.NoError(t, err)
+	require.Len(t, reserved, 1)
+	raceID := reserved[0].FileID
+	require.NotEqual(t, uuid.Nil, raceID)
+	require.NoError(t, up.ChangeStatus(ctx, raceID, []uploads.Status{uploads.StatusUploading}, uploads.StatusProcessing))
+	require.NoError(t, up.ChangeStatus(ctx, raceID, []uploads.Status{uploads.StatusProcessing}, uploads.StatusPendingReview))
+	var wg sync.WaitGroup
+	results := make(chan error, 2)
+	for _, reason := range []string{"first", "second"} {
+		wg.Add(1)
+		go func(reason string) { defer wg.Done(); results <- up.Decide(ctx, raceID, author, false, reason) }(reason)
+	}
+	wg.Wait()
+	close(results)
+	success, conflicts := 0, 0
+	for err := range results {
+		if err == nil {
+			success++
+		} else {
+			require.ErrorIs(t, err, uploads.ErrWrongStatus)
+			conflicts++
+		}
+	}
+	assert.Equal(t, 1, success)
+	assert.Equal(t, 1, conflicts)
+	used, _, err = up.Usage(ctx, author)
+	require.NoError(t, err)
+	assert.Zero(t, used)
+	f, err = up.File(ctx, raceID)
+	require.NoError(t, err)
+	assert.Equal(t, uploads.StatusRejected, f.Status)
+	require.NotNil(t, f.ReviewedBy)
+	assert.Equal(t, author, *f.ReviewedBy)
+	require.NotNil(t, f.StatusReason)
+	assert.Contains(t, []string{"first", "second"}, *f.StatusReason)
+
 }

services/api/internal/library/scans.go

@@ -0,0 +1,69 @@
+package library
+
+import (
+	"context"
+	"errors"
+	"net/http"
+
+	"github.com/google/uuid"
+
+	"pipu/api/internal/auth"
+	"pipu/api/internal/platform/apperr"
+)
+
+type ScanStore interface {
+	GetSource(context.Context, uuid.UUID) (Source, error)
+	RetryFailedAnalysis(context.Context) (int, error)
+}
+type ScanStarter interface {
+	Start(Source, string, bool) error
+}
+
+// ScanService owns explicit and scheduled scan starts.
+type ScanService struct {
+	store   ScanStore
+	scanner ScanStarter
+	board   *ProgressBoard
+	root    func(Source) (string, error)
+}
+
+// StartScan запускает скан источника в фоне.
+// RetryAnalysis возвращает в очередь треки, которые анализатор не смог обработать (например, пока диск
+// не был смонтирован).
+func (s *ScanService) RetryAnalysis(ctx context.Context) (int, error) {
+	if err := requirePerm(ctx, auth.PermManageLibrary); err != nil {
+		return 0, err
+	}
+	return s.store.RetryFailedAnalysis(ctx)
+}
+
+func (s *ScanService) StartScan(ctx context.Context, id uuid.UUID, full bool) (Progress, error) {
+	if err := requirePerm(ctx, auth.PermManageLibrary); err != nil {
+		return Progress{}, err
+	}
+	src, err := s.store.GetSource(ctx, id)
+	if err != nil {
+		return Progress{}, notFound(err)
+	}
+	if err := s.startScan(src, full); err != nil {
+		return Progress{}, err
+	}
+	p, _ := s.board.Get(id)
+	return p, nil
+}
+
+func (s *ScanService) startScan(src Source, full bool) error {
+	if src.Status != "mounted" {
+		return apperr.New(http.StatusConflict, CodeSourceOffline, "source is not connected")
+	}
+	root, err := s.root(src)
+	if err != nil {
+		return err
+	}
+	if err := s.scanner.Start(src, root, full); errors.Is(err, ErrScanRunning) {
+		return apperr.Conflict(CodeScanRunning, "scan is already running")
+	} else if err != nil {
+		return err
+	}
+	return nil
+}

services/api/internal/library/scans_test.go

@@ -0,0 +1,55 @@
+package library
+
+import (
+	"context"
+	"errors"
+	"testing"
+
+	"github.com/google/uuid"
+	"github.com/stretchr/testify/require"
+
+	"pipu/api/internal/auth"
+	"pipu/api/internal/platform/apperr"
+)
+
+type scanStoreStub struct{ source Source }
+
+func (s scanStoreStub) GetSource(context.Context, uuid.UUID) (Source, error) { return s.source, nil }
+func (s scanStoreStub) RetryFailedAnalysis(context.Context) (int, error)     { return 7, nil }
+
+type scanStartFunc func(Source, string, bool) error
+
+func (f scanStartFunc) Start(s Source, root string, full bool) error { return f(s, root, full) }
+
+func TestScanServiceAuthorizationAndStart(t *testing.T) {
+	id := uuid.New()
+	called := false
+	s := &ScanService{
+		store: scanStoreStub{Source{ID: id, Status: "mounted"}}, board: NewProgressBoard(),
+		root: func(Source) (string, error) { return "music", nil },
+		scanner: scanStartFunc(func(src Source, root string, full bool) error {
+			called = true
+			require.Equal(t, id, src.ID)
+			require.Equal(t, "music", root)
+			require.True(t, full)
+			return ErrScanRunning
+		}),
+	}
+	_, err := s.StartScan(context.Background(), id, true)
+	require.Error(t, err)
+	require.False(t, called)
+	ctx := auth.WithPrincipal(context.Background(), auth.Principal{Role: auth.RoleAdmin})
+	_, err = s.StartScan(ctx, id, true)
+	var problem *apperr.Error
+	require.ErrorAs(t, err, &problem)
+	require.Equal(t, CodeScanRunning, problem.Code)
+	require.True(t, called)
+}
+
+func TestScanServiceDoesNotStartOfflineOrUnresolvedSource(t *testing.T) {
+	s := &ScanService{} // no scanner needed: errors must be returned before IO
+	require.Error(t, s.startScan(Source{Status: "error"}, false))
+	failure := errors.New("invalid root")
+	s.root = func(Source) (string, error) { return "", failure }
+	require.ErrorIs(t, s.startScan(Source{Status: "mounted"}, false), failure)
+}

services/api/internal/library/schedule.go

@@ -0,0 +1,118 @@
+package library
+
+import (
+	"context"
+	"errors"
+	"log/slog"
+	"time"
+
+	"github.com/google/uuid"
+
+	"pipu/api/internal/platform/apperr"
+)
+
+type ScheduleStore interface {
+	ListSources(context.Context) ([]Source, error)
+	SetSourceStatus(context.Context, uuid.UUID, string, *string) error
+}
+
+type sourceConnection interface {
+	connect(context.Context, Source) (Source, error)
+	check(context.Context, Source, bool) (string, *string)
+}
+
+type scheduledScan interface {
+	startScan(Source, bool) error
+}
+
+// Scheduler owns the periodic lifetime, not source or template business rules.
+type Scheduler struct {
+	store   ScheduleStore
+	sources sourceConnection
+	scans   scheduledScan
+	log     *slog.Logger
+}
+
+// Restore при старте api переподключает NFS-хранилища и проверяет local (после перезапуска агента).
+func (s *Scheduler) Restore(ctx context.Context) {
+	sources, err := s.store.ListSources(ctx)
+	if err != nil {
+		s.log.Error("restore sources", "err", err)
+		return
+	}
+	for _, src := range sources {
+		if src.Status == "disabled" {
+			continue
+		}
+		if _, err := s.sources.connect(ctx, src); err != nil {
+			s.log.Error("restore source", "source_id", src.ID, "err", err)
+		}
+	}
+}
+
+// RunSchedule раз в минуту проверяет доступность хранилищ и запускает сканы по расписанию.
+func (s *Scheduler) RunSchedule(ctx context.Context) {
+	t := time.NewTicker(time.Minute)
+	defer t.Stop()
+	for {
+		select {
+		case <-ctx.Done():
+			return
+		case <-t.C:
+		}
+		sources, err := s.store.ListSources(ctx)
+		if err != nil {
+			s.log.Warn("schedule: list sources", "err", err)
+			continue
+		}
+		for _, src := range sources {
+			if src.Status == "disabled" {
+				continue
+			}
+			s.healthCheck(ctx, src)
+			if src.ScanInterval == nil || src.Status != "mounted" {
+				continue
+			}
+			if src.LastScanAt == nil || time.Since(*src.LastScanAt) >= *src.ScanInterval {
+				if err := s.scans.startScan(src, false); err != nil && !errors.Is(err, apperr.Conflict(CodeScanRunning, "")) {
+					s.log.Warn("scheduled scan", "source_id", src.ID, "err", err)
+				}
+			}
+		}
+	}
+}
+
+// healthCheck: недоступное хранилище — status=error (треки серые), вернулось — снова mounted.
+func (s *Scheduler) healthCheck(ctx context.Context, src Source) {
+	ctx, cancel := context.WithTimeout(ctx, 10*time.Second)
+	defer cancel()
+	type result struct {
+		status  string
+		message *string
+	}
+	done := make(chan result, 1)
+	go func() {
+		status, message := s.sources.check(ctx, src, false)
+		done <- result{status, message}
+	}()
+	var status string
+	var message *string
+	select {
+	case r := <-done:
+		status, message = r.status, r.message
+	case <-ctx.Done():
+		m := "storage does not respond"
+		status, message = "error", &m
+	}
+	if status == "error" && src.Type == SourceNFS && src.Status == "error" {
+		// Попробовать перемонтировать, как при старте.
+		if _, err := s.sources.connect(ctx, src); err == nil {
+			return
+		}
+	}
+	if status != src.Status || deref(message) != deref(src.StatusMessage) {
+		if err := s.store.SetSourceStatus(ctx, src.ID, status, message); err != nil {
+			s.log.Warn("health check", "source_id", src.ID, "err", err)
+		}
+	}
+}

services/api/internal/library/service.go

@@ -3,25 +3,10 @@ package library
 import (
 	"context"
 	"errors"
-	"fmt"
 	"log/slog"
-	"math/rand/v2"
-	"net/http"
-	"os"
-	"path"
-	"path/filepath"
-	"slices"
-	"strings"
-	"sync"
-	"time"
-	"unicode/utf8"
-
-	"github.com/google/uuid"
 
 	"pipu/api/internal/auth"
-	"pipu/api/internal/library/meta"
 	"pipu/api/internal/platform/apperr"
-	"pipu/api/internal/storageagent"
 )
 
 // Коды ошибок библиотеки.
@@ -45,24 +30,23 @@ type Config struct {
 	HostRoot    string // LIBRARY_HOST внутри контейнера, для local-источников
 }
 
-// Service управляет хранилищами и сканами.
+// Service preserves the API while each use case owns only its dependencies.
 type Service struct {
-	store   *Store
-	scanner *Scanner
-	board   *ProgressBoard
-	agent   Agent
-	prober  Prober
-	cfg     Config
-	log     *slog.Logger
-	mu      sync.Mutex // сериализует переподключение одного и того же источника
-
-	// OnCatalogChanged — каталог изменился не сканом (удалено хранилище): переиндексация поиска.
-	OnCatalogChanged func()
+	*SourceService
+	*TemplateService
+	*ScanService
+	*Scheduler
 }
 
-// NewService создаёт сервис.
 func NewService(store *Store, scanner *Scanner, board *ProgressBoard, agent Agent, prober Prober, cfg Config, log *slog.Logger) *Service {
-	return &Service{store: store, scanner: scanner, board: board, agent: agent, prober: prober, cfg: cfg, log: log}
+	sources := &SourceService{store: store, board: board, agent: agent, cfg: cfg, log: log}
+	scans := &ScanService{store: store, scanner: scanner, board: board, root: sources.Root}
+	return &Service{
+		SourceService:   sources,
+		TemplateService: &TemplateService{store: store, prober: prober, root: sources.Root},
+		ScanService:     scans,
+		Scheduler:       &Scheduler{store: store, sources: sources, scans: scans, log: log},
+	}
 }
 
 func forbidden() error { return apperr.Forbidden(auth.CodeForbidden, "not allowed") }
@@ -84,746 +68,3 @@ func notFound(err error) error {
 	}
 	return err
 }
-
-// Root — каталог источника в файловой системе api.
-func (s *Service) Root(src Source) (string, error) {
-	switch src.Type {
-	case SourceLocal:
-		rel := ""
-		if src.LocalPath != nil {
-			rel = *src.LocalPath
-		}
-		return s.hostPath(rel)
-	case SourceNFS:
-		return filepath.Join(s.cfg.LibraryRoot, src.ID.String()), nil
-	}
-	return "", fmt.Errorf("library: unknown source type %q", src.Type)
-}
-
-// hostPath — путь внутри LIBRARY_HOST; выйти за его пределы нельзя.
-func (s *Service) hostPath(rel string) (string, error) {
-	rel = strings.Trim(strings.ReplaceAll(rel, "\\", "/"), "/")
-	clean := path.Clean("/" + rel)
-	if clean != "/"+rel && rel != "" || strings.Contains(rel, "..") {
-		return "", apperr.Validation("local_path", CodeLocalPathInvalid, "path must be relative without ..", nil)
-	}
-	return filepath.Join(s.cfg.HostRoot, filepath.FromSlash(strings.TrimPrefix(clean, "/"))), nil
-}
-
-// ListSources — хранилища с прогрессом сканов.
-func (s *Service) ListSources(ctx context.Context) ([]Source, error) {
-	if err := requirePerm(ctx, auth.PermManageLibrary); err != nil {
-		return nil, err
-	}
-	return s.store.ListSources(ctx)
-}
-
-// GetSource — хранилище по id.
-func (s *Service) GetSource(ctx context.Context, id uuid.UUID) (Source, error) {
-	if err := requirePerm(ctx, auth.PermManageLibrary); err != nil {
-		return Source{}, err
-	}
-	src, err := s.store.GetSource(ctx, id)
-	return src, notFound(err)
-}
-
-// Progress — прогресс скана источника, если он был.
-func (s *Service) Progress(id uuid.UUID) (Progress, bool) { return s.board.Get(id) }
-
-// SourceInput — поля создания / изменения хранилища. nil — не задано.
-type SourceInput struct {
-	Name                *string
-	Type                SourceType
-	NFSServer           *string
-	NFSExport           *string
-	NFSOptions          *string
-	LocalPath           *string
-	TagsFirst           *bool
-	ScanIntervalMinutes *int // 0 — выключить
-	Enabled             *bool
-	AcceptsUploads      *bool
-	WriteTemplate       *string // "" — убрать
-}
-
-func (s *Service) apply(src *Source, in SourceInput) error {
-	if in.Name != nil {
-		name := strings.TrimSpace(*in.Name)
-		if name == "" || utf8.RuneCountInString(name) > 100 {
-			return apperr.Validation("name", CodeNameInvalid, "name must be 1-100 characters", map[string]any{"max": 100})
-		}
-		src.Name = name
-	}
-	if in.TagsFirst != nil {
-		src.TagsFirst = *in.TagsFirst
-	}
-	if in.ScanIntervalMinutes != nil {
-		switch m := *in.ScanIntervalMinutes; {
-		case m == 0:
-			src.ScanInterval = nil
-		case m < 5 || m > 60*24*30:
-			return apperr.Validation("scan_interval_minutes", CodeIntervalInvalid, "interval must be 5 minutes .. 30 days",
-				map[string]any{"min": 5})
-		default:
-			d := time.Duration(m) * time.Minute
-			src.ScanInterval = &d
-		}
-	}
-	if in.AcceptsUploads != nil {
-		src.AcceptsUploads = *in.AcceptsUploads
-	}
-	if in.WriteTemplate != nil {
-		if strings.TrimSpace(*in.WriteTemplate) == "" {
-			src.WriteTemplate = nil
-		} else {
-			tpl, err := meta.ParseTemplate(*in.WriteTemplate)
-			if err != nil {
-				return apperr.Validation("write_template", CodeTemplateInvalid, err.Error(), map[string]any{"reason": err.Error()})
-			}
-			text := tpl.String()
-			src.WriteTemplate = &text
-		}
-	}
-	switch src.Type {
-	case SourceLocal:
-		if in.LocalPath != nil {
-			rel := strings.Trim(strings.ReplaceAll(*in.LocalPath, "\\", "/"), "/")
-			if _, err := s.hostPath(rel); err != nil {
-				return err
-			}
-			src.LocalPath = &rel
-		}
-		if src.LocalPath == nil {
-			empty := ""
-			src.LocalPath = &empty
-		}
-	case SourceNFS:
-		if in.NFSServer != nil {
-			src.NFSServer = in.NFSServer
-		}
-		if in.NFSExport != nil {
-			src.NFSExport = in.NFSExport
-		}
-		if in.NFSOptions != nil {
-			src.NFSOptions = *in.NFSOptions
-		}
-		spec, err := nfsSpec(*src).Normalize(false)
-		if err != nil {
-			var ve *storageagent.ValidationError
-			if errors.As(err, &ve) {
-				return apperr.Validation(ve.Field, CodeNFSInvalid, ve.Reason, nil)
-			}
-			return err
-		}
-		src.NFSServer, src.NFSExport, src.NFSOptions = &spec.Server, &spec.Export, spec.Options
-	default:
-		return apperr.Validation("type", "validation.source_type_invalid", "unknown source type", nil)
-	}
-	return nil
-}
-
-func nfsSpec(src Source) storageagent.NFSSpec {
-	var spec storageagent.NFSSpec
-	if src.NFSServer != nil {
-		spec.Server = *src.NFSServer
-	}
-	if src.NFSExport != nil {
-		spec.Export = *src.NFSExport
-	}
-	spec.Options = src.NFSOptions
-	return spec
-}
-
-// CreateSource сохраняет хранилище и сразу пытается подключить его.
-func (s *Service) CreateSource(ctx context.Context, in SourceInput) (Source, error) {
-	if err := requirePerm(ctx, auth.PermManageLibrary); err != nil {
-		return Source{}, err
-	}
-	src := Source{ID: newID(), Type: in.Type, TagsFirst: true, Status: "pending", NFSOptions: "ro,nfsvers=4.1,soft,timeo=150,retrans=3"}
-	if in.Name == nil {
-		in.Name = new(string)
-	}
-	if err := s.apply(&src, in); err != nil {
-		return Source{}, err
-	}
-	src, err := s.store.SaveSource(ctx, src)
-	if err != nil {
-		return Source{}, err
-	}
-	return s.connect(ctx, src)
-}
-
-// UpdateSource меняет хранилище; смена адреса или папки переподключает его.
-func (s *Service) UpdateSource(ctx context.Context, id uuid.UUID, in SourceInput) (Source, error) {
-	if err := requirePerm(ctx, auth.PermManageLibrary); err != nil {
-		return Source{}, err
-	}
-	src, err := s.store.GetSource(ctx, id)
-	if err != nil {
-		return Source{}, notFound(err)
-	}
-	before := src
-	in.Type = src.Type
-	if err := s.apply(&src, in); err != nil {
-		return Source{}, err
-	}
-	if src, err = s.store.SaveSource(ctx, src); err != nil {
-		return Source{}, err
-	}
-	location := func(x Source) string {
-		return fmt.Sprint(x.LocalPath != nil && *x.LocalPath != "", deref(x.LocalPath), deref(x.NFSServer), deref(x.NFSExport), x.NFSOptions,
-			x.Type == SourceNFS && x.AcceptsUploads)
-	}
-	switch {
-	case in.Enabled != nil && !*in.Enabled:
-		if src.Type == SourceNFS {
-			_ = s.agent.Unmount(ctx, src.ID)
-		}
-		if err := s.store.SetSourceStatus(ctx, src.ID, "disabled", nil); err != nil {
-			return Source{}, err
-		}
-		return s.store.GetSource(ctx, src.ID)
-	case in.Enabled != nil && *in.Enabled, location(before) != location(src), src.Status == "error":
-		return s.connect(ctx, src)
-	}
-	return src, nil
-}
-
-func deref(p *string) string {
-	if p == nil {
-		return ""
-	}
-	return *p
-}
-
-// connect подключает хранилище и записывает статус: local — проверка каталога, nfs — монтирование агентом.
-func (s *Service) connect(ctx context.Context, src Source) (Source, error) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	status, message := s.check(ctx, src, true)
-	if err := s.store.SetSourceStatus(ctx, src.ID, status, message); err != nil {
-		return Source{}, err
-	}
-	return s.store.GetSource(ctx, src.ID)
-}
-
-// check проверяет доступность; mount — смонтировать NFS (иначе только проверить точку).
-func (s *Service) check(ctx context.Context, src Source, mount bool) (string, *string) {
-	msg := func(m string) *string { return &m }
-	switch src.Type {
-	case SourceLocal:
-		root, err := s.Root(src)
-		if err != nil {
-			return "error", msg(err.Error())
-		}
-		info, err := os.Stat(root)
-		if err != nil || !info.IsDir() {
-			return "error", msg("folder not found: " + deref(src.LocalPath))
-		}
-		return "mounted", nil
-	case SourceNFS:
-		if !mount {
-			root, _ := s.Root(src)
-			if _, err := os.Stat(root); err != nil {
-				return "error", msg(err.Error())
-			}
-			return "mounted", nil
-		}
-		res, err := s.agent.Mount(ctx, src.ID, nfsSpec(src), src.AcceptsUploads)
-		if err != nil {
-			return "error", msg(err.Error())
-		}
-		if res.Status != "mounted" {
-			return "error", msg(res.Message)
-		}
-		return "mounted", nil
-	}
-	return "error", msg("unknown type")
-}
-
-// DeleteSource отключает хранилище и удаляет его файлы из каталога.
-func (s *Service) DeleteSource(ctx context.Context, id uuid.UUID) error {
-	if err := requirePerm(ctx, auth.PermManageLibrary); err != nil {
-		return err
-	}
-	src, err := s.store.GetSource(ctx, id)
-	if err != nil {
-		return notFound(err)
-	}
-	if p, ok := s.board.Get(id); ok && p.Running {
-		return apperr.Conflict(CodeScanRunning, "scan is running")
-	}
-	if src.Type == SourceNFS {
-		if err := s.agent.Unmount(ctx, id); err != nil {
-			s.log.WarnContext(ctx, "unmount failed", "source_id", id, "err", err)
-		}
-	}
-	if err := s.store.DeleteSource(ctx, id); err != nil {
-		return notFound(err)
-	}
-	if err := s.store.CleanupOrphans(ctx); err != nil {
-		return err
-	}
-	if s.OnCatalogChanged != nil {
-		s.OnCatalogChanged()
-	}
-	return nil
-}
-
-// TestResult — итог проверки подключения.
-type TestResult struct {
-	OK         bool
-	Message    string
-	AudioFiles int
-	Write      *storageagent.WriteTestResult // только для accepts_uploads
-}
-
-// writeTarget — как агенту найти источник на запись.
-func writeTarget(src Source) storageagent.WriteTestRequest {
-	req := storageagent.WriteTestRequest{SourceID: src.ID.String()}
-	if src.Type == SourceLocal {
-		lp := deref(src.LocalPath)
-		req.LocalPath = &lp
-	}
-	return req
-}
-
-// TestSource проверяет доступ к хранилищу и считает аудиофайлы (до 1000).
-func (s *Service) TestSource(ctx context.Context, id uuid.UUID) (TestResult, error) {
-	if err := requirePerm(ctx, auth.PermManageLibrary); err != nil {
-		return TestResult{}, err
-	}
-	src, err := s.store.GetSource(ctx, id)
-	if err != nil {
-		return TestResult{}, notFound(err)
-	}
-	res, err := s.testRead(ctx, src)
-	if err != nil || !src.AcceptsUploads {
-		return res, err
-	}
-	w, err := s.agent.TestWrite(ctx, writeTarget(src))
-	if err != nil {
-		w = storageagent.WriteTestResult{Message: err.Error()}
-	}
-	res.Write = &w
-	return res, nil
-}
-
-func (s *Service) testRead(ctx context.Context, src Source) (TestResult, error) {
-	if src.Type == SourceNFS {
-		res, err := s.agent.Test(ctx, nfsSpec(src))
-		if err != nil {
-			return TestResult{Message: err.Error()}, nil
-		}
-		return TestResult{OK: res.Status == "mounted", Message: res.Message, AudioFiles: res.AudioFiles}, nil
-	}
-	root, err := s.Root(src)
-	if err != nil {
-		return TestResult{Message: err.Error()}, nil
-	}
-	n := 0
-	err = filepath.WalkDir(root, func(p string, d os.DirEntry, err error) error {
-		if err != nil {
-			return err
-		}
-		if !d.IsDir() && IsAudio(d.Name()) {
-			n++
-			if n >= 1000 {
-				return filepath.SkipAll
-			}
-		}
-		return nil
-	})
-	if err != nil {
-		return TestResult{Message: err.Error(), AudioFiles: n}, nil
-	}
-	return TestResult{OK: true, Message: fmt.Sprintf("found %d audio files", n), AudioFiles: n}, nil
-}
-
-// Patterns — шаблоны путей источника.
-func (s *Service) Patterns(ctx context.Context, id uuid.UUID) ([]PatternRow, error) {
-	if err := requirePerm(ctx, auth.PermManageLibrary); err != nil {
-		return nil, err
-	}
-	if _, err := s.store.GetSource(ctx, id); err != nil {
-		return nil, notFound(err)
-	}
-	return s.store.Patterns(ctx, id)
-}
-
-func compile(patterns []PatternRow) ([]meta.Pattern, error) {
-	var exprs []string
-	idx := []int{}
-	for i, p := range patterns {
-		if p.IsEnabled {
-			exprs = append(exprs, p.Regex)
-			idx = append(idx, i)
-		}
-	}
-	compiled, err := meta.CompilePatterns(exprs)
-	var pe *meta.PatternError
-	if errors.As(err, &pe) {
-		at := idx[pe.Index]
-		return nil, &apperr.Error{
-			Status: http.StatusUnprocessableEntity, Code: CodePatternInvalid, Detail: pe.Reason,
-			Params: map[string]any{"index": at, "reason": pe.Reason},
-			Fields: []apperr.FieldError{{Field: fmt.Sprintf("patterns[%d].regex", at), Code: CodePatternInvalid}},
-		}
-	}
-	return compiled, err
-}
-
-// PutPatterns проверяет и сохраняет шаблоны.
-func (s *Service) PutPatterns(ctx context.Context, id uuid.UUID, patterns []PatternRow) ([]PatternRow, error) {
-	if err := requirePerm(ctx, auth.PermManageLibrary); err != nil {
-		return nil, err
-	}
-	if _, err := s.store.GetSource(ctx, id); err != nil {
-		return nil, notFound(err)
-	}
-	if _, err := compile(patterns); err != nil {
-		return nil, err
-	}
-	if err := s.store.ReplacePatterns(ctx, id, patterns); err != nil {
-		return nil, err
-	}
-	return s.store.Patterns(ctx, id)
-}
-
-// PreviewItem — разбор одного файла.
-type PreviewItem struct {
-	RelPath      string
-	PatternIndex *int
-	Skipped      bool
-	PathFields   map[string]string
-	Tags         map[string]string
-	Result       meta.Meta
-	Error        string
-}
-
-// Preview применяет шаблоны к выборке файлов без сохранения: из каталога, а до первого скана — из обхода.
-func (s *Service) Preview(ctx context.Context, id uuid.UUID, patterns []PatternRow, sample int) ([]PreviewItem, int, error) {
-	if err := requirePerm(ctx, auth.PermManageLibrary); err != nil {
-		return nil, 0, err
-	}
-	src, err := s.store.GetSource(ctx, id)
-	if err != nil {
-		return nil, 0, notFound(err)
-	}
-	compiled, err := compile(patterns)
-	if err != nil {
-		return nil, 0, err
-	}
-	sample = min(max(sample, 1), 200)
-	root, err := s.Root(src)
-	if err != nil {
-		return nil, 0, err
-	}
-	paths, err := s.store.SampleFiles(ctx, id, sample)
-	if err != nil {
-		return nil, 0, err
-	}
-	if len(paths) == 0 {
-		found, err := walk(root, func(string) bool { return false })
-		if err != nil {
-			return nil, 0, apperr.New(http.StatusConflict, CodeSourceOffline, err.Error())
-		}
-		rand.Shuffle(len(found), func(i, j int) { found[i], found[j] = found[j], found[i] })
-		for _, w := range found[:min(sample, len(found))] {
-			paths = append(paths, w.rel)
-		}
-	}
-	slices.Sort(paths)
-
-	items := make([]PreviewItem, len(paths))
-	var wg sync.WaitGroup
-	sem := make(chan struct{}, 8)
-	for i, rel := range paths {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-			sem <- struct{}{}
-			defer func() { <-sem }()
-			items[i] = s.previewOne(ctx, root, rel, compiled, src.TagsFirst)
-		}()
-	}
-	wg.Wait()
-	unmatched := 0
-	for _, it := range items {
-		if it.PatternIndex == nil {
-			unmatched++
-		}
-	}
-	return items, unmatched, nil
-}
-
-func (s *Service) previewOne(ctx context.Context, root, rel string, patterns []meta.Pattern, tagsFirst bool) PreviewItem {
-	it := PreviewItem{RelPath: rel, PathFields: map[string]string{}, Tags: map[string]string{}}
-	m := meta.MatchPath(patterns, rel)
-	if m.Index >= 0 {
-		idx := m.Index
-		it.PatternIndex = &idx
-	}
-	it.Skipped = m.Skip
-	for k, v := range m.Fields {
-		it.PathFields[k] = v
-	}
-	p, err := s.prober.Probe(ctx, filepath.Join(root, filepath.FromSlash(rel)))
-	if err != nil {
-		it.Error = err.Error()
-	}
-	for k, v := range map[string]string{
-		"artist": p.Tags.Artist, "albumartist": p.Tags.AlbumArtist, "album": p.Tags.Album, "title": p.Tags.Title,
-		"genre": p.Tags.Genre, "year": p.Tags.Year, "track": p.Tags.Track, "disc": p.Tags.Disc,
-	} {
-		if v != "" {
-			it.Tags[k] = v
-		}
-	}
-	it.Result = meta.Merge(p.Tags, meta.FromPath(m.Fields), tagsFirst, rel)
-	if it.Result.Album == "" {
-		it.Result.Album = UnknownAlbum
-	}
-	return it
-}
-
-// StartScan запускает скан источника в фоне.
-// RetryAnalysis возвращает в очередь треки, которые анализатор не смог обработать (например, пока диск
-// не был смонтирован).
-func (s *Service) RetryAnalysis(ctx context.Context) (int, error) {
-	if err := requirePerm(ctx, auth.PermManageLibrary); err != nil {
-		return 0, err
-	}
-	return s.store.RetryFailedAnalysis(ctx)
-}
-
-func (s *Service) StartScan(ctx context.Context, id uuid.UUID, full bool) (Progress, error) {
-	if err := requirePerm(ctx, auth.PermManageLibrary); err != nil {
-		return Progress{}, err
-	}
-	src, err := s.store.GetSource(ctx, id)
-	if err != nil {
-		return Progress{}, notFound(err)
-	}
-	if err := s.startScan(src, full); err != nil {
-		return Progress{}, err
-	}
-	p, _ := s.board.Get(id)
-	return p, nil
-}
-
-func (s *Service) startScan(src Source, full bool) error {
-	if src.Status != "mounted" {
-		return apperr.New(http.StatusConflict, CodeSourceOffline, "source is not connected")
-	}
-	root, err := s.Root(src)
-	if err != nil {
-		return err
-	}
-	if err := s.scanner.Start(src, root, full); errors.Is(err, ErrScanRunning) {
-		return apperr.Conflict(CodeScanRunning, "scan is already running")
-	} else if err != nil {
-		return err
-	}
-	return nil
-}
-
-// Status — состояние библиотеки (admin, moderator).
-type Status struct {
-	Counts   Counts
-	Sources  []Source
-	Analysis AnalysisCounts
-	Wave     WaveMetrics
-}
-
-// Status собирает счётчики и состояние источников.
-func (s *Service) Status(ctx context.Context) (Status, error) {
-	if err := requirePerm(ctx, auth.PermViewLibraryStatus); err != nil {
-		return Status{}, err
-	}
-	c, err := s.store.Counts(ctx)
-	if err != nil {
-		return Status{}, err
-	}
-	sources, err := s.store.ListSources(ctx)
-	if err != nil {
-		return Status{}, err
-	}
-	analysis, err := s.store.AnalysisCounts(ctx)
-	if err != nil {
-		return Status{}, err
-	}
-	wave, err := s.store.WaveMetrics(ctx)
-	if err != nil {
-		return Status{}, err
-	}
-	return Status{Counts: c, Sources: sources, Analysis: analysis, Wave: wave}, nil
-}
-
-// FileErrors — файлы с ошибками чтения.
-func (s *Service) FileErrors(ctx context.Context, after string, limit int) ([]FileError, error) {
-	if err := requirePerm(ctx, auth.PermManageLibrary); err != nil {
-		return nil, err
-	}
-	return s.store.FileErrors(ctx, after, limit)
-}
-
-// HostDirs — подпапки каталога LIBRARY_HOST для выбора local-хранилища.
-func (s *Service) HostDirs(ctx context.Context, rel string) (string, []string, error) {
-	if err := requirePerm(ctx, auth.PermManageLibrary); err != nil {
-		return "", nil, err
-	}
-	dir, err := s.hostPath(rel)
-	if err != nil {
-		return "", nil, err
-	}
-	entries, err := os.ReadDir(dir)
-	if err != nil {
-		return "", nil, apperr.Validation("path", CodeLocalPathInvalid, "folder not found", nil)
-	}
-	dirs := []string{}
-	for _, e := range entries {
-		if e.IsDir() && !strings.HasPrefix(e.Name(), ".") {
-			dirs = append(dirs, e.Name())
-		}
-	}
-	slices.Sort(dirs)
-	return strings.Trim(strings.ReplaceAll(rel, "\\", "/"), "/"), dirs, nil
-}
-
-// Restore при старте api переподключает NFS-хранилища и проверяет local (после перезапуска агента).
-func (s *Service) Restore(ctx context.Context) {
-	sources, err := s.store.ListSources(ctx)
-	if err != nil {
-		s.log.Error("restore sources", "err", err)
-		return
-	}
-	for _, src := range sources {
-		if src.Status == "disabled" {
-			continue
-		}
-		if _, err := s.connect(ctx, src); err != nil {
-			s.log.Error("restore source", "source_id", src.ID, "err", err)
-		}
-	}
-}
-
-// RunSchedule раз в минуту проверяет доступность хранилищ и запускает сканы по расписанию.
-func (s *Service) RunSchedule(ctx context.Context) {
-	t := time.NewTicker(time.Minute)
-	defer t.Stop()
-	for {
-		select {
-		case <-ctx.Done():
-			return
-		case <-t.C:
-		}
-		sources, err := s.store.ListSources(ctx)
-		if err != nil {
-			s.log.Warn("schedule: list sources", "err", err)
-			continue
-		}
-		for _, src := range sources {
-			if src.Status == "disabled" {
-				continue
-			}
-			s.healthCheck(ctx, src)
-			if src.ScanInterval == nil || src.Status != "mounted" {
-				continue
-			}
-			if src.LastScanAt == nil || time.Since(*src.LastScanAt) >= *src.ScanInterval {
-				if err := s.startScan(src, false); err != nil && !errors.Is(err, apperr.Conflict(CodeScanRunning, "")) {
-					s.log.Warn("scheduled scan", "source_id", src.ID, "err", err)
-				}
-			}
-		}
-	}
-}
-
-// healthCheck: недоступное хранилище — status=error (треки серые), вернулось — снова mounted.
-func (s *Service) healthCheck(ctx context.Context, src Source) {
-	ctx, cancel := context.WithTimeout(ctx, 10*time.Second)
-	defer cancel()
-	done := make(chan struct{})
-	var status string
-	var message *string
-	go func() {
-		status, message = s.check(ctx, src, false)
-		close(done)
-	}()
-	select {
-	case <-done:
-	case <-ctx.Done():
-		m := "storage does not respond"
-		status, message = "error", &m
-	}
-	if status == "error" && src.Type == SourceNFS && src.Status == "error" {
-		// Попробовать перемонтировать, как при старте.
-		if _, err := s.connect(ctx, src); err == nil {
-			return
-		}
-	}
-	if status != src.Status || deref(message) != deref(src.StatusMessage) {
-		if err := s.store.SetSourceStatus(ctx, src.ID, status, message); err != nil {
-			s.log.Warn("health check", "source_id", src.ID, "err", err)
-		}
-	}
-}
-
-// templateSampleSize — сколько треков берёт проверка шаблона записи (docs/uploads.md#7).
-const templateSampleSize = 50
-
-// SuggestWriteTemplate подбирает шаблон записи по существующим путям и выражениям источника.
-func (s *Service) SuggestWriteTemplate(ctx context.Context, id uuid.UUID) (string, error) {
-	if err := requirePerm(ctx, auth.PermManageLibrary); err != nil {
-		return "", err
-	}
-	if _, err := s.store.GetSource(ctx, id); err != nil {
-		return "", notFound(err)
-	}
-	rows, err := s.store.Patterns(ctx, id)
-	if err != nil {
-		return "", err
-	}
-	var exprs []string
-	for _, r := range rows {
-		if r.IsEnabled {
-			exprs = append(exprs, r.Regex)
-		}
-	}
-	paths, err := s.store.SampleFiles(ctx, id, 200)
-	if err != nil {
-		return "", err
-	}
-	tpl, err := meta.SuggestTemplate(exprs, paths)
-	if err != nil {
-		return "", apperr.New(http.StatusUnprocessableEntity, CodeTemplateNone, "no path pattern can be turned into a template")
-	}
-	return tpl, nil
-}
-
-// CheckWriteTemplate применяет шаблон к трекам источника и разбирает пути его выражениями обратно.
-func (s *Service) CheckWriteTemplate(ctx context.Context, id uuid.UUID, template string) (meta.TemplateCheck, error) {
-	if err := requirePerm(ctx, auth.PermManageLibrary); err != nil {
-		return meta.TemplateCheck{}, err
-	}
-	if _, err := s.store.GetSource(ctx, id); err != nil {
-		return meta.TemplateCheck{}, notFound(err)
-	}
-	tpl, err := meta.ParseTemplate(template)
-	if err != nil {
-		return meta.TemplateCheck{}, apperr.Validation("template", CodeTemplateInvalid, err.Error(), map[string]any{"reason": err.Error()})
-	}
-	rows, err := s.store.Patterns(ctx, id)
-	if err != nil {
-		return meta.TemplateCheck{}, err
-	}
-	compiled, err := compile(rows)
-	if err != nil {
-		return meta.TemplateCheck{}, err
-	}
-	samples, err := s.store.TemplateSamples(ctx, id, templateSampleSize)
-	if err != nil {
-		return meta.TemplateCheck{}, err
-	}
-	return meta.CheckTemplate(tpl, compiled, samples), nil
-}

services/api/internal/library/sources.go

@@ -0,0 +1,464 @@
+package library
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"log/slog"
+	"os"
+	"path"
+	"path/filepath"
+	"slices"
+	"strings"
+	"sync"
+	"time"
+	"unicode/utf8"
+
+	"github.com/google/uuid"
+
+	"pipu/api/internal/auth"
+	"pipu/api/internal/library/meta"
+	"pipu/api/internal/platform/apperr"
+	"pipu/api/internal/storageagent"
+)
+
+type SourceStore interface {
+	ListSources(context.Context) ([]Source, error)
+	GetSource(context.Context, uuid.UUID) (Source, error)
+	SaveSource(context.Context, Source) (Source, error)
+	SetSourceStatus(context.Context, uuid.UUID, string, *string) error
+	DeleteSource(context.Context, uuid.UUID) error
+	CleanupOrphans(context.Context) error
+	Counts(context.Context) (Counts, error)
+	AnalysisCounts(context.Context) (AnalysisCounts, error)
+	WaveMetrics(context.Context) (WaveMetrics, error)
+	FileErrors(context.Context, string, int) ([]FileError, error)
+}
+
+// SourceService owns source configuration, connectivity and diagnostics.
+type SourceService struct {
+	store            SourceStore
+	board            *ProgressBoard
+	agent            Agent
+	cfg              Config
+	log              *slog.Logger
+	mu               sync.Mutex
+	OnCatalogChanged func()
+}
+
+// Root — каталог источника в файловой системе api.
+func (s *SourceService) Root(src Source) (string, error) {
+	switch src.Type {
+	case SourceLocal:
+		rel := ""
+		if src.LocalPath != nil {
+			rel = *src.LocalPath
+		}
+		return s.hostPath(rel)
+	case SourceNFS:
+		return filepath.Join(s.cfg.LibraryRoot, src.ID.String()), nil
+	}
+	return "", fmt.Errorf("library: unknown source type %q", src.Type)
+}
+
+// hostPath — путь внутри LIBRARY_HOST; выйти за его пределы нельзя.
+func (s *SourceService) hostPath(rel string) (string, error) {
+	rel = strings.Trim(strings.ReplaceAll(rel, "\\", "/"), "/")
+	clean := path.Clean("/" + rel)
+	if clean != "/"+rel && rel != "" || strings.Contains(rel, "..") {
+		return "", apperr.Validation("local_path", CodeLocalPathInvalid, "path must be relative without ..", nil)
+	}
+	return filepath.Join(s.cfg.HostRoot, filepath.FromSlash(strings.TrimPrefix(clean, "/"))), nil
+}
+
+// ListSources — хранилища с прогрессом сканов.
+func (s *SourceService) ListSources(ctx context.Context) ([]Source, error) {
+	if err := requirePerm(ctx, auth.PermManageLibrary); err != nil {
+		return nil, err
+	}
+	return s.store.ListSources(ctx)
+}
+
+// GetSource — хранилище по id.
+func (s *SourceService) GetSource(ctx context.Context, id uuid.UUID) (Source, error) {
+	if err := requirePerm(ctx, auth.PermManageLibrary); err != nil {
+		return Source{}, err
+	}
+	src, err := s.store.GetSource(ctx, id)
+	return src, notFound(err)
+}
+
+// Progress — прогресс скана источника, если он был.
+func (s *SourceService) Progress(id uuid.UUID) (Progress, bool) { return s.board.Get(id) }
+
+// SourceInput — поля создания / изменения хранилища. nil — не задано.
+type SourceInput struct {
+	Name                *string
+	Type                SourceType
+	NFSServer           *string
+	NFSExport           *string
+	NFSOptions          *string
+	LocalPath           *string
+	TagsFirst           *bool
+	ScanIntervalMinutes *int // 0 — выключить
+	Enabled             *bool
+	AcceptsUploads      *bool
+	WriteTemplate       *string // "" — убрать
+}
+
+func (s *SourceService) apply(src *Source, in SourceInput) error {
+	if in.Name != nil {
+		name := strings.TrimSpace(*in.Name)
+		if name == "" || utf8.RuneCountInString(name) > 100 {
+			return apperr.Validation("name", CodeNameInvalid, "name must be 1-100 characters", map[string]any{"max": 100})
+		}
+		src.Name = name
+	}
+	if in.TagsFirst != nil {
+		src.TagsFirst = *in.TagsFirst
+	}
+	if in.ScanIntervalMinutes != nil {
+		switch m := *in.ScanIntervalMinutes; {
+		case m == 0:
+			src.ScanInterval = nil
+		case m < 5 || m > 60*24*30:
+			return apperr.Validation("scan_interval_minutes", CodeIntervalInvalid, "interval must be 5 minutes .. 30 days",
+				map[string]any{"min": 5})
+		default:
+			d := time.Duration(m) * time.Minute
+			src.ScanInterval = &d
+		}
+	}
+	if in.AcceptsUploads != nil {
+		src.AcceptsUploads = *in.AcceptsUploads
+	}
+	if in.WriteTemplate != nil {
+		if strings.TrimSpace(*in.WriteTemplate) == "" {
+			src.WriteTemplate = nil
+		} else {
+			tpl, err := meta.ParseTemplate(*in.WriteTemplate)
+			if err != nil {
+				return apperr.Validation("write_template", CodeTemplateInvalid, err.Error(), map[string]any{"reason": err.Error()})
+			}
+			text := tpl.String()
+			src.WriteTemplate = &text
+		}
+	}
+	switch src.Type {
+	case SourceLocal:
+		if in.LocalPath != nil {
+			rel := strings.Trim(strings.ReplaceAll(*in.LocalPath, "\\", "/"), "/")
+			if _, err := s.hostPath(rel); err != nil {
+				return err
+			}
+			src.LocalPath = &rel
+		}
+		if src.LocalPath == nil {
+			empty := ""
+			src.LocalPath = &empty
+		}
+	case SourceNFS:
+		if in.NFSServer != nil {
+			src.NFSServer = in.NFSServer
+		}
+		if in.NFSExport != nil {
+			src.NFSExport = in.NFSExport
+		}
+		if in.NFSOptions != nil {
+			src.NFSOptions = *in.NFSOptions
+		}
+		spec, err := nfsSpec(*src).Normalize(false)
+		if err != nil {
+			var ve *storageagent.ValidationError
+			if errors.As(err, &ve) {
+				return apperr.Validation(ve.Field, CodeNFSInvalid, ve.Reason, nil)
+			}
+			return err
+		}
+		src.NFSServer, src.NFSExport, src.NFSOptions = &spec.Server, &spec.Export, spec.Options
+	default:
+		return apperr.Validation("type", "validation.source_type_invalid", "unknown source type", nil)
+	}
+	return nil
+}
+
+func nfsSpec(src Source) storageagent.NFSSpec {
+	var spec storageagent.NFSSpec
+	if src.NFSServer != nil {
+		spec.Server = *src.NFSServer
+	}
+	if src.NFSExport != nil {
+		spec.Export = *src.NFSExport
+	}
+	spec.Options = src.NFSOptions
+	return spec
+}
+
+// CreateSource сохраняет хранилище и сразу пытается подключить его.
+func (s *SourceService) CreateSource(ctx context.Context, in SourceInput) (Source, error) {
+	if err := requirePerm(ctx, auth.PermManageLibrary); err != nil {
+		return Source{}, err
+	}
+	src := Source{ID: newID(), Type: in.Type, TagsFirst: true, Status: "pending", NFSOptions: "ro,nfsvers=4.1,soft,timeo=150,retrans=3"}
+	if in.Name == nil {
+		in.Name = new(string)
+	}
+	if err := s.apply(&src, in); err != nil {
+		return Source{}, err
+	}
+	src, err := s.store.SaveSource(ctx, src)
+	if err != nil {
+		return Source{}, err
+	}
+	return s.connect(ctx, src)
+}
+
+// UpdateSource меняет хранилище; смена адреса или папки переподключает его.
+func (s *SourceService) UpdateSource(ctx context.Context, id uuid.UUID, in SourceInput) (Source, error) {
+	if err := requirePerm(ctx, auth.PermManageLibrary); err != nil {
+		return Source{}, err
+	}
+	src, err := s.store.GetSource(ctx, id)
+	if err != nil {
+		return Source{}, notFound(err)
+	}
+	before := src
+	in.Type = src.Type
+	if err := s.apply(&src, in); err != nil {
+		return Source{}, err
+	}
+	if src, err = s.store.SaveSource(ctx, src); err != nil {
+		return Source{}, err
+	}
+	location := func(x Source) string {
+		return fmt.Sprint(x.LocalPath != nil && *x.LocalPath != "", deref(x.LocalPath), deref(x.NFSServer), deref(x.NFSExport), x.NFSOptions,
+			x.Type == SourceNFS && x.AcceptsUploads)
+	}
+	switch {
+	case in.Enabled != nil && !*in.Enabled:
+		if src.Type == SourceNFS {
+			_ = s.agent.Unmount(ctx, src.ID)
+		}
+		if err := s.store.SetSourceStatus(ctx, src.ID, "disabled", nil); err != nil {
+			return Source{}, err
+		}
+		return s.store.GetSource(ctx, src.ID)
+	case in.Enabled != nil && *in.Enabled, location(before) != location(src), src.Status == "error":
+		return s.connect(ctx, src)
+	}
+	return src, nil
+}
+
+func deref(p *string) string {
+	if p == nil {
+		return ""
+	}
+	return *p
+}
+
+// connect подключает хранилище и записывает статус: local — проверка каталога, nfs — монтирование агентом.
+func (s *SourceService) connect(ctx context.Context, src Source) (Source, error) {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+	status, message := s.check(ctx, src, true)
+	if err := s.store.SetSourceStatus(ctx, src.ID, status, message); err != nil {
+		return Source{}, err
+	}
+	return s.store.GetSource(ctx, src.ID)
+}
+
+// check проверяет доступность; mount — смонтировать NFS (иначе только проверить точку).
+func (s *SourceService) check(ctx context.Context, src Source, mount bool) (string, *string) {
+	msg := func(m string) *string { return &m }
+	switch src.Type {
+	case SourceLocal:
+		root, err := s.Root(src)
+		if err != nil {
+			return "error", msg(err.Error())
+		}
+		info, err := os.Stat(root)
+		if err != nil || !info.IsDir() {
+			return "error", msg("folder not found: " + deref(src.LocalPath))
+		}
+		return "mounted", nil
+	case SourceNFS:
+		if !mount {
+			root, _ := s.Root(src)
+			if _, err := os.Stat(root); err != nil {
+				return "error", msg(err.Error())
+			}
+			return "mounted", nil
+		}
+		res, err := s.agent.Mount(ctx, src.ID, nfsSpec(src), src.AcceptsUploads)
+		if err != nil {
+			return "error", msg(err.Error())
+		}
+		if res.Status != "mounted" {
+			return "error", msg(res.Message)
+		}
+		return "mounted", nil
+	}
+	return "error", msg("unknown type")
+}
+
+// DeleteSource отключает хранилище и удаляет его файлы из каталога.
+func (s *SourceService) DeleteSource(ctx context.Context, id uuid.UUID) error {
+	if err := requirePerm(ctx, auth.PermManageLibrary); err != nil {
+		return err
+	}
+	src, err := s.store.GetSource(ctx, id)
+	if err != nil {
+		return notFound(err)
+	}
+	if p, ok := s.board.Get(id); ok && p.Running {
+		return apperr.Conflict(CodeScanRunning, "scan is running")
+	}
+	if src.Type == SourceNFS {
+		if err := s.agent.Unmount(ctx, id); err != nil {
+			s.log.WarnContext(ctx, "unmount failed", "source_id", id, "err", err)
+		}
+	}
+	if err := s.store.DeleteSource(ctx, id); err != nil {
+		return notFound(err)
+	}
+	if err := s.store.CleanupOrphans(ctx); err != nil {
+		return err
+	}
+	if s.OnCatalogChanged != nil {
+		s.OnCatalogChanged()
+	}
+	return nil
+}
+
+// TestResult — итог проверки подключения.
+type TestResult struct {
+	OK         bool
+	Message    string
+	AudioFiles int
+	Write      *storageagent.WriteTestResult // только для accepts_uploads
+}
+
+// writeTarget — как агенту найти источник на запись.
+func writeTarget(src Source) storageagent.WriteTestRequest {
+	req := storageagent.WriteTestRequest{SourceID: src.ID.String()}
+	if src.Type == SourceLocal {
+		lp := deref(src.LocalPath)
+		req.LocalPath = &lp
+	}
+	return req
+}
+
+// TestSource проверяет доступ к хранилищу и считает аудиофайлы (до 1000).
+func (s *SourceService) TestSource(ctx context.Context, id uuid.UUID) (TestResult, error) {
+	if err := requirePerm(ctx, auth.PermManageLibrary); err != nil {
+		return TestResult{}, err
+	}
+	src, err := s.store.GetSource(ctx, id)
+	if err != nil {
+		return TestResult{}, notFound(err)
+	}
+	res, err := s.testRead(ctx, src)
+	if err != nil || !src.AcceptsUploads {
+		return res, err
+	}
+	w, err := s.agent.TestWrite(ctx, writeTarget(src))
+	if err != nil {
+		w = storageagent.WriteTestResult{Message: err.Error()}
+	}
+	res.Write = &w
+	return res, nil
+}
+
+func (s *SourceService) testRead(ctx context.Context, src Source) (TestResult, error) {
+	if src.Type == SourceNFS {
+		res, err := s.agent.Test(ctx, nfsSpec(src))
+		if err != nil {
+			return TestResult{Message: err.Error()}, nil
+		}
+		return TestResult{OK: res.Status == "mounted", Message: res.Message, AudioFiles: res.AudioFiles}, nil
+	}
+	root, err := s.Root(src)
+	if err != nil {
+		return TestResult{Message: err.Error()}, nil
+	}
+	n := 0
+	err = filepath.WalkDir(root, func(p string, d os.DirEntry, err error) error {
+		if err != nil {
+			return err
+		}
+		if !d.IsDir() && IsAudio(d.Name()) {
+			n++
+			if n >= 1000 {
+				return filepath.SkipAll
+			}
+		}
+		return nil
+	})
+	if err != nil {
+		return TestResult{Message: err.Error(), AudioFiles: n}, nil
+	}
+	return TestResult{OK: true, Message: fmt.Sprintf("found %d audio files", n), AudioFiles: n}, nil
+}
+
+// Status — состояние библиотеки (admin, moderator).
+type Status struct {
+	Counts   Counts
+	Sources  []Source
+	Analysis AnalysisCounts
+	Wave     WaveMetrics
+}
+
+// Status собирает счётчики и состояние источников.
+func (s *SourceService) Status(ctx context.Context) (Status, error) {
+	if err := requirePerm(ctx, auth.PermViewLibraryStatus); err != nil {
+		return Status{}, err
+	}
+	c, err := s.store.Counts(ctx)
+	if err != nil {
+		return Status{}, err
+	}
+	sources, err := s.store.ListSources(ctx)
+	if err != nil {
+		return Status{}, err
+	}
+	analysis, err := s.store.AnalysisCounts(ctx)
+	if err != nil {
+		return Status{}, err
+	}
+	wave, err := s.store.WaveMetrics(ctx)
+	if err != nil {
+		return Status{}, err
+	}
+	return Status{Counts: c, Sources: sources, Analysis: analysis, Wave: wave}, nil
+}
+
+// FileErrors — файлы с ошибками чтения.
+func (s *SourceService) FileErrors(ctx context.Context, after string, limit int) ([]FileError, error) {
+	if err := requirePerm(ctx, auth.PermManageLibrary); err != nil {
+		return nil, err
+	}
+	return s.store.FileErrors(ctx, after, limit)
+}
+
+// HostDirs — подпапки каталога LIBRARY_HOST для выбора local-хранилища.
+func (s *SourceService) HostDirs(ctx context.Context, rel string) (string, []string, error) {
+	if err := requirePerm(ctx, auth.PermManageLibrary); err != nil {
+		return "", nil, err
+	}
+	dir, err := s.hostPath(rel)
+	if err != nil {
+		return "", nil, err
+	}
+	entries, err := os.ReadDir(dir)
+	if err != nil {
+		return "", nil, apperr.Validation("path", CodeLocalPathInvalid, "folder not found", nil)
+	}
+	dirs := []string{}
+	for _, e := range entries {
+		if e.IsDir() && !strings.HasPrefix(e.Name(), ".") {
+			dirs = append(dirs, e.Name())
+		}
+	}
+	slices.Sort(dirs)
+	return strings.Trim(strings.ReplaceAll(rel, "\\", "/"), "/"), dirs, nil
+}

services/api/internal/library/templates.go

@@ -0,0 +1,239 @@
+package library
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"math/rand/v2"
+	"net/http"
+	"path/filepath"
+	"slices"
+	"sync"
+
+	"github.com/google/uuid"
+
+	"pipu/api/internal/auth"
+	"pipu/api/internal/library/meta"
+	"pipu/api/internal/platform/apperr"
+)
+
+type PatternStore interface {
+	GetSource(context.Context, uuid.UUID) (Source, error)
+	Patterns(context.Context, uuid.UUID) ([]PatternRow, error)
+	ReplacePatterns(context.Context, uuid.UUID, []PatternRow) error
+	SampleFiles(context.Context, uuid.UUID, int) ([]string, error)
+	TemplateSamples(context.Context, uuid.UUID, int) ([]meta.TemplateSample, error)
+}
+
+// TemplateService owns metadata pattern preview and write template validation.
+type TemplateService struct {
+	store  PatternStore
+	prober Prober
+	root   func(Source) (string, error)
+}
+
+// Patterns — шаблоны путей источника.
+func (s *TemplateService) Patterns(ctx context.Context, id uuid.UUID) ([]PatternRow, error) {
+	if err := requirePerm(ctx, auth.PermManageLibrary); err != nil {
+		return nil, err
+	}
+	if _, err := s.store.GetSource(ctx, id); err != nil {
+		return nil, notFound(err)
+	}
+	return s.store.Patterns(ctx, id)
+}
+
+func compile(patterns []PatternRow) ([]meta.Pattern, error) {
+	var exprs []string
+	idx := []int{}
+	for i, p := range patterns {
+		if p.IsEnabled {
+			exprs = append(exprs, p.Regex)
+			idx = append(idx, i)
+		}
+	}
+	compiled, err := meta.CompilePatterns(exprs)
+	var pe *meta.PatternError
+	if errors.As(err, &pe) {
+		at := idx[pe.Index]
+		return nil, &apperr.Error{
+			Status: http.StatusUnprocessableEntity, Code: CodePatternInvalid, Detail: pe.Reason,
+			Params: map[string]any{"index": at, "reason": pe.Reason},
+			Fields: []apperr.FieldError{{Field: fmt.Sprintf("patterns[%d].regex", at), Code: CodePatternInvalid}},
+		}
+	}
+	return compiled, err
+}
+
+// PutPatterns проверяет и сохраняет шаблоны.
+func (s *TemplateService) PutPatterns(ctx context.Context, id uuid.UUID, patterns []PatternRow) ([]PatternRow, error) {
+	if err := requirePerm(ctx, auth.PermManageLibrary); err != nil {
+		return nil, err
+	}
+	if _, err := s.store.GetSource(ctx, id); err != nil {
+		return nil, notFound(err)
+	}
+	if _, err := compile(patterns); err != nil {
+		return nil, err
+	}
+	if err := s.store.ReplacePatterns(ctx, id, patterns); err != nil {
+		return nil, err
+	}
+	return s.store.Patterns(ctx, id)
+}
+
+// PreviewItem — разбор одного файла.
+type PreviewItem struct {
+	RelPath      string
+	PatternIndex *int
+	Skipped      bool
+	PathFields   map[string]string
+	Tags         map[string]string
+	Result       meta.Meta
+	Error        string
+}
+
+// Preview применяет шаблоны к выборке файлов без сохранения: из каталога, а до первого скана — из обхода.
+func (s *TemplateService) Preview(ctx context.Context, id uuid.UUID, patterns []PatternRow, sample int) ([]PreviewItem, int, error) {
+	if err := requirePerm(ctx, auth.PermManageLibrary); err != nil {
+		return nil, 0, err
+	}
+	src, err := s.store.GetSource(ctx, id)
+	if err != nil {
+		return nil, 0, notFound(err)
+	}
+	compiled, err := compile(patterns)
+	if err != nil {
+		return nil, 0, err
+	}
+	sample = min(max(sample, 1), 200)
+	root, err := s.root(src)
+	if err != nil {
+		return nil, 0, err
+	}
+	paths, err := s.store.SampleFiles(ctx, id, sample)
+	if err != nil {
+		return nil, 0, err
+	}
+	if len(paths) == 0 {
+		found, err := walk(root, func(string) bool { return false })
+		if err != nil {
+			return nil, 0, apperr.New(http.StatusConflict, CodeSourceOffline, err.Error())
+		}
+		rand.Shuffle(len(found), func(i, j int) { found[i], found[j] = found[j], found[i] })
+		for _, w := range found[:min(sample, len(found))] {
+			paths = append(paths, w.rel)
+		}
+	}
+	slices.Sort(paths)
+
+	items := make([]PreviewItem, len(paths))
+	var wg sync.WaitGroup
+	sem := make(chan struct{}, 8)
+	for i, rel := range paths {
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			sem <- struct{}{}
+			defer func() { <-sem }()
+			items[i] = s.previewOne(ctx, root, rel, compiled, src.TagsFirst)
+		}()
+	}
+	wg.Wait()
+	unmatched := 0
+	for _, it := range items {
+		if it.PatternIndex == nil {
+			unmatched++
+		}
+	}
+	return items, unmatched, nil
+}
+
+func (s *TemplateService) previewOne(ctx context.Context, root, rel string, patterns []meta.Pattern, tagsFirst bool) PreviewItem {
+	it := PreviewItem{RelPath: rel, PathFields: map[string]string{}, Tags: map[string]string{}}
+	m := meta.MatchPath(patterns, rel)
+	if m.Index >= 0 {
+		idx := m.Index
+		it.PatternIndex = &idx
+	}
+	it.Skipped = m.Skip
+	for k, v := range m.Fields {
+		it.PathFields[k] = v
+	}
+	p, err := s.prober.Probe(ctx, filepath.Join(root, filepath.FromSlash(rel)))
+	if err != nil {
+		it.Error = err.Error()
+	}
+	for k, v := range map[string]string{
+		"artist": p.Tags.Artist, "albumartist": p.Tags.AlbumArtist, "album": p.Tags.Album, "title": p.Tags.Title,
+		"genre": p.Tags.Genre, "year": p.Tags.Year, "track": p.Tags.Track, "disc": p.Tags.Disc,
+	} {
+		if v != "" {
+			it.Tags[k] = v
+		}
+	}
+	it.Result = meta.Merge(p.Tags, meta.FromPath(m.Fields), tagsFirst, rel)
+	if it.Result.Album == "" {
+		it.Result.Album = UnknownAlbum
+	}
+	return it
+}
+
+// templateSampleSize — сколько треков берёт проверка шаблона записи (docs/uploads.md#7).
+const templateSampleSize = 50
+
+// SuggestWriteTemplate подбирает шаблон записи по существующим путям и выражениям источника.
+func (s *TemplateService) SuggestWriteTemplate(ctx context.Context, id uuid.UUID) (string, error) {
+	if err := requirePerm(ctx, auth.PermManageLibrary); err != nil {
+		return "", err
+	}
+	if _, err := s.store.GetSource(ctx, id); err != nil {
+		return "", notFound(err)
+	}
+	rows, err := s.store.Patterns(ctx, id)
+	if err != nil {
+		return "", err
+	}
+	var exprs []string
+	for _, r := range rows {
+		if r.IsEnabled {
+			exprs = append(exprs, r.Regex)
+		}
+	}
+	paths, err := s.store.SampleFiles(ctx, id, 200)
+	if err != nil {
+		return "", err
+	}
+	tpl, err := meta.SuggestTemplate(exprs, paths)
+	if err != nil {
+		return "", apperr.New(http.StatusUnprocessableEntity, CodeTemplateNone, "no path pattern can be turned into a template")
+	}
+	return tpl, nil
+}
+
+// CheckWriteTemplate применяет шаблон к трекам источника и разбирает пути его выражениями обратно.
+func (s *TemplateService) CheckWriteTemplate(ctx context.Context, id uuid.UUID, template string) (meta.TemplateCheck, error) {
+	if err := requirePerm(ctx, auth.PermManageLibrary); err != nil {
+		return meta.TemplateCheck{}, err
+	}
+	if _, err := s.store.GetSource(ctx, id); err != nil {
+		return meta.TemplateCheck{}, notFound(err)
+	}
+	tpl, err := meta.ParseTemplate(template)
+	if err != nil {
+		return meta.TemplateCheck{}, apperr.Validation("template", CodeTemplateInvalid, err.Error(), map[string]any{"reason": err.Error()})
+	}
+	rows, err := s.store.Patterns(ctx, id)
+	if err != nil {
+		return meta.TemplateCheck{}, err
+	}
+	compiled, err := compile(rows)
+	if err != nil {
+		return meta.TemplateCheck{}, err
+	}
+	samples, err := s.store.TemplateSamples(ctx, id, templateSampleSize)
+	if err != nil {
+		return meta.TemplateCheck{}, err
+	}
+	return meta.CheckTemplate(tpl, compiled, samples), nil
+}

services/api/internal/playback/events.go

@@ -0,0 +1,88 @@
+package playback
+
+import (
+	"context"
+	"time"
+
+	"github.com/google/uuid"
+
+	"pipu/api/internal/api/gen"
+	"pipu/api/internal/auth"
+)
+
+// EventService owns event acceptance and its transaction; HTTP only authenticates and maps DTOs.
+type EventService struct {
+	store *Store
+	now   func() time.Time
+}
+
+func (s EventService) Accept(ctx context.Context, p auth.Principal, events []gen.PlayEvent) (gen.PostEvents200JSONResponse, error) {
+	now := s.now()
+	ids := make([]uuid.UUID, 0, len(events))
+	for _, e := range events {
+		ids = append(ids, e.TrackId)
+	}
+	durations, err := s.store.TrackDurations(ctx, ids)
+	if err != nil {
+		return gen.PostEvents200JSONResponse{}, err
+	}
+	clientType := s.store.SessionClientType(ctx, p.SessionID)
+
+	out := gen.PostEvents200JSONResponse{}
+	tx, err := s.store.Begin(ctx)
+	if err != nil {
+		return gen.PostEvents200JSONResponse{}, err
+	}
+	defer func() { _ = tx.Rollback(ctx) }()
+	for _, e := range events {
+		dur, known := durations[e.TrackId]
+		at := e.OccurredAt.UTC()
+		if !known || at.Before(now.Add(-maxEventAge)) {
+			out.Rejected++
+			continue
+		}
+		if at.After(now.Add(maxEventClockSkew)) {
+			at = now // часы клиента спешат
+		}
+		ev := Event{
+			ID: e.Id, Type: string(e.Type), TrackID: e.TrackId, OccurredAt: at, PositionMs: e.PositionMs,
+			PlayedMs: e.PlayedMs, ContextID: e.ContextId, WaveSessionID: e.WaveSessionId,
+			Offline: e.Offline != nil && *e.Offline,
+		}
+		if e.ContextType != nil {
+			ct := string(*e.ContextType)
+			ev.ContextType = &ct
+		}
+		inserted, err := s.store.InsertEvent(ctx, tx, p.UserID, clientType, ev)
+		if err != nil {
+			return gen.PostEvents200JSONResponse{}, err
+		}
+		if !inserted {
+			out.Duplicates++
+			continue
+		}
+		out.Accepted++
+		played := 0
+		if e.PlayedMs != nil {
+			played = *e.PlayedMs
+		}
+		o := Judge(ev.Type, played, dur)
+		if o != (Outcome{}) {
+			if err := s.store.ApplyOutcome(ctx, tx, p.UserID, ev, o); err != nil {
+				return gen.PostEvents200JSONResponse{}, err
+			}
+		}
+		if outcome := impressionOutcome(ev.Type, o); outcome != "" && ev.ContextType != nil && *ev.ContextType == "wave" &&
+			ev.ContextID != nil {
+			if sid, err := uuid.Parse(*ev.ContextID); err == nil {
+				if err := s.store.MarkImpression(ctx, tx, sid, ev.TrackID, outcome); err != nil {
+					return gen.PostEvents200JSONResponse{}, err
+				}
+			}
+		}
+	}
+	if err := tx.Commit(ctx); err != nil {
+		return gen.PostEvents200JSONResponse{}, err
+	}
+	return out, nil
+}

services/api/internal/playback/handler.go

@@ -34,11 +34,11 @@ const (
 )
 
 // Handler реализует playback- и collection-части gen.StrictServerInterface,
-// а также library.Personalizer (ссылки на стрим и реакции в треках).
+// персонализация каталога вынесена в Personalizer.
 type Handler struct {
 	store      *Store
 	catalog    *library.Store
-	dto        func() library.DTO
+	dto        library.DTO
 	signer     *sign.Signer
 	transcoder *Transcoder
 	// RootFor — каталог хранилища в файловой системе api (для отдачи файлов без nginx и транскода).
@@ -48,8 +48,8 @@ type Handler struct {
 	now     func() time.Time
 }
 
-// NewHandler создаёт обработчик. dto — DTO каталога с персонализацией (замыкание: DTO ссылается на сам Handler).
-func NewHandler(store *Store, catalog *library.Store, dto func() library.DTO, signer *sign.Signer, tr *Transcoder,
+// NewHandler создаёт обработчик. dto — независимо собранный DTO каталога с персонализацией.
+func NewHandler(store *Store, catalog *library.Store, dto library.DTO, signer *sign.Signer, tr *Transcoder,
 	rootFor func(context.Context, uuid.UUID) (string, error), xAccel bool, log *slog.Logger,
 ) *Handler {
 	return &Handler{
@@ -66,34 +66,6 @@ func principal(ctx context.Context) (auth.Principal, error) {
 	return p, nil
 }
 
-// Personalize реализует library.Personalizer.
-func (h *Handler) Personalize(ctx context.Context, rows []library.TrackRow, out []gen.Track) error {
-	p, ok := auth.PrincipalFrom(ctx)
-	if !ok {
-		return nil
-	}
-	ids := make([]uuid.UUID, len(rows))
-	for i, r := range rows {
-		ids[i] = r.ID
-	}
-	reactions, err := h.store.Reactions(ctx, p.UserID, ids)
-	if err != nil {
-		return err
-	}
-	now := h.now()
-	for i := range out {
-		if out[i].Available {
-			u := StreamURL(h.signer, p.UserID, rows[i].ID, now)
-			out[i].StreamUrl = &u
-		}
-		if r, ok := reactions[rows[i].ID]; ok {
-			rr := gen.Reaction(r)
-			out[i].Reaction = &rr
-		}
-	}
-	return nil
-}
-
 // --- стрим ---
 
 // StreamTrack реализует gen.StrictServerInterface.
@@ -236,7 +208,7 @@ func (h *Handler) GetTracksBatch(ctx context.Context, req gen.GetTracksBatchRequ
 	if err != nil {
 		return nil, err
 	}
-	items, err := h.dto().Tracks(ctx, rows)
+	items, err := h.dto.Tracks(ctx, rows)
 	if err != nil {
 		return nil, err
 	}
@@ -251,74 +223,7 @@ func (h *Handler) PostEvents(ctx context.Context, req gen.PostEventsRequestObjec
 	if err != nil {
 		return nil, err
 	}
-	now := h.now()
-	ids := make([]uuid.UUID, 0, len(req.Body.Events))
-	for _, e := range req.Body.Events {
-		ids = append(ids, e.TrackId)
-	}
-	durations, err := h.store.TrackDurations(ctx, ids)
-	if err != nil {
-		return nil, err
-	}
-	clientType := h.store.SessionClientType(ctx, p.SessionID)
-
-	out := gen.PostEvents200JSONResponse{}
-	tx, err := h.store.Begin(ctx)
-	if err != nil {
-		return nil, err
-	}
-	defer func() { _ = tx.Rollback(ctx) }()
-	for _, e := range req.Body.Events {
-		dur, known := durations[e.TrackId]
-		at := e.OccurredAt.UTC()
-		if !known || at.Before(now.Add(-maxEventAge)) {
-			out.Rejected++
-			continue
-		}
-		if at.After(now.Add(maxEventClockSkew)) {
-			at = now // часы клиента спешат
-		}
-		ev := Event{
-			ID: e.Id, Type: string(e.Type), TrackID: e.TrackId, OccurredAt: at, PositionMs: e.PositionMs,
-			PlayedMs: e.PlayedMs, ContextID: e.ContextId, WaveSessionID: e.WaveSessionId,
-			Offline: e.Offline != nil && *e.Offline,
-		}
-		if e.ContextType != nil {
-			ct := string(*e.ContextType)
-			ev.ContextType = &ct
-		}
-		inserted, err := h.store.InsertEvent(ctx, tx, p.UserID, clientType, ev)
-		if err != nil {
-			return nil, err
-		}
-		if !inserted {
-			out.Duplicates++
-			continue
-		}
-		out.Accepted++
-		played := 0
-		if e.PlayedMs != nil {
-			played = *e.PlayedMs
-		}
-		o := Judge(ev.Type, played, dur)
-		if o != (Outcome{}) {
-			if err := h.store.ApplyOutcome(ctx, tx, p.UserID, ev, o); err != nil {
-				return nil, err
-			}
-		}
-		if outcome := impressionOutcome(ev.Type, o); outcome != "" && ev.ContextType != nil && *ev.ContextType == "wave" &&
-			ev.ContextID != nil {
-			if sid, err := uuid.Parse(*ev.ContextID); err == nil {
-				if err := h.store.MarkImpression(ctx, tx, sid, ev.TrackID, outcome); err != nil {
-					return nil, err
-				}
-			}
-		}
-	}
-	if err := tx.Commit(ctx); err != nil {
-		return nil, err
-	}
-	return out, nil
+	return (EventService{store: h.store, now: h.now}).Accept(ctx, p, req.Body.Events)
 }
 
 // --- состояние плеера ---
@@ -441,7 +346,7 @@ func (h *Handler) hydrate(ctx context.Context, ids []uuid.UUID) (map[uuid.UUID]g
 	if err != nil {
 		return nil, err
 	}
-	dtos, err := h.dto().Tracks(ctx, rows)
+	dtos, err := h.dto.Tracks(ctx, rows)
 	if err != nil {
 		return nil, err
 	}
@@ -591,8 +496,6 @@ func (h *Handler) ClearTrackReaction(ctx context.Context, req gen.ClearTrackReac
 	return gen.ClearTrackReaction204Response{}, nil
 }
 
-var _ library.Personalizer = (*Handler)(nil)
-
 // impressionOutcome — исход показа волны по событию: complete | skip_early | skip | like | dislike.
 func impressionOutcome(eventType string, o Outcome) string {
 	switch {