chore(release): v0.7.0

Список «Питания» разбивался на два <Card> (активные/выключенные). При
переключении строка переезжала между списками → её Switch размонтировался и
монтировался заново, и ползунок анимировался только при включении (mount
x:0→20), а при выключении — нет.

Теперь единый keyed-список (включённые сверху): Switch остаётся смонтированным,
ползунок плавно ездит в обе стороны, а строка «переезжает» в свою группу через
framer layout-анимацию. Иконке добавлен transition-colors. Глобальный Switch не
трогал — Упражнения/Дашборд не затронуты.

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

CHANGELOG.md

@@ -6,6 +6,128 @@
 
 ## [Unreleased]
 
+## [0.7.0] — 2026-06-08
+
+### Added
+
+- Текущая версия `v0.6.6` сохранена отдельным тегом `последнее-удачное`
+  как точка отката перед большим редизайном.
+
+### Changed
+
+- Интерфейс приложения пересобран в новом desktop-направлении: темный сайдбар,
+  плотный рабочий контент, нейтральная палитра, чёткие панели и радиусы 8–10px.
+- Главный экран стал операционным overview: верхняя панель состояния, компактные
+  status tiles, план ближайшего шага, цели, питание, режим и игровые долги.
+- Страницы упражнений, питания, игр, челленджей и настроек получили единый
+  desktop-контейнер, более плотные списки и менее декоративные summary-блоки.
+- Редакторы, модальные окна, кнопки, переключатели, heatmap, достижения и окно
+  напоминания приведены к новой desktop-системе.
+
+## [0.6.6] — 2026-06-08
+
+### Added
+
+- Settings получили верхнюю панель состояния: сразу видно, работают ли напоминания,
+  включены ли тихие часы, авто-пауза встреч и запуск вместе с Windows.
+- Добавлен renderer-стенд `npm run dev:renderer` с демо-данными для безопасной
+  визуальной проверки UI без доступа к реальным пользовательским настройкам.
+
+### Changed
+
+- Settings перегруппированы: язык и тема теперь находятся в одном блоке “Интерфейс”,
+  а главный переключатель напоминаний вынесен в раздел “Напоминания”.
+- Сводные карточки на вторичных страницах больше не обрезают длинные значения и
+  используют более спокойную сетку для десктопных ширин.
+- Sidebar теперь показывает “Напоминания на паузе”, если глобальный режим остановлен.
+
+### Fixed
+
+- На главном экране дата больше не получает искусственную капитализацию.
+- Цели и ближайшие действия показывают единицы измерения: например “осталось 30 раз”.
+- Русский статус трекинга матчей больше не показывает английское `Setup`.
+
+## [0.6.5] — 2026-06-07
+
+### Added
+
+- Главный экран переосмыслен как обзор действий: верхний заголовок теперь
+  показывает текущее состояние (`пора сделать`, `следующее`, `встреча`,
+  `пауза`, `план под контролем`) вместо абстрактного “Сегодня”.
+- Добавлены тесты для Windows autostart и для того, что Discord не считается
+  активной встречей.
+
+### Changed
+
+- Пункт главной навигации переименован с “Сегодня” на “Обзор”.
+- Тексты meeting auto-pause стали нейтральнее: “Встреча активна”, без
+  формулировки “Не дёргаем — ты на встрече”.
+- Discord убран из списка приложений, которые ставят напоминания на паузу.
+
+### Fixed
+
+- Исправлена проверка `Запускать с Windows`: чтение login item теперь использует
+  тот же `path` и `--hidden`, что и запись через `setLoginItemSettings`.
+
+## [0.6.4] — 2026-06-07
+
+### Added
+
+- На страницах `Упражнения`, `Питание`, `Игры`, `Челленджи` и `Настройки`
+  добавлены верхние сводные карточки: активные элементы, нагрузка, цели,
+  ближайшее питание, состояние игровых интеграций и ключевые настройки.
+- Добавлен общий `PageScaffold` для единых заголовков и insight-карточек в renderer.
+
+### Changed
+
+- Видимый бренд в интерфейсе сменен с “Не Залипай” на “Разомнись”.
+- README, title, release notes и описание пакета обновлены под новое название.
+
+## [0.6.3] — 2026-06-07
+
+### Added
+
+- Главный экран получил новый блок прогресса: мягкий уровень, недельные
+  мини-челленджи и “игровой долг” после каток.
+- Добавлен `src/renderer/src/lib/momentum.ts`: вычисляемая модель ритма недели,
+  XP/уровня и Dota match-debt без изменения persisted state.
+- Добавлены тесты `momentum.test.ts` на недельные челленджи, игровые долги и
+  расчет уровня.
+
+### Changed
+
+- Визуальный бренд в интерфейсе сменен на “Не Залипай”.
+- README обновлен под новую продуктовую концепцию: план дня, недельные
+  челленджи, игровые долги и 241 passing tests.
+
+## [0.6.2] — 2026-06-06
+
+### Added
+
+- `npm run verify` и `scripts/verify.ps1`: typecheck, tests, lint, build и
+  audit summary одним локальным прогоном.
+- Diagnostics card в Settings: версии приложения/runtime, userData/store/log
+  paths, счетчики persisted state, updater/game/GSI/meeting status, открытие
+  папки логов и копирование diagnostics JSON.
+- Renderer error reporting: `ErrorBoundary`, `window.error` и
+  `unhandledrejection` теперь отправляют отчеты в main logs.
+- Electron security hardening: deny-by-default permission handlers и запрет
+  `webview` attach.
+- `docs/SECURITY_TRIAGE.md` с текущим audit baseline и release rules.
+
+### Changed
+
+- Обновлены зависимости: Electron `42.3.3`, electron-builder `26.15.0`,
+  electron-vite `5.0.0`, Vite `7.3.5`, `@vitejs/plugin-react` `5.2.0`,
+  electron-updater `6.8.9`, esbuild `0.28.0`.
+- Валидация quiet hours стала строгой в renderer и main: значения вроде
+  `25:00` / `09:99` отклоняются до сохранения.
+
+### Fixed
+
+- `npm audit` снижен с 13 vulnerabilities до 0 после staged upgrade Electron
+  runtime и build-chain.
+
 ## [0.5.8] — 2026-05-22
 
 Автономный QA-проход: проверил все элементы, нашёл и починил несколько
@@ -20,13 +142,13 @@
   history не перетягивалась. Heatmap стоял пока пользователь не
   добавит/удалит упражнение. Сейчас новый event `evtHistoryChanged`
   шлётся из main после `markDone/snooze/skip/markChallengeDone/
-  clearHistory/import`, Dashboard на него подписан.
+clearHistory/import`, Dashboard на него подписан.
 - **Rapid double-click больше не пишет в историю дважды.** В Match
   Summary при быстром тыке ✓ дважды один и тот же challenge мог
   записаться 2 раза → лишние +N reps в стрик. То же для кнопки
   «Готово» в ExerciseCard. ref-based дедуп.
 - **Native save/open dialogs локализованы.** Раньше title `«Сохранить
-  резервную копию»` показывался даже в EN-локали.
+резервную копию»` показывался даже в EN-локали.
 - **Default exerciseName в challenge editor — пустой** (было
   «Приседания» — выглядело как недопереведённый русский в EN UI).
 
@@ -66,16 +188,16 @@
 ### Fixed (P1 — UX просадки)
 
 - **Удаление упражнения теперь спрашивает подтверждение.** Раньше
-  один клик в menu «Удалить» сразу удалял. Сейчас iOS-style ConfirmModal
+  один клик в menu «Удалить» сразу удалял. Сейчас ConfirmModal
   с destructive-кнопкой.
 - **Daily goal закрыт — больше не «25 часов 13 минут».** Когда дневная
   цель достигнута, ExerciseCard показывает «Цель закрыта · 100/100»
   с success-зелёным цветом, а не запутанный обратный отсчёт до завтра.
 - **Авто-пауза на ВКС видна в Dashboard.** Раньше fires пропускались
   молча — пользователь не понимал почему через 12 мин ничего не пришло.
-  Сейчас info-баннер «Не дёргаем — ты на встрече» с указанием закрыть
+  Сейчас info-баннер активной встречи с указанием закрыть
   Zoom/Teams/etc.
-- **Native `window.confirm()` → iOS-style ConfirmModal** в restore-операции.
+- **Native `window.confirm()` → ConfirmModal** в restore-операции.
   Раньше всплывал серый системный диалог.
 
 ### Fixed (P2 — полировка)
@@ -101,7 +223,7 @@
 ### Added
 
 - `src/renderer/src/components/ui/ConfirmModal.tsx` — переиспользуемый
-  iOS-style confirm с focus-trap'ом через Modal.
+  confirm с focus-trap'ом через Modal.
 - IPC `markChallengeDone(challengeId, reps)` — handler в main, метод в
   preload (раньше канал был в IPC enum, handler не зарегистрирован).
 - IPC `getMeetingActive` + event `evtMeetingChanged` — meeting-detect
@@ -130,7 +252,7 @@
   Когда total reps за сегодня (с actualReps) ≥ dailyGoal → scheduler
   переносит fire на завтра. История = source of truth.
 - **Авто-пауза на ВКС** (#5) — сканирует процессы tasklist'ом раз в
-  30с: Zoom/Teams (старый+new)/Discord/Webex/Slack/Skype/Meet/Whereby/
+  30с: Zoom/Teams (старый+new)/Webex/Slack/Skype/Meet/Whereby/
   GoToMeeting. Если запущен — fires не выполняются.
 - **Адаптивный шедулер** (#2) — opt-in флаг в exercise editor.
   Heuristic-модель строит hour-of-day success rate по 30 дням истории
@@ -306,7 +428,7 @@
 - **Modal focus trap + focus restore + aria-labelledby.** Tab/Shift-Tab
   больше не вываливаются на нижний слой; на закрытии фокус
   возвращается на триггер.
-- **Sidebar mobile drawer:** Esc закрывает, focus trap внутри, focus
+- **Sidebar compact drawer:** Esc закрывает, focus trap внутри, focus
   restore на гамбургер, `role="dialog"` + `aria-modal`.
 - **Tray menu i18n** — пункты меню следуют `settings.language`.
 - **Bilingual heatmap.** Title, легенда, weekday-лейблы и tooltip
@@ -334,7 +456,7 @@
   блокирует CSRF от browser-вкладок. Body cap 256 KB (OOM-вектор
   закрыт). Require `application/json`. Generic 400 без error-echo.
 - **`isQuietAt` wrap-around + day filter.** С `22:00 → 07:00,
-  days=[Mon..Fri]` теперь правильно проверяется день *начала* окна
+days=[Mon..Fri]` теперь правильно проверяется день _начала_ окна
   (старт Fri 22:00 → активно ночью Sat 02:00).
 - **DST drift в `history.ts`.** Календарная арифметика (`setDate`)
   вместо ms-арифметики — на границе DST дни больше не дублируются.
@@ -428,9 +550,9 @@
 
 ## [0.3.x] — 2026-05-17
 
-Серия мелких релизов с дизайн-итерациями (Apple iOS / macOS aesthetic):
+Серия мелких релизов с ранними дизайн-итерациями:
 шрифты Plus Jakarta Sans + Bricolage Grotesque, светлая/тёмная/системная
-тема, vibrancy sidebar, iOS-grouped lists, spring-анимации.
+тема, полупрозрачный сайдбар, grouped lists, spring-анимации.
 
 ## [0.2.0] — 2026-05-16
 
@@ -446,7 +568,13 @@
 иконки), системный трей, автозапуск с Windows, native-уведомления,
 NSIS-инсталлятор, auto-update через electron-updater.
 
-[Unreleased]: https://git.xn--90adajar8af4h.xn--p1ai/AnRil/laude/compare/v0.5.8...HEAD
+[Unreleased]: https://git.xn--90adajar8af4h.xn--p1ai/AnRil/laude/compare/v0.7.0...HEAD
+[0.7.0]: https://git.xn--90adajar8af4h.xn--p1ai/AnRil/laude/compare/v0.6.6...v0.7.0
+[0.6.6]: https://git.xn--90adajar8af4h.xn--p1ai/AnRil/laude/compare/v0.6.5...v0.6.6
+[0.6.5]: https://git.xn--90adajar8af4h.xn--p1ai/AnRil/laude/compare/v0.6.4...v0.6.5
+[0.6.4]: https://git.xn--90adajar8af4h.xn--p1ai/AnRil/laude/compare/v0.6.3...v0.6.4
+[0.6.3]: https://git.xn--90adajar8af4h.xn--p1ai/AnRil/laude/compare/v0.6.2...v0.6.3
+[0.6.2]: https://git.xn--90adajar8af4h.xn--p1ai/AnRil/laude/compare/v0.5.8...v0.6.2
 [0.5.8]: https://git.xn--90adajar8af4h.xn--p1ai/AnRil/laude/releases/tag/v0.5.8
 [0.5.7]: https://git.xn--90adajar8af4h.xn--p1ai/AnRil/laude/releases/tag/v0.5.7
 [0.5.6]: https://git.xn--90adajar8af4h.xn--p1ai/AnRil/laude/releases/tag/v0.5.6

README.md

@@ -1,9 +1,9 @@
-# Laude — Exercise Reminder
+# Разомнись — Exercise Reminder
 
-Windows desktop приложение, которое напоминает делать упражнения во время работы за компьютером. Опционально подключается к Dota 2 и после каждого матча превращает статистику (смерти, убийства, ассисты) в количество повторений.
+Windows desktop приложение, которое помогает делать короткие перерывы без потери фокуса: держит план дня, напоминает размяться, ведёт недельные челленджи и превращает Dota 2 статистику после матча в игровые долги.
 
-[![release](https://img.shields.io/badge/release-v0.5.8-orange)](https://git.xn--90adajar8af4h.xn--p1ai/AnRil/laude/releases/latest)
+[![release](https://img.shields.io/badge/release-v0.7.0-orange)](https://git.xn--90adajar8af4h.xn--p1ai/AnRil/laude/releases/latest)
-[![tests](https://img.shields.io/badge/tests-203%20passing-green)]()
+[![tests](https://img.shields.io/badge/tests-245%20passing-green)]()
 [![platform](https://img.shields.io/badge/platform-Windows%2010%2F11-blue)]()
 
 ## Что внутри
@@ -11,10 +11,11 @@ Windows desktop приложение, которое напоминает дел
 - **Гибкие напоминания** — любое количество упражнений, интервал от минуты до часов, разные иконки.
 - **Питание** — отдельная вкладка с приёмами пищи по времени суток (завтрак/обед/ужин/перекусы), выбор дней недели, пресеты быстрого добавления. Напоминания по настенным часам, а не по интервалу.
 - **История и стрики** — heatmap-календарь активности, ежедневный счётчик, серия дней подряд.
+- **Обзор** — главный экран с ближайшим действием, планом дня, уровнем, недельными мини-челленджами и игровым долгом.
 - **Тихие часы** — окно времени когда напоминания подавляются (например `22:00 → 08:00`), с выбором дней недели.
 - **Сделал частично** — степпер `−/+` в окне напоминания: если ты сделал 5 из 10, в историю запишется честное число.
 - **Игровая интеграция (Dota 2)** — Game State Integration читает статистику матча, после Победа/Поражение показывает экран с «причитающимися» повторениями (например `10 смертей × 3 = 30 приседаний`).
-- **Apple-style интерфейс** — Plus Jakarta Sans + Bricolage Grotesque, iOS-палитра, vibrancy sidebar, spring-анимации, светлая/тёмная/системная тема.
+- **Desktop-интерфейс** — темный сайдбар, плотные рабочие панели, чёткие строки списков, светлая/тёмная/системная тема.
 - **Два языка** — русский и английский, переключение мгновенное.
 - **Auto-update** — приложение само скачивает новые версии из фиксированного `update-channel` (проверка каждый час, силент-ретрай при сетевых сбоях).
 
@@ -45,8 +46,10 @@ npm run dev
 
 ```bash
 npm run typecheck       # tsc по main + renderer
+npm run verify          # typecheck + tests + lint + build + audit summary
 npm run test            # vitest в watch-режиме
 npm run test:run        # vitest один раз (для CI)
+npm run dev:renderer    # renderer-стенд с демо-данными для UI-проверки
 npm run build           # сборка без NSIS
 npm run dist            # сборка + NSIS-инсталлятор → release/
 npm run release -- -Bump patch    # bump версии + tag + push + upload в Gitea
@@ -56,8 +59,8 @@ npm run release -- -Bump patch    # bump версии + tag + push + upload в G
 
 ## Архитектура
 
-- **Electron 33** — multi-process: main (Node/scheduler/GSI) + preload (contextBridge) + renderer (React)
+- **Electron 42** — multi-process: main (Node/scheduler/GSI) + preload (contextBridge) + renderer (React)
-- **Renderer** — React 18, TypeScript 5, Vite 5, Tailwind 3, framer-motion, react-router, zustand
+- **Renderer** — React 18, TypeScript 5, Vite 7, Tailwind 3, framer-motion, react-router, zustand
 - **Persistence** — единственный JSON-файл `%APPDATA%\Exercise Reminder\app-state.json` (debounced writes)
 - **IPC** — типизированные каналы через `src/shared/ipc.ts`, обёрнуто preload-ом
 - **i18n** — самописная микро-система: `src/renderer/src/i18n/dict.ts` (плоский словарь ~200 ключей × 2 языка) + хук `useT()`
@@ -71,19 +74,22 @@ src/main/validate.test.ts                (78)
 src/renderer/src/lib/history.test.ts     (31)
 src/renderer/src/i18n/i18n.test.ts       (15)
 src/renderer/src/lib/format.test.ts      (14)
-src/main/scheduler.test.ts               (13)
+src/main/scheduler.test.ts               (14)
 src/main/games/vdf.test.ts               (11)
-src/main/store.test.ts                   (10)
+src/main/store.test.ts                   (12)
 src/renderer/src/lib/achievements.test.ts (10)
 src/shared/release-notes.test.ts          (9)
 src/shared/meals.test.ts                  (8)
-src/main/meeting-detect.test.ts           (7)
+src/main/meeting-detect.test.ts           (8)
 src/shared/quiet-hours.test.ts            (7)
 src/main/adaptive.test.ts                 (6)
+src/renderer/src/lib/day-plan.test.ts     (6)
 src/shared/types.test.ts                  (4)
 src/renderer/src/lib/icon-choices.test.ts (4)
+src/renderer/src/lib/momentum.test.ts     (3)
+src/main/autostart.test.ts                (3)
 ──────────────────────────────────────────
-                                   227 ✓
+                                   245 ✓
 ```
 
 Покрытие: IPC-валидация (упражнения/челленджи/приёмы пищи), persistence (миграции, карантин битого JSON, history cap), scheduler-гейтинг (тихие часы, ВКС-пауза, daily-goal), планирование приёмов пищи по времени суток (DST-safe), детект ВКС, история/стрики (DST), тихие часы (wrap), парсер VDF для Steam-конфигов, достижения, i18n с плюрализацией RU/EN, дефолты shared-типов.

docs/SECURITY_TRIAGE.md

@@ -0,0 +1,88 @@
+# Security triage
+
+Дата последнего triage: 2026-06-06
+
+Этот файл фиксирует текущий статус `npm audit`, принятые решения по
+dependency-upgrade и минимальные правила перед релизом. Он не заменяет
+регулярное обновление зависимостей: цель в том, чтобы не терять контекст между
+релизами и отличать runtime-риск от build-chain риска.
+
+## Текущий статус
+
+`npm run verify` выполняет:
+
+- typecheck;
+- tests;
+- lint;
+- build;
+- audit summary.
+
+Наблюдаемый audit snapshot после upgrade:
+
+- 0 vulnerabilities;
+- `npm run verify` проходит полностью;
+- `npm run dist:dir` собирает unpacked Windows build.
+
+## Выполненные обновления
+
+- `electron` обновлен до `42.3.3`;
+- `electron-builder` обновлен до `26.15.0`;
+- `electron-vite` обновлен до `5.0.0`;
+- `vite` обновлен до `7.3.5`;
+- `@vitejs/plugin-react` обновлен до `5.2.0`;
+- `electron-updater` обновлен до `6.8.9`;
+- `esbuild` обновлен до `0.28.0`.
+
+`vite` оставлен на major 7, а не поднят до 8, потому что актуальный
+`electron-vite@5.0.0` объявляет peer range `^5.0.0 || ^6.0.0 || ^7.0.0`.
+Переход на Vite 8 стоит делать отдельным шагом после совместимого релиза
+`electron-vite`.
+
+## Runtime baseline
+
+Electron является runtime-платформой приложения, поэтому его audit-риск был
+самым важным. После обновления runtime-риск из audit закрыт, но перед релизом
+все равно нужен ручной smoke test Electron-поведения.
+
+Текущие mitigations:
+
+- `sandbox: true`;
+- `contextIsolation: true`;
+- `nodeIntegration: false`;
+- строгий preload API через `contextBridge`;
+- IPC runtime validation;
+- CSP в renderer `index.html`;
+- allowlist для внешних URL;
+- deny-by-default permission handlers;
+- запрет `webview` attach;
+- renderer error/unhandled rejection reporting в main logs.
+
+## Build-chain baseline
+
+`electron-builder`, `electron-vite`, `vite` и `esbuild` обновлены отдельным
+шагом от runtime upgrade. `npm run dist:dir` подтверждает, что packaged build
+создается после обновления build-chain.
+
+Перед публикацией installer все равно нужно проверить:
+
+- NSIS installer build через `npm run dist`;
+- запуск установленного приложения;
+- сохранение данных в `%APPDATA%\Exercise Reminder\`;
+- auto-update metadata и `update-channel`;
+- импорт/экспорт данных;
+- tray behavior;
+- main window и reminder window;
+- Dota 2 GSI install/uninstall и callback listener.
+
+## Release rule
+
+Перед релизом:
+
+- `npm run verify`;
+- `npm run dist`;
+- smoke test installed app;
+- проверка `update-channel`;
+- повторный `npm audit`.
+
+Если новый audit снова сообщает high runtime issue, релиз нужно считать
+blocked, пока риск не разобран отдельно.

package.json

@@ -1,12 +1,13 @@
 {
   "name": "laude",
-  "version": "0.6.0",
+  "version": "0.7.0",
-  "description": "Exercise reminder — Windows desktop app",
+  "description": "Разомнись — Windows desktop break and exercise reminder",
   "main": "out/main/index.js",
   "author": "AnRil",
   "private": true,
   "scripts": {
     "dev": "electron-vite dev",
+    "dev:renderer": "vite --config vite.renderer.config.mjs",
     "build": "electron-vite build",
     "preview": "electron-vite preview",
     "typecheck:node": "tsc --noEmit -p tsconfig.node.json",
@@ -18,6 +19,7 @@
     "format": "prettier --write \"src/**/*.{ts,tsx,css}\" \"*.{json,md}\" \".github/**/*.yml\"",
     "format:check": "prettier --check \"src/**/*.{ts,tsx,css}\" \"*.{json,md}\"",
     "lint": "eslint src --ext .ts,.tsx --max-warnings 0",
+    "verify": "powershell -ExecutionPolicy Bypass -File scripts/verify.ps1",
     "dist": "electron-vite build && electron-builder --win --x64",
     "dist:dir": "electron-vite build && electron-builder --win --x64 --dir",
     "publish": "electron-vite build && electron-builder --win --x64 --publish always",
@@ -28,7 +30,7 @@
     "@fontsource/bricolage-grotesque": "^5.2.10",
     "@fontsource/jetbrains-mono": "^5.2.8",
     "@fontsource/plus-jakarta-sans": "^5.2.8",
-    "electron-updater": "^6.8.3",
+    "electron-updater": "^6.8.9",
     "framer-motion": "^11.11.17",
     "lucide-react": "^0.460.0",
     "react": "^18.3.1",
@@ -42,11 +44,13 @@
     "@types/react-dom": "^18.3.1",
     "@typescript-eslint/eslint-plugin": "^8.15.0",
     "@typescript-eslint/parser": "^8.15.0",
-    "@vitejs/plugin-react": "^4.3.3",
+    "@vitejs/plugin-react": "^5.2.0",
+    "@vitest/coverage-v8": "^4.1.6",
     "autoprefixer": "^10.4.20",
-    "electron": "^33.2.0",
+    "electron": "^42.3.3",
-    "electron-builder": "^25.1.8",
+    "electron-builder": "^26.15.0",
-    "electron-vite": "^2.3.0",
+    "electron-vite": "^5.0.0",
+    "esbuild": "^0.28.0",
     "eslint": "^8.57.1",
     "eslint-plugin-react": "^7.37.2",
     "eslint-plugin-react-hooks": "^5.0.0",
@@ -54,7 +58,7 @@
     "prettier": "^3.4.1",
     "tailwindcss": "^3.4.15",
     "typescript": "^5.6.3",
-    "vite": "^5.4.11",
+    "vite": "^7.3.5",
     "vitest": "^4.1.6"
   },
   "build": {

scripts/release.ps1

@@ -116,9 +116,6 @@ $pkgJson = [System.IO.File]::ReadAllText($pkgPath, $utf8NoBom)
 $pkgJson = $pkgJson -replace "`"version`":\s*`"$current`"", "`"version`": `"$next`""
 [System.IO.File]::WriteAllText($pkgPath, $pkgJson, $utf8NoBom)
 
-git add package.json
-git commit -m "chore(release): $tag"
-
 # --- Quality gates ------------------------------------------------------
 if (-not $SkipBuild) {
   Write-Host "Typecheck..." -ForegroundColor Cyan
@@ -145,6 +142,12 @@ foreach ($f in @($installer, $blockmap, $manifest)) {
   }
 }
 
+# Commit only after quality gates and artifact verification pass. If a check
+# fails, package.json remains modified but history does not get a broken
+# release commit/tag.
+git add package.json
+git commit -m "chore(release): $tag"
+
 # --- Tag + push ---------------------------------------------------------
 Write-Host "Tagging $tag and pushing..." -ForegroundColor Cyan
 git tag -a $tag -m "Release $tag"

scripts/upload-release-assets.ps1

@@ -30,6 +30,10 @@ param(
 
 $ErrorActionPreference = 'Stop'
 
+# Windows PowerShell 5.1 can default to older TLS settings and fail against
+# modern HTTPS endpoints before curl.exe gets a chance to upload assets.
+[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12
+
 $repoOwner = 'AnRil'
 $repoName  = 'laude'
 $giteaHost = 'git.xn--90adajar8af4h.xn--p1ai'

scripts/verify.ps1

@@ -0,0 +1,31 @@
+$ErrorActionPreference = 'Stop'
+
+function Invoke-Step {
+  param(
+    [Parameter(Mandatory = $true)][string]$Name,
+    [Parameter(Mandatory = $true)][string]$Command,
+    [Parameter(Mandatory = $true)][string[]]$Arguments
+  )
+
+  Write-Host ""
+  Write-Host "==> $Name"
+  & $Command @Arguments
+  if ($LASTEXITCODE -ne 0) {
+    throw "$Name failed with exit code $LASTEXITCODE"
+  }
+}
+
+Invoke-Step 'Typecheck' 'npm.cmd' @('run', 'typecheck')
+Invoke-Step 'Tests' 'npm.cmd' @('run', 'test:run')
+Invoke-Step 'Lint' 'npm.cmd' @('run', 'lint')
+Invoke-Step 'Build' 'npm.cmd' @('run', 'build')
+
+Write-Host ""
+Write-Host "==> Audit summary"
+& npm.cmd audit --audit-level=moderate
+if ($LASTEXITCODE -ne 0) {
+  Write-Warning 'npm audit reported vulnerabilities. See the output above; verification gates still passed.'
+}
+
+Write-Host ""
+Write-Host "Verification complete."

src/main/autostart.test.ts

@@ -0,0 +1,73 @@
+import { beforeEach, afterEach, describe, expect, it, vi } from 'vitest'
+
+const h = vi.hoisted(() => ({
+  app: {
+    setLoginItemSettings: vi.fn(),
+    getLoginItemSettings: vi.fn(() => ({ openAtLogin: false })),
+    wasOpenedAsHidden: false
+  }
+}))
+
+vi.mock('electron', () => ({ app: h.app }))
+
+const originalPlatform = process.platform
+
+function setPlatform(platform: NodeJS.Platform): void {
+  Object.defineProperty(process, 'platform', {
+    value: platform,
+    configurable: true
+  })
+}
+
+async function load(): Promise<typeof import('./autostart')> {
+  vi.resetModules()
+  return import('./autostart')
+}
+
+beforeEach(() => {
+  setPlatform('win32')
+  h.app.setLoginItemSettings.mockClear()
+  h.app.getLoginItemSettings.mockReset()
+  h.app.getLoginItemSettings.mockReturnValue({ openAtLogin: false })
+})
+
+afterEach(() => {
+  setPlatform(originalPlatform)
+})
+
+describe('autostart', () => {
+  it('writes Windows login item with the hidden startup argument', async () => {
+    const { setAutostart } = await load()
+
+    setAutostart(true)
+
+    expect(h.app.setLoginItemSettings).toHaveBeenCalledWith({
+      openAtLogin: true,
+      openAsHidden: true,
+      path: process.execPath,
+      args: ['--hidden']
+    })
+  })
+
+  it('reads Windows login item using the same path and args', async () => {
+    h.app.getLoginItemSettings.mockReturnValue({ openAtLogin: true })
+    const { isAutostartEnabled } = await load()
+
+    expect(isAutostartEnabled()).toBe(true)
+    expect(h.app.getLoginItemSettings).toHaveBeenCalledWith({
+      path: process.execPath,
+      args: ['--hidden']
+    })
+  })
+
+  it('does nothing on non-Windows platforms', async () => {
+    setPlatform('linux')
+    const { setAutostart, isAutostartEnabled } = await load()
+
+    setAutostart(true)
+
+    expect(isAutostartEnabled()).toBe(false)
+    expect(h.app.setLoginItemSettings).not.toHaveBeenCalled()
+    expect(h.app.getLoginItemSettings).not.toHaveBeenCalled()
+  })
+})

src/main/autostart.ts

@@ -1,19 +1,29 @@
 import { app } from 'electron'
 
 const HIDDEN_FLAG = '--hidden'
+type LoginItemOptions = NonNullable<
+  Parameters<typeof app.getLoginItemSettings>[0]
+>
+
+function loginItemOptions(): LoginItemOptions {
+  return {
+    path: process.execPath,
+    args: [HIDDEN_FLAG]
+  }
+}
 
 export function setAutostart(enabled: boolean): void {
   if (process.platform !== 'win32') return
   app.setLoginItemSettings({
+    ...loginItemOptions(),
     openAtLogin: enabled,
-    path: process.execPath,
+    openAsHidden: true
-    args: [HIDDEN_FLAG]
   })
 }
 
 export function isAutostartEnabled(): boolean {
   if (process.platform !== 'win32') return false
-  return app.getLoginItemSettings().openAtLogin
+  return app.getLoginItemSettings(loginItemOptions()).openAtLogin
 }
 
 export function wasStartedHidden(): boolean {

src/main/diagnostics.ts

@@ -0,0 +1,79 @@
+import { app, clipboard, shell } from 'electron'
+import { existsSync, statSync } from 'node:fs'
+import type { DiagnosticsInfo } from '@shared/types'
+import {
+  getGsiBaseUrl,
+  getGsiPort,
+  isGsiServerRunning
+} from './games/gsi-server'
+import { listGamesStatus } from './games/registry'
+import { getLogDir } from './logger'
+import { isMeetingActiveSync } from './meeting-detect'
+import { getState, getStorePath } from './store'
+import { getUpdaterStatus } from './updater'
+
+function fileSize(path: string): number | null {
+  try {
+    if (!path || !existsSync(path)) return null
+    return statSync(path).size
+  } catch {
+    return null
+  }
+}
+
+export async function getDiagnosticsInfo(): Promise<DiagnosticsInfo> {
+  const state = getState()
+  const store = getStorePath()
+  const games = await listGamesStatus()
+
+  return {
+    generatedAt: Date.now(),
+    app: {
+      version: app.getVersion(),
+      isPackaged: app.isPackaged,
+      platform: process.platform,
+      arch: process.arch
+    },
+    runtime: {
+      electron: process.versions.electron ?? 'unknown',
+      chrome: process.versions.chrome ?? 'unknown',
+      node: process.versions.node
+    },
+    paths: {
+      userData: app.getPath('userData'),
+      store,
+      logs: getLogDir()
+    },
+    store: {
+      bytes: fileSize(store),
+      exercises: state.exercises.length,
+      meals: state.meals.length,
+      challenges: state.challenges.length,
+      history: state.history?.length ?? 0
+    },
+    updater: getUpdaterStatus(),
+    games,
+    gsi: {
+      running: isGsiServerRunning(),
+      port: getGsiPort(),
+      baseUrl: getGsiBaseUrl()
+    },
+    meetingActive: isMeetingActiveSync()
+  }
+}
+
+export async function openLogsFolder(): Promise<{
+  ok: boolean
+  error?: string
+}> {
+  const dir = getLogDir()
+  if (!dir) return { ok: false, error: 'logs-unavailable' }
+  const error = await shell.openPath(dir)
+  return error ? { ok: false, error } : { ok: true }
+}
+
+export async function copyDiagnosticsToClipboard(): Promise<DiagnosticsInfo> {
+  const info = await getDiagnosticsInfo()
+  clipboard.writeText(JSON.stringify(info, null, 2))
+  return info
+}

src/main/games/gsi-server.ts

@@ -144,3 +144,7 @@ export function getGsiBaseUrl(): string {
 export function getGsiPort(): number {
   return PORT
 }
+
+export function isGsiServerRunning(): boolean {
+  return server !== null
+}

src/main/games/registry.test.ts

@@ -0,0 +1,119 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const h = vi.hoisted(() => ({
+  provider: {
+    displayName: 'Dota 2',
+    start: vi.fn(),
+    stop: vi.fn(),
+    detect: vi.fn(),
+    install: vi.fn(),
+    uninstall: vi.fn(),
+    reconcile: vi.fn()
+  },
+  startGsiServer: vi.fn(),
+  stopGsiServer: vi.fn(),
+  onLaunchOptionsApplied: vi.fn(),
+  gamesEnabled: { dota2: true },
+  fireMatchSummary: vi.fn(),
+  log: { info: vi.fn(), warn: vi.fn(), error: vi.fn(), debug: vi.fn() }
+}))
+
+vi.mock('electron', () => ({
+  BrowserWindow: { getAllWindows: () => [] }
+}))
+
+vi.mock('./dota2', () => ({
+  Dota2Provider: vi.fn(function Dota2Provider() {
+    return h.provider
+  })
+}))
+
+vi.mock('./gsi-server', () => ({
+  startGsiServer: h.startGsiServer,
+  stopGsiServer: h.stopGsiServer
+}))
+
+vi.mock('./steam-launch-options', () => ({
+  onLaunchOptionsApplied: h.onLaunchOptionsApplied
+}))
+
+vi.mock('../store', () => ({
+  getChallenges: () => [],
+  getGamesEnabled: () => h.gamesEnabled
+}))
+
+vi.mock('../notifications', () => ({
+  fireMatchSummary: h.fireMatchSummary
+}))
+
+vi.mock('../logger', () => ({
+  log: h.log
+}))
+
+async function loadRegistry(): Promise<typeof import('./registry')> {
+  return import('./registry')
+}
+
+beforeEach(() => {
+  vi.resetModules()
+  h.provider.start.mockResolvedValue(undefined)
+  h.provider.stop.mockResolvedValue(undefined)
+  h.provider.detect.mockResolvedValue({
+    id: 'dota2',
+    name: 'Dota 2',
+    installed: true,
+    integrationActive: true,
+    launchOptionStatus: 'applied',
+    enabled: true
+  })
+  h.provider.install.mockResolvedValue(undefined)
+  h.provider.uninstall.mockResolvedValue(undefined)
+  h.provider.reconcile.mockResolvedValue(undefined)
+  h.startGsiServer.mockReset()
+  h.startGsiServer.mockResolvedValue(undefined)
+  h.stopGsiServer.mockReset()
+  h.stopGsiServer.mockResolvedValue(undefined)
+  h.onLaunchOptionsApplied.mockClear()
+  h.fireMatchSummary.mockClear()
+  h.log.info.mockClear()
+  h.log.warn.mockClear()
+  h.log.error.mockClear()
+  h.log.debug.mockClear()
+})
+
+describe('games registry lifecycle', () => {
+  it('сбрасывает running после ошибки старта GSI и позволяет повторный старт', async () => {
+    h.startGsiServer
+      .mockRejectedValueOnce(new Error('port busy'))
+      .mockResolvedValueOnce(undefined)
+
+    const { startGamesRegistry } = await loadRegistry()
+    await startGamesRegistry()
+    await startGamesRegistry()
+
+    expect(h.startGsiServer).toHaveBeenCalledTimes(2)
+    expect(h.provider.start).toHaveBeenCalledTimes(1)
+  })
+
+  it('stopGamesRegistry ждёт полного shutdown GSI-сервера', async () => {
+    let releaseStop!: () => void
+    const stopPromise = new Promise<void>((resolve) => {
+      releaseStop = resolve
+    })
+    h.stopGsiServer.mockReturnValue(stopPromise)
+
+    const { startGamesRegistry, stopGamesRegistry } = await loadRegistry()
+    await startGamesRegistry()
+
+    let resolved = false
+    const pending = stopGamesRegistry().then(() => {
+      resolved = true
+    })
+    await Promise.resolve()
+
+    expect(resolved).toBe(false)
+    releaseStop()
+    await pending
+    expect(resolved).toBe(true)
+  })
+})

src/main/games/registry.ts

@@ -87,6 +87,7 @@ export async function startGamesRegistry(): Promise<void> {
     await startGsiServer()
     log.info('[games] GSI server started on port 4701')
   } catch (err) {
+    running = false
     log.error('[games] GSI server failed to start', err)
     return
   }
@@ -119,7 +120,7 @@ export async function stopGamesRegistry(): Promise<void> {
   for (const id of Object.keys(providers) as GameId[]) {
     await providers[id].stop()
   }
-  stopGsiServer()
+  await stopGsiServer()
 }
 
 export async function listGamesStatus(): Promise<GameStatus[]> {

src/main/index.ts

@@ -14,6 +14,7 @@ import { startGamesRegistry, stopGamesRegistry } from './games/registry'
 import { initUpdater, stopUpdater } from './updater'
 import { IPC } from '@shared/ipc'
 import { log } from './logger'
+import { installSecurityHardening } from './security'
 
 const APP_ID = 'com.anril.exercise-reminder'
 
@@ -45,6 +46,7 @@ if (!gotLock) {
   app.on('second-instance', () => showMainWindow())
 
   app.whenReady().then(() => {
+    installSecurityHardening()
     registerIpc()
     createTray()
 

src/main/ipc.ts

@@ -10,7 +10,12 @@ import {
 import type { IpcMainEvent, IpcMainInvokeEvent } from 'electron'
 import { readFileSync, writeFileSync } from 'node:fs'
 import { IPC } from '@shared/ipc'
-import type { Exercise, GameId, Settings } from '@shared/types'
+import type {
+  Exercise,
+  GameId,
+  RendererErrorReport,
+  Settings
+} from '@shared/types'
 import {
   addChallenge,
   addExercise,
@@ -68,6 +73,13 @@ import {
   validateSnoozeMinutes
 } from './validate'
 import { log } from './logger'
+import {
+  copyDiagnosticsToClipboard,
+  getDiagnosticsInfo,
+  openLogsFolder
+} from './diagnostics'
+
+const MAX_RENDERER_ERROR_FIELD = 8_000
 
 /**
  * Враппер вокруг `ipcMain.handle`: ловит любое исключение в обработчике,
@@ -105,10 +117,7 @@ function safeOn<F extends (event: IpcMainEvent, ...args: never[]) => void>(
 ): void {
   ipcMain.on(channel, (event, ...args) => {
     try {
-      const call = fn as unknown as (
+      const call = fn as unknown as (e: IpcMainEvent, ...a: unknown[]) => void
-        e: IpcMainEvent,
-        ...a: unknown[]
-      ) => void
       call(event, ...args)
     } catch (err) {
       log.error(`[ipc] ${channel} (on) threw`, err)
@@ -116,6 +125,21 @@ function safeOn<F extends (event: IpcMainEvent, ...args: never[]) => void>(
   })
 }
 
+function cleanRendererError(raw: unknown): RendererErrorReport | null {
+  if (typeof raw !== 'object' || raw === null) return null
+  const r = raw as Record<string, unknown>
+  const message = typeof r.message === 'string' ? r.message.trim() : ''
+  if (!message) return null
+  const clean = (v: unknown): string | undefined =>
+    typeof v === 'string' ? v.slice(0, MAX_RENDERER_ERROR_FIELD) : undefined
+  return {
+    message: message.slice(0, MAX_RENDERER_ERROR_FIELD),
+    stack: clean(r.stack),
+    componentStack: clean(r.componentStack),
+    source: clean(r.source)
+  }
+}
+
 export function registerIpc(): void {
   safeHandle(IPC.getState, () => {
     // Без history (см. getStateForRenderer) и с актуальным значением
@@ -136,17 +160,14 @@ export function registerIpc(): void {
     return ex
   })
 
-  safeHandle(
+  safeHandle(IPC.updateExercise, (_e, idRaw: unknown, patchRaw: unknown) => {
-    IPC.updateExercise,
+    const id = validateId(idRaw)
-    (_e, idRaw: unknown, patchRaw: unknown) => {
+    const patch = validateExercisePatch(patchRaw)
-      const id = validateId(idRaw)
+    if (!id || !patch) return null
-      const patch = validateExercisePatch(patchRaw)
+    const ex = updateExercise(id, patch)
-      if (!id || !patch) return null
+    broadcastState()
-      const ex = updateExercise(id, patch)
+    return ex
-      broadcastState()
+  })
-      return ex
-    }
-  )
 
   safeHandle(IPC.deleteExercise, (_e, idRaw: unknown) => {
     const id = validateId(idRaw)
@@ -156,28 +177,27 @@ export function registerIpc(): void {
     return ok
   })
 
-  safeHandle(
+  safeHandle(IPC.toggleExercise, (_e, idRaw: unknown, enabledRaw: unknown) => {
-    IPC.toggleExercise,
+    const id = validateId(idRaw)
-    (_e, idRaw: unknown, enabledRaw: unknown) => {
+    if (!id || typeof enabledRaw !== 'boolean') return null
-      const id = validateId(idRaw)
+    const patch: Partial<Exercise> = { enabled: enabledRaw }
-      if (!id || typeof enabledRaw !== 'boolean') return null
+    if (enabledRaw) {
-      const patch: Partial<Exercise> = { enabled: enabledRaw }
+      const ex = getState().exercises.find((e) => e.id === id)
-      if (enabledRaw) {
+      if (ex) patch.nextFireAt = Date.now() + ex.intervalMinutes * 60_000
-        const ex = getState().exercises.find((e) => e.id === id)
-        if (ex) patch.nextFireAt = Date.now() + ex.intervalMinutes * 60_000
-      }
-      const ex = updateExercise(id, patch)
-      broadcastState()
-      return ex
     }
-  )
+    const ex = updateExercise(id, patch)
+    broadcastState()
+    return ex
+  })
 
   safeHandle(IPC.markDone, (_e, idRaw: unknown, repsRaw?: unknown) => {
     const id = validateId(idRaw)
     if (!id) return null
     const ex = markDone(id, validateActualReps(repsRaw))
-    broadcastState()
+    if (ex) {
-    broadcastHistoryChanged()
+      broadcastState()
+      broadcastHistoryChanged()
+    }
     return ex
   })
 
@@ -186,8 +206,10 @@ export function registerIpc(): void {
     const minutes = validateSnoozeMinutes(minRaw)
     if (!id || minutes === null) return null
     const ex = snooze(id, minutes)
-    broadcastState()
+    if (ex) {
-    broadcastHistoryChanged()
+      broadcastState()
+      broadcastHistoryChanged()
+    }
     return ex
   })
 
@@ -195,8 +217,10 @@ export function registerIpc(): void {
     const id = validateId(idRaw)
     if (!id) return null
     const ex = skip(id)
-    broadcastState()
+    if (ex) {
-    broadcastHistoryChanged()
+      broadcastState()
+      broadcastHistoryChanged()
+    }
     return ex
   })
 
@@ -238,7 +262,10 @@ export function registerIpc(): void {
     const id = validateId(idRaw)
     if (!id) return null
     const m = markMealDone(id)
-    broadcastState()
+    if (m) {
+      broadcastState()
+      broadcastHistoryChanged()
+    }
     return m
   })
 
@@ -290,6 +317,19 @@ export function registerIpc(): void {
 
   safeHandle(IPC.getMeetingActive, () => isMeetingActiveSync())
 
+  safeHandle(IPC.getDiagnostics, () => getDiagnosticsInfo())
+
+  safeHandle(IPC.openLogsFolder, () => openLogsFolder())
+
+  safeHandle(IPC.copyDiagnostics, () => copyDiagnosticsToClipboard())
+
+  safeHandle(IPC.reportRendererError, (_e, raw: unknown) => {
+    const report = cleanRendererError(raw)
+    if (!report) return false
+    log.error('[renderer] error reported', report)
+    return true
+  })
+
   safeHandle(IPC.quit, () => app.quit())
   safeHandle(IPC.reminderClose, () => hideReminderWindow())
 
@@ -360,17 +400,14 @@ export function registerIpc(): void {
     broadcastState()
     return c
   })
-  safeHandle(
+  safeHandle(IPC.updateChallenge, (_e, idRaw: unknown, patchRaw: unknown) => {
-    IPC.updateChallenge,
+    const id = validateId(idRaw)
-    (_e, idRaw: unknown, patchRaw: unknown) => {
+    const patch = validateChallengePatch(patchRaw)
-      const id = validateId(idRaw)
+    if (!id || !patch) return null
-      const patch = validateChallengePatch(patchRaw)
+    const c = updateChallenge(id, patch)
-      if (!id || !patch) return null
+    broadcastState()
-      const c = updateChallenge(id, patch)
+    return c
-      broadcastState()
+  })
-      return c
-    }
-  )
   safeHandle(IPC.deleteChallenge, (_e, idRaw: unknown) => {
     const id = validateId(idRaw)
     if (!id) return false
@@ -378,31 +415,25 @@ export function registerIpc(): void {
     broadcastState()
     return ok
   })
-  safeHandle(
+  safeHandle(IPC.toggleChallenge, (_e, idRaw: unknown, enabledRaw: unknown) => {
-    IPC.toggleChallenge,
+    const id = validateId(idRaw)
-    (_e, idRaw: unknown, enabledRaw: unknown) => {
+    if (!id || typeof enabledRaw !== 'boolean') return null
-      const id = validateId(idRaw)
+    const c = updateChallenge(id, { enabled: enabledRaw })
-      if (!id || typeof enabledRaw !== 'boolean') return null
+    broadcastState()
-      const c = updateChallenge(id, { enabled: enabledRaw })
+    return c
-      broadcastState()
+  })
-      return c
-    }
-  )
 
   safeHandle(IPC.closeMatchSummary, () => hideReminderWindow())
 
-  safeHandle(
+  safeHandle(IPC.markChallengeDone, (_e, idRaw: unknown, repsRaw: unknown) => {
-    IPC.markChallengeDone,
+    const id = validateId(idRaw)
-    (_e, idRaw: unknown, repsRaw: unknown) => {
+    const reps = validateActualReps(repsRaw)
-      const id = validateId(idRaw)
+    if (!id || reps === undefined || reps <= 0) return false
-      const reps = validateActualReps(repsRaw)
+    markChallengeDone(id, reps)
-      if (!id || reps === undefined || reps <= 0) return false
+    broadcastState()
-      markChallengeDone(id, reps)
+    broadcastHistoryChanged()
-      broadcastState()
+    return true
-      broadcastHistoryChanged()
+  })
-      return true
-    }
-  )
 
   // Dev helper: simulate a match end with given stats. NEVER registered in
   // packaged builds — a compromised renderer (XSS, malicious npm dep) could
@@ -439,17 +470,13 @@ export function registerIpc(): void {
   // renderer не получает прямого доступа к ФС.
   safeHandle(IPC.exportState, async (event) => {
     const win = BrowserWindow.fromWebContents(event.sender) ?? undefined
-    const stamp = new Date()
+    const stamp = new Date().toISOString().replace(/[:T]/g, '-').slice(0, 16)
-      .toISOString()
-      .replace(/[:T]/g, '-')
-      .slice(0, 16)
     const defaultPath = `laude-backup-${stamp}.json`
     // Native-диалоги OS читают локаль из системы. Title — единственная
     // строка которую мы контролируем; локализуем по settings.language.
     const lang = getState().settings.language ?? 'ru'
     const result = await dialog.showSaveDialog(win!, {
-      title:
+      title: lang === 'en' ? 'Save backup' : 'Сохранить резервную копию',
-        lang === 'en' ? 'Save backup' : 'Сохранить резервную копию',
       defaultPath,
       filters: [{ name: 'JSON', extensions: ['json'] }]
     })
@@ -471,7 +498,9 @@ export function registerIpc(): void {
     const lang = getState().settings.language ?? 'ru'
     const result = await dialog.showOpenDialog(win!, {
       title:
-        lang === 'en' ? 'Restore from backup' : 'Восстановить из резервной копии',
+        lang === 'en'
+          ? 'Restore from backup'
+          : 'Восстановить из резервной копии',
       properties: ['openFile'],
       filters: [{ name: 'JSON', extensions: ['json'] }]
     })

src/main/logger.ts

@@ -121,5 +121,6 @@ export const log = {
 
 /** Путь к логам (для диагностики). Возвращает пустую строку до initLogger(). */
 export function getLogDir(): string {
+  ensurePaths()
   return logDir
 }

src/main/meeting-detect.test.ts

@@ -21,6 +21,8 @@ const h = vi.hoisted(() => ({
   log: { info: vi.fn(), warn: vi.fn(), error: vi.fn(), debug: vi.fn() }
 }))
 
+const originalPlatform = process.platform
+
 vi.mock('node:child_process', () => ({
   exec: (cmd: string, opts: unknown, cb: ExecCb) => {
     h.calls += 1
@@ -39,8 +41,16 @@ async function load(): Promise<typeof import('./meeting-detect')> {
   return import('./meeting-detect')
 }
 
+function setPlatform(platform: NodeJS.Platform): void {
+  Object.defineProperty(process, 'platform', {
+    value: platform,
+    configurable: true
+  })
+}
+
 beforeEach(() => {
   vi.resetModules()
+  setPlatform('win32')
   h.calls = 0
   h.execImpl = (_cmd, _opts, cb) => cb(null, { stdout: '' })
   h.log.info.mockClear()
@@ -48,6 +58,7 @@ beforeEach(() => {
 })
 
 afterEach(() => {
+  setPlatform(originalPlatform)
   vi.restoreAllMocks()
 })
 
@@ -73,13 +84,19 @@ describe('isMeetingActive', () => {
   })
 
   it('кэширует результат в пределах CACHE_MS (exec вызывается один раз)', async () => {
-    h.execImpl = (_c, _o, cb) => cb(null, { stdout: csv('discord.exe') })
+    h.execImpl = (_c, _o, cb) => cb(null, { stdout: csv('zoom.exe') })
     const { isMeetingActive } = await load()
     await isMeetingActive()
     await isMeetingActive()
     expect(h.calls).toBe(1)
   })
 
+  it('не считает Discord встречей', async () => {
+    h.execImpl = (_c, _o, cb) => cb(null, { stdout: csv('discord.exe') })
+    const { isMeetingActive } = await load()
+    expect(await isMeetingActive()).toBe(false)
+  })
+
   it('при падении tasklist возвращает false и логирует warn', async () => {
     h.execImpl = (_c, _o, cb) => cb(new Error('ETIMEDOUT'))
     const { isMeetingActive } = await load()
@@ -96,14 +113,9 @@ describe('isMeetingActive', () => {
   })
 
   it('на не-Windows возвращает false без вызова tasklist', async () => {
-    const original = process.platform
+    setPlatform('linux')
-    Object.defineProperty(process, 'platform', { value: 'linux' })
+    const { isMeetingActive } = await load()
-    try {
+    expect(await isMeetingActive()).toBe(false)
-      const { isMeetingActive } = await load()
+    expect(h.calls).toBe(0)
-      expect(await isMeetingActive()).toBe(false)
-      expect(h.calls).toBe(0)
-    } finally {
-      Object.defineProperty(process, 'platform', { value: original })
-    }
   })
 })

src/main/meeting-detect.ts

@@ -1,7 +1,7 @@
 /**
  * Эвристическое обнаружение «человек на ВКС» по списку запущенных процессов.
  *
- * Идея: если запущен Zoom/Teams/Discord/Meet/Webex — пользователь скорее
+ * Идея: если запущен Zoom/Teams/Meet/Webex — пользователь скорее
  * всего на встрече или собирается зайти. Останавливаем напоминания, чтобы
  * не прерывать. После «снятия» процессов возобновляем.
  *
@@ -36,7 +36,6 @@ const MEETING_PROCESSES = new Set([
   'zoom.exe',
   'teams.exe',
   'ms-teams.exe', // новые Teams 2.0
-  'discord.exe',
   'webex.exe',
   'webexmta.exe',
   'meet.exe', // Google Meet desktop (редкость)

src/main/scheduler.test.ts

@@ -186,6 +186,21 @@ describe('checkDueExercises gating', () => {
     expect(h.updateExercise).toHaveBeenCalled()
   })
 
+  it('dailyGoal использует reps snapshot из истории, а не текущие reps упражнения', async () => {
+    h.exercises = [makeExercise({ reps: 25, dailyGoal: 20 })]
+    h.history = [
+      {
+        ts: Date.now(),
+        exerciseId: 'ex1',
+        action: 'done',
+        reps: 10
+      }
+    ]
+    const { forceCheck } = await loadScheduler()
+    forceCheck()
+    expect(h.fireReminder).toHaveBeenCalledTimes(1)
+  })
+
   it('adaptive: применяет adjustNextFireAt к кандидату', async () => {
     h.exercises = [makeExercise({ adaptive: true })]
     const { forceCheck } = await loadScheduler()

src/main/scheduler.ts

@@ -17,7 +17,8 @@ import { adjustNextFireAt } from './adaptive'
 
 /**
  * Сколько reps пользователь сделал по упражнению `ex` за сегодня (local day).
- * Учитываем actualReps если задано (частичное выполнение), иначе planned reps.
+ * Учитываем actualReps если задано (частичное выполнение), затем snapshot
+ * reps из истории, и только потом текущие planned reps упражнения.
  */
 function repsDoneToday(ex: Exercise, history: HistoryEntry[]): number {
   const todayKey = new Date()
@@ -28,7 +29,7 @@ function repsDoneToday(ex: Exercise, history: HistoryEntry[]): number {
     if (e.action !== 'done') continue
     if (e.exerciseId !== ex.id) continue
     if (e.ts < startMs) continue
-    sum += e.actualReps ?? ex.reps
+    sum += e.actualReps ?? e.reps ?? ex.reps
   }
   return sum
 }

src/main/security.ts

@@ -0,0 +1,37 @@
+import { app, session } from 'electron'
+import { log } from './logger'
+
+/**
+ * Renderer permissions are denied by default. The app does not need camera,
+ * microphone, geolocation, USB/HID/serial, direct notification permission or
+ * browser-driven openExternal; all trusted privileged actions go through
+ * validated IPC handlers in main.
+ */
+export function installSecurityHardening(): void {
+  session.defaultSession.setPermissionRequestHandler(
+    (_webContents, permission, callback, details) => {
+      log.warn('[security] denied permission request', {
+        permission,
+        requestingUrl: 'requestingUrl' in details ? details.requestingUrl : ''
+      })
+      callback(false)
+    }
+  )
+
+  session.defaultSession.setPermissionCheckHandler(
+    (_webContents, permission, requestingOrigin) => {
+      log.warn('[security] denied permission check', {
+        permission,
+        requestingOrigin
+      })
+      return false
+    }
+  )
+
+  app.on('web-contents-created', (_event, contents) => {
+    contents.on('will-attach-webview', (event) => {
+      event.preventDefault()
+      log.warn('[security] blocked webview attach')
+    })
+  })
+}

src/main/store.test.ts

@@ -8,6 +8,7 @@ import {
 } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
+import { DEFAULT_SETTINGS } from '@shared/types'
 
 /**
  * Тесты persistence-слоя. Мокаем electron.app.getPath на временную директорию
@@ -147,6 +148,43 @@ describe('store · history cap', () => {
   })
 })
 
+describe('store · meal history', () => {
+  it('markMealDone пишет meal-entry в историю', async () => {
+    writeFileSync(
+      statePath(),
+      JSON.stringify({
+        exercises: [],
+        meals: [
+          {
+            id: 'm1',
+            name: 'Обед',
+            time: '13:00',
+            icon: 'Soup',
+            enabled: true,
+            days: [],
+            nextFireAt: Date.now() + 60_000
+          }
+        ],
+        challenges: [],
+        history: []
+      }),
+      'utf-8'
+    )
+
+    const { markMealDone, getHistory } = await load()
+    expect(markMealDone('m1')).toBeDefined()
+    expect(getHistory()).toMatchObject([
+      {
+        exerciseId: 'meal:m1',
+        action: 'done',
+        reps: 1,
+        name: 'Обед',
+        source: 'meal'
+      }
+    ])
+  })
+})
+
 describe('store · clearHistory', () => {
   it('удаляет записи старше границы и возвращает количество', async () => {
     const ex = {
@@ -195,4 +233,79 @@ describe('store · export / import', () => {
     expect(importState('not json at all')).toBe(false)
     expect(importState('42')).toBe(false)
   })
+
+  it('import сохраняет валидные части snapshot и отбрасывает повреждённые записи', async () => {
+    const validExercise = {
+      id: 'x1',
+      name: 'Тест',
+      reps: 10,
+      icon: 'Activity',
+      intervalMinutes: 30,
+      enabled: true,
+      nextFireAt: Date.now() + 1000
+    }
+    const validMeal = {
+      id: 'm1',
+      name: 'Обед',
+      time: '13:00',
+      icon: 'Soup',
+      enabled: true,
+      days: [],
+      nextFireAt: Date.now() + 1000
+    }
+    const validChallenge = {
+      id: 'c1',
+      name: 'За убийства',
+      gameId: 'dota2',
+      stat: 'kills',
+      multiplier: 1,
+      exerciseName: 'Отжимания',
+      icon: 'Dumbbell',
+      enabled: true
+    }
+
+    const { importState, getState, getSettings, getHistory } = await load()
+    expect(
+      importState(
+        JSON.stringify({
+          exercises: [
+            validExercise,
+            { ...validExercise, id: 'bad-ex', intervalMinutes: -5 }
+          ],
+          meals: [validMeal, { ...validMeal, id: 'bad-meal', time: '25:00' }],
+          settings: {
+            globalEnabled: false,
+            snoozeMinutes: -1,
+            language: 'xx'
+          },
+          challenges: [
+            validChallenge,
+            { ...validChallenge, id: 'bad-challenge', gameId: 'cs2' }
+          ],
+          gamesEnabled: { dota2: true, cs2: true },
+          history: [
+            { ts: 100, exerciseId: 'x1', action: 'done', reps: 10 },
+            { ts: -1, exerciseId: 'x1', action: 'done', reps: 10 },
+            {
+              ts: 200,
+              exerciseId: 'meal:m1',
+              action: 'done',
+              reps: 1,
+              source: 'meal'
+            }
+          ]
+        })
+      )
+    ).toBe(true)
+
+    const state = getState()
+    expect(state.exercises.map((e) => e.id)).toEqual(['x1'])
+    expect(state.meals.map((m) => m.id)).toEqual(['m1'])
+    expect(state.challenges.map((c) => c.id)).toEqual(['c1'])
+    expect(state.gamesEnabled).toEqual({ dota2: true })
+    expect(getHistory().map((e) => e.ts)).toEqual([100, 200])
+    expect(getSettings().globalEnabled).toBe(false)
+    expect(getSettings().snoozeMinutes).toBe(DEFAULT_SETTINGS.snoozeMinutes)
+    expect(getSettings().language).toBe(DEFAULT_SETTINGS.language)
+  })
 })

src/main/store.ts

@@ -17,6 +17,7 @@ import {
   GameId,
   HistoryAction,
   HistoryEntry,
+  HistorySource,
   Meal,
   nextMealOccurrence,
   PersistedState,
@@ -25,6 +26,13 @@ import {
   Settings
 } from '@shared/types'
 import { log } from './logger'
+import {
+  validateChallengeInput,
+  validateExerciseInput,
+  validateId,
+  validateMealInput,
+  validateSettingsPatch
+} from './validate'
 
 /**
  * Keep at most this many history entries (≈2.7 years at 10/day).
@@ -39,7 +47,7 @@ let cache: PersistedState | null = null
 let storePath = ''
 let pendingWrite: NodeJS.Timeout | null = null
 
-function getStorePath(): string {
+export function getStorePath(): string {
   if (!storePath) {
     const dir = app.getPath('userData')
     if (!existsSync(dir)) mkdirSync(dir, { recursive: true })
@@ -110,6 +118,137 @@ function isValidParsed(v: unknown): v is Record<string, unknown> {
   return typeof v === 'object' && v !== null && !Array.isArray(v)
 }
 
+function finiteMs(v: unknown): number | undefined {
+  return typeof v === 'number' &&
+    Number.isFinite(v) &&
+    v >= 0 &&
+    v <= Number.MAX_SAFE_INTEGER
+    ? v
+    : undefined
+}
+
+function intInRange(v: unknown, min: number, max: number): number | undefined {
+  if (typeof v !== 'number' || !Number.isFinite(v)) return undefined
+  const n = Math.trunc(v)
+  return n >= min && n <= max ? n : undefined
+}
+
+function safeStr(v: unknown, max = 200): string | undefined {
+  if (typeof v !== 'string') return undefined
+  if (v.length === 0 || v.length > max) return undefined
+  return v
+}
+
+const SETTINGS_KEYS: (keyof Settings)[] = [
+  'globalEnabled',
+  'notificationMode',
+  'soundEnabled',
+  'voicePromptsEnabled',
+  'meetingAutoPause',
+  'startWithWindows',
+  'minimizeToTray',
+  'startMinimized',
+  'theme',
+  'language',
+  'snoozeMinutes',
+  'quietHours',
+  'lastSeenVersion'
+]
+
+const GAME_IDS: GameId[] = ['dota2']
+const HISTORY_ACTIONS: HistoryAction[] = ['done', 'skip', 'snooze']
+const HISTORY_SOURCES: HistorySource[] = ['reminder', 'meal', 'match']
+
+function sanitizeSettings(raw: unknown): Settings {
+  const out: Settings = { ...DEFAULT_SETTINGS }
+  if (!isValidParsed(raw)) return out
+
+  for (const key of SETTINGS_KEYS) {
+    if (!(key in raw)) continue
+    const patch = validateSettingsPatch({ [key]: raw[key] })
+    if (patch) Object.assign(out, patch)
+  }
+
+  return out
+}
+
+function sanitizeExercise(raw: unknown, now = Date.now()): Exercise | null {
+  if (!isValidParsed(raw)) return null
+  const id = validateId(raw.id)
+  const base = validateExerciseInput(raw)
+  if (!id || !base) return null
+
+  const exercise: Exercise = {
+    ...base,
+    id,
+    nextFireAt: finiteMs(raw.nextFireAt) ?? now + base.intervalMinutes * 60_000
+  }
+  const lastDoneAt = finiteMs(raw.lastDoneAt)
+  if (lastDoneAt !== undefined) exercise.lastDoneAt = lastDoneAt
+  return exercise
+}
+
+function sanitizeMeal(raw: unknown, now = Date.now()): Meal | null {
+  if (!isValidParsed(raw)) return null
+  const id = validateId(raw.id)
+  const base = validateMealInput(raw)
+  if (!id || !base) return null
+
+  const meal: Meal = {
+    ...base,
+    id,
+    nextFireAt:
+      finiteMs(raw.nextFireAt) ?? nextMealOccurrence(base.time, base.days, now)
+  }
+  const lastDoneAt = finiteMs(raw.lastDoneAt)
+  if (lastDoneAt !== undefined) meal.lastDoneAt = lastDoneAt
+  return meal
+}
+
+function sanitizeChallenge(raw: unknown): Challenge | null {
+  if (!isValidParsed(raw)) return null
+  const id = validateId(raw.id)
+  const base = validateChallengeInput(raw)
+  if (!id || !base) return null
+  return { ...base, id }
+}
+
+function sanitizeGamesEnabled(raw: unknown): Partial<Record<GameId, boolean>> {
+  const out: Partial<Record<GameId, boolean>> = {}
+  if (!isValidParsed(raw)) return out
+  for (const id of GAME_IDS) {
+    if (typeof raw[id] === 'boolean') out[id] = raw[id]
+  }
+  return out
+}
+
+function sanitizeHistoryEntry(raw: unknown): HistoryEntry | null {
+  if (!isValidParsed(raw)) return null
+  const ts = finiteMs(raw.ts)
+  const exerciseId = validateId(raw.exerciseId)
+  const action =
+    typeof raw.action === 'string' &&
+    HISTORY_ACTIONS.includes(raw.action as HistoryAction)
+      ? (raw.action as HistoryAction)
+      : undefined
+  if (ts === undefined || !exerciseId || action === undefined) return null
+
+  const entry: HistoryEntry = { ts, exerciseId, action }
+  const actualReps = intInRange(raw.actualReps, 0, 100_000)
+  if (actualReps !== undefined) entry.actualReps = actualReps
+  const reps = intInRange(raw.reps, 0, 100_000)
+  if (reps !== undefined) entry.reps = reps
+  const name = safeStr(raw.name)
+  if (name !== undefined) entry.name = name
+  if (
+    typeof raw.source === 'string' &&
+    HISTORY_SOURCES.includes(raw.source as HistorySource)
+  ) {
+    entry.source = raw.source as HistorySource
+  }
+  return entry
+}
+
 /**
  * Current persisted-state schema version. Bump this and add a migration to
  * MIGRATIONS whenever the on-disk shape changes in a non-additive way.
@@ -155,22 +294,36 @@ function runMigrations(s: StoredState): StoredState {
 
 /** Coerce a (possibly partial) migrated state into a fully-formed PersistedState. */
 function coerce(s: StoredState): PersistedState {
+  const now = Date.now()
   return {
-    exercises: Array.isArray(s.exercises) ? (s.exercises as Exercise[]) : [],
+    exercises: Array.isArray(s.exercises)
+      ? s.exercises.flatMap((raw) => {
+          const exercise = sanitizeExercise(raw, now)
+          return exercise ? [exercise] : []
+        })
+      : [],
     // Additive: старые state'ы без `meals` получают пустой список (см. философию
     // миграций — additive-поля не требуют bump'а схемы).
-    meals: Array.isArray(s.meals) ? (s.meals as Meal[]) : [],
+    meals: Array.isArray(s.meals)
-    settings: {
+      ? s.meals.flatMap((raw) => {
-      ...DEFAULT_SETTINGS,
+          const meal = sanitizeMeal(raw, now)
-      ...(isValidParsed(s.settings) ? (s.settings as Partial<Settings>) : {})
+          return meal ? [meal] : []
-    },
+        })
-    challenges: Array.isArray(s.challenges)
-      ? (s.challenges as Challenge[])
       : [],
-    gamesEnabled: isValidParsed(s.gamesEnabled)
+    settings: sanitizeSettings(s.settings),
-      ? (s.gamesEnabled as Partial<Record<GameId, boolean>>)
+    challenges: Array.isArray(s.challenges)
-      : {},
+      ? s.challenges.flatMap((raw) => {
-    history: Array.isArray(s.history) ? (s.history as HistoryEntry[]) : []
+          const challenge = sanitizeChallenge(raw)
+          return challenge ? [challenge] : []
+        })
+      : [],
+    gamesEnabled: sanitizeGamesEnabled(s.gamesEnabled),
+    history: Array.isArray(s.history)
+      ? s.history.flatMap((raw) => {
+          const entry = sanitizeHistoryEntry(raw)
+          return entry ? [entry] : []
+        })
+      : []
   }
 }
 
@@ -543,6 +696,11 @@ export function markMealDone(id: string): Meal | undefined {
   if (meal.nextFireAt <= Date.now()) {
     meal.nextFireAt = nextMealOccurrence(meal.time, meal.days, Date.now())
   }
+  appendHistory(`meal:${id}`, 'done', {
+    reps: 1,
+    name: meal.name,
+    source: 'meal'
+  })
   scheduleWrite()
   return meal
 }
@@ -641,8 +799,8 @@ export function exportState(): string {
 
 /**
  * Импорт snapshot'а. Перезаписывает текущий state. Возвращает true при
- * успехе. Идёт через тот же coerce + runMigrations что и load() — это
+ * успехе. Идёт через тот же coerce + runMigrations что и load(): валидные
- * валидирует тип/диапазоны.
+ * записи сохраняются, повреждённые записи/поля отбрасываются.
  *
  * НЕ объединяет с текущим state (merge сложен: дубликаты id, конфликты
  * settings) — простое replace. Перед импортом UI должен спросить

src/main/validate.test.ts

@@ -56,12 +56,8 @@ describe('validateMealInput', () => {
   })
 
   it('реджектит кривое время', () => {
-    expect(
+    expect(validateMealInput({ name: 'X', time: '99:99', days: [] })).toBeNull()
-      validateMealInput({ name: 'X', time: '99:99', days: [] })
+    expect(validateMealInput({ name: 'X', time: 'noon', days: [] })).toBeNull()
-    ).toBeNull()
-    expect(
-      validateMealInput({ name: 'X', time: 'noon', days: [] })
-    ).toBeNull()
   })
 
   it('реджектит дни вне диапазона и дедупит', () => {
@@ -124,8 +120,12 @@ describe('validateExerciseInput', () => {
   })
 
   it('rejects missing required fields', () => {
-    expect(validateExerciseInput({ ...validExercise, name: undefined })).toBeNull()
+    expect(
-    expect(validateExerciseInput({ ...validExercise, reps: undefined })).toBeNull()
+      validateExerciseInput({ ...validExercise, name: undefined })
+    ).toBeNull()
+    expect(
+      validateExerciseInput({ ...validExercise, reps: undefined })
+    ).toBeNull()
     expect(
       validateExerciseInput({ ...validExercise, intervalMinutes: undefined })
     ).toBeNull()
@@ -221,7 +221,9 @@ describe('validateExercisePatch', () => {
   it('accepts partial patches', () => {
     expect(validateExercisePatch({ reps: 12 })).toEqual({ reps: 12 })
     expect(validateExercisePatch({ name: 'New' })).toEqual({ name: 'New' })
-    expect(validateExercisePatch({ enabled: false })).toEqual({ enabled: false })
+    expect(validateExercisePatch({ enabled: false })).toEqual({
+      enabled: false
+    })
   })
 
   it('rejects patch with a single invalid field', () => {
@@ -273,7 +275,14 @@ describe('validateChallengeInput', () => {
   })
 
   it('accepts all valid stats', () => {
-    const stats = ['deaths', 'kills', 'assists', 'last_hits', 'denies', 'duration_min']
+    const stats = [
+      'deaths',
+      'kills',
+      'assists',
+      'last_hits',
+      'denies',
+      'duration_min'
+    ]
     for (const stat of stats) {
       expect(validateChallengeInput({ ...valid, stat })).not.toBeNull()
     }
@@ -288,11 +297,15 @@ describe('validateChallengeInput', () => {
   })
 
   it('accepts zero multiplier (legitimate "disable" semantics)', () => {
-    expect(validateChallengeInput({ ...valid, multiplier: 0 })?.multiplier).toBe(0)
+    expect(
+      validateChallengeInput({ ...valid, multiplier: 0 })?.multiplier
+    ).toBe(0)
   })
 
   it('accepts fractional multiplier (e.g. 0.5×)', () => {
-    expect(validateChallengeInput({ ...valid, multiplier: 0.5 })?.multiplier).toBe(0.5)
+    expect(
+      validateChallengeInput({ ...valid, multiplier: 0.5 })?.multiplier
+    ).toBe(0.5)
   })
 })
 
@@ -399,7 +412,9 @@ describe('validateSettingsPatch', () => {
 
     it('rejects non-strings', () => {
       expect(validateSettingsPatch({ lastSeenVersion: 42 })).toBeNull()
-      expect(validateSettingsPatch({ lastSeenVersion: ['1', '0', '0'] })).toBeNull()
+      expect(
+        validateSettingsPatch({ lastSeenVersion: ['1', '0', '0'] })
+      ).toBeNull()
     })
   })
 
@@ -426,6 +441,12 @@ describe('validateSettingsPatch', () => {
       expect(
         validateSettingsPatch({ quietHours: { ...baseQh, from: '2500' } })
       ).toBeNull()
+      expect(
+        validateSettingsPatch({ quietHours: { ...baseQh, from: '25:00' } })
+      ).toBeNull()
+      expect(
+        validateSettingsPatch({ quietHours: { ...baseQh, to: '09:99' } })
+      ).toBeNull()
       expect(
         validateSettingsPatch({ quietHours: { ...baseQh, to: 'bedtime' } })
       ).toBeNull()
@@ -479,7 +500,9 @@ describe('validateSettingsPatch', () => {
 describe('validateId', () => {
   it('accepts reasonable id strings', () => {
     expect(validateId('abc')).toBe('abc')
-    expect(validateId('uuid-v4-style-thing-123')).toBe('uuid-v4-style-thing-123')
+    expect(validateId('uuid-v4-style-thing-123')).toBe(
+      'uuid-v4-style-thing-123'
+    )
   })
 
   it('rejects non-strings', () => {

src/main/validate.ts

@@ -14,6 +14,7 @@
 import type {
   Challenge,
   Exercise,
+  GameId,
   GameStat,
   Meal,
   Settings,
@@ -27,6 +28,7 @@ const MAX_STR_LEN = 200
 const VALID_THEMES: Theme[] = ['system', 'light', 'dark']
 const VALID_LANGS: Language[] = ['ru', 'en']
 const VALID_NOTIFY: NotificationMode[] = ['toast', 'modal', 'both']
+const VALID_GAME_IDS: GameId[] = ['dota2']
 const VALID_STATS: GameStat[] = [
   'deaths',
   'kills',
@@ -41,7 +43,6 @@ const VALID_CATEGORIES: ReminderCategory[] = [
   'eyes',
   'posture'
 ]
-const HHMM_RE = /^\d{1,2}:\d{2}$/
 
 function isObj(v: unknown): v is Record<string, unknown> {
   return typeof v === 'object' && v !== null && !Array.isArray(v)
@@ -128,7 +129,11 @@ export function validateExerciseInput(
   // dailyGoal: undefined = не задан (нет soft-cap'a), null от UI приводим к
   // undefined; иначе — должен пройти int-range, иначе reject (нельзя
   // отправить из renderer'а NaN/негатив и тихо обнулить).
-  if (raw.dailyGoal !== undefined && raw.dailyGoal !== null && dailyGoal === undefined) {
+  if (
+    raw.dailyGoal !== undefined &&
+    raw.dailyGoal !== null &&
+    dailyGoal === undefined
+  ) {
     return null
   }
   if (
@@ -289,7 +294,7 @@ export function validateChallengeInput(
 ): Omit<Challenge, 'id'> | null {
   if (!isObj(raw)) return null
   const name = safeStr(raw.name)
-  const gameId = safeStr(raw.gameId, 32)
+  const gameId = oneOf(raw.gameId, VALID_GAME_IDS)
   const stat = oneOf(raw.stat, VALID_STATS)
   const multiplier = numInRange(raw.multiplier, 0, 1000)
   const exerciseName = safeStr(raw.exerciseName)
@@ -306,7 +311,7 @@ export function validateChallengeInput(
   }
   return {
     name,
-    gameId: gameId as Challenge['gameId'],
+    gameId,
     stat,
     multiplier,
     exerciseName,
@@ -436,8 +441,8 @@ export function validateSettingsPatch(raw: unknown): Partial<Settings> | null {
       enabled === undefined ||
       from === undefined ||
       to === undefined ||
-      !HHMM_RE.test(from) ||
+      validHHMM(from) === undefined ||
-      !HHMM_RE.test(to)
+      validHHMM(to) === undefined
     ) {
       return null
     }

src/preload/index.ts

@@ -3,12 +3,14 @@ import { IPC } from '@shared/ipc'
 import type {
   AppState,
   Challenge,
+  DiagnosticsInfo,
   Exercise,
   GameId,
   GameStatus,
   HistoryEntry,
   MatchSummary,
   Meal,
+  RendererErrorReport,
   Settings,
   Tick,
   UpdaterStatus
@@ -64,6 +66,14 @@ const api = {
   getAppVersion: (): Promise<string> => ipcRenderer.invoke(IPC.getAppVersion),
   getMeetingActive: (): Promise<boolean> =>
     ipcRenderer.invoke(IPC.getMeetingActive),
+  getDiagnostics: (): Promise<DiagnosticsInfo> =>
+    ipcRenderer.invoke(IPC.getDiagnostics),
+  openLogsFolder: (): Promise<{ ok: boolean; error?: string }> =>
+    ipcRenderer.invoke(IPC.openLogsFolder),
+  copyDiagnostics: (): Promise<DiagnosticsInfo> =>
+    ipcRenderer.invoke(IPC.copyDiagnostics),
+  reportRendererError: (report: RendererErrorReport): Promise<boolean> =>
+    ipcRenderer.invoke(IPC.reportRendererError, report),
 
   pauseAll: (): Promise<void> => ipcRenderer.invoke(IPC.pauseAll),
   resumeAll: (): Promise<void> => ipcRenderer.invoke(IPC.resumeAll),
@@ -164,8 +174,7 @@ const api = {
     on(IPC.evtMaximizeChanged, h),
   onMeetingChanged: (h: Handler<boolean>): Unsub =>
     on(IPC.evtMeetingChanged, h),
-  onHistoryChanged: (h: Handler<void>): Unsub =>
+  onHistoryChanged: (h: Handler<void>): Unsub => on(IPC.evtHistoryChanged, h)
-    on(IPC.evtHistoryChanged, h)
 }
 
 contextBridge.exposeInMainWorld('api', api)

src/renderer/index.html

@@ -9,8 +9,11 @@
       для Tailwind utility-классов и инлайн-стилей framer-motion. font-src
       включает data: на случай если кто-то вставит base64 SVG-glyph.
     -->
-    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; style-src 'self' 'unsafe-inline'; font-src 'self' data:; img-src 'self' data:; script-src 'self'; connect-src 'self'; base-uri 'self'; frame-ancestors 'none'" />
+    <meta
-    <title>Exercise Reminder</title>
+      http-equiv="Content-Security-Policy"
+      content="default-src 'self'; style-src 'self' 'unsafe-inline'; font-src 'self' data:; img-src 'self' data:; script-src 'self'; connect-src 'self'; base-uri 'self'; frame-ancestors 'none'"
+    />
+    <title>Разомнись</title>
   </head>
   <body>
     <div id="root"></div>

src/renderer/src/App.tsx

@@ -22,7 +22,7 @@ let backendSubscribed = false
 export default function App(): JSX.Element {
   const hydrated = useAppStore((s) => s.hydrated)
   const settings = useAppStore((s) => s.state?.settings)
-  const [mobileNavOpen, setMobileNavOpen] = useState(false)
+  const [compactNavOpen, setCompactNavOpen] = useState(false)
   const [whatsNew, setWhatsNew] = useState<{
     open: boolean
     versions: string[]
@@ -89,17 +89,17 @@ export default function App(): JSX.Element {
   return (
     <ErrorBoundary>
       <HashRouter>
-        <div className="h-screen w-screen flex flex-col bg-bg">
+        <div className="h-screen w-screen flex flex-col app-shell bg-bg">
-          <Titlebar onMenuClick={() => setMobileNavOpen(true)} />
+          <Titlebar onMenuClick={() => setCompactNavOpen(true)} />
           <div className="flex-1 flex overflow-hidden">
             <Sidebar
-              mobileOpen={mobileNavOpen}
+              compactOpen={compactNavOpen}
-              onMobileClose={() => setMobileNavOpen(false)}
+              onCompactClose={() => setCompactNavOpen(false)}
             />
-            <main className="flex-1 overflow-hidden min-w-0">
+            <main className="flex-1 overflow-hidden min-w-0 app-main-surface">
               {hydrated ? (
                 <ErrorBoundary>
-                  <RoutedPages onNav={() => setMobileNavOpen(false)} />
+                  <RoutedPages onNav={() => setCompactNavOpen(false)} />
                 </ErrorBoundary>
               ) : (
                 // Skeleton на время гидрации — settings (и язык) ещё не

src/renderer/src/ReminderApp.tsx

@@ -30,6 +30,8 @@ type Mode =
   | { kind: 'meal'; meal: Meal }
   | { kind: 'match'; summary: MatchSummary; done: Set<string> }
 
+type ActiveMode = Exclude<Mode, { kind: 'idle' }>
+
 /** Минимальный нативный confirm. В reminder-окне нет места для модалки,
  * проще использовать встроенный диалог. */
 function nativeConfirm(message: string): boolean {
@@ -41,6 +43,8 @@ export default function ReminderApp(): JSX.Element {
   const [mode, setMode] = useState<Mode>({ kind: 'idle' })
   const [settings, setSettings] = useState<Settings | null>(null)
   const settingsRef = useRef<Settings | null>(null)
+  const modeRef = useRef<Mode>({ kind: 'idle' })
+  const queueRef = useRef<ActiveMode[]>([])
   // ChallengeId'ы, для которых уже отправили markChallengeDone IPC. ref,
   // не state — нужен только для дедупа rapid double-click. Сбрасывается
   // когда приходит новый match summary (см. onMatchEnd ниже).
@@ -50,53 +54,21 @@ export default function ReminderApp(): JSX.Element {
     settingsRef.current = settings
   }, [settings])
 
+  useEffect(() => {
+    modeRef.current = mode
+  }, [mode])
+
   useEffect(() => {
     window.api.getState().then((s) => setSettings(s.settings))
     const u0 = window.api.onStateChanged((s) => setSettings(s.settings))
     const u1 = window.api.onFire((ex) => {
-      setMode({ kind: 'exercise', exercise: ex })
+      enqueueMode({ kind: 'exercise', exercise: ex })
-      const s = settingsRef.current
-      if (s?.soundEnabled) playBeep()
-      if (s?.voicePromptsEnabled) {
-        // Задержка 800ms даёт пользователю шанс decrement'нуть stepper до
-        // фактического количества — TTS прозвучит уже под реальную цифру,
-        // если успел нажать -. Иначе скажет планируемые reps.
-        const lang = s.language ?? 'ru'
-        setTimeout(() => {
-          const phrase =
-            lang === 'ru'
-              ? `${ex.name}. ${ex.reps} ${repWordRu(ex.reps)}`
-              : `${ex.name}. ${ex.reps} ${ex.reps === 1 ? 'rep' : 'reps'}`
-          speak(phrase, lang)
-        }, 800)
-      }
     })
     const u1b = window.api.onFireMeal((meal) => {
-      setMode({ kind: 'meal', meal })
+      enqueueMode({ kind: 'meal', meal })
-      const s = settingsRef.current
-      if (s?.soundEnabled) playBeep()
-      if (s?.voicePromptsEnabled) {
-        const lang = s.language ?? 'ru'
-        const phrase =
-          lang === 'ru' ? `Пора поесть. ${meal.name}` : `Time to eat. ${meal.name}`
-        speak(phrase, lang)
-      }
     })
     const u2 = window.api.onMatchEnd((summary) => {
-      // Новый матч — сбрасываем дедуп challenge'ей.
+      enqueueMode({ kind: 'match', summary, done: new Set() })
-      sentChallengesRef.current = new Set()
-      setMode({ kind: 'match', summary, done: new Set() })
-      const s = settingsRef.current
-      if (s?.soundEnabled) playBeep()
-      if (s?.voicePromptsEnabled) {
-        const total = summary.results.reduce((acc, r) => acc + r.reps, 0)
-        const lang = s.language ?? 'ru'
-        const phrase =
-          lang === 'ru'
-            ? `Матч завершён. ${total} ${repWordRu(total)} ждут.`
-            : `Match complete. ${total} ${total === 1 ? 'rep' : 'reps'} await.`
-        speak(phrase, lang)
-      }
     })
     return () => {
       u0()
@@ -104,6 +76,9 @@ export default function ReminderApp(): JSX.Element {
       u1b()
       u2()
     }
+    // IPC-подписки должны жить один раз; enqueueMode читает актуальный mode
+    // через ref, поэтому зависимость здесь не нужна.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
 
   // ESC closes the match summary view too — keyboard parity with exercise mode.
@@ -117,6 +92,63 @@ export default function ReminderApp(): JSX.Element {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [mode.kind])
 
+  function enqueueMode(next: ActiveMode): void {
+    if (modeRef.current.kind === 'idle') {
+      activateMode(next)
+      return
+    }
+    queueRef.current.push(next)
+  }
+
+  function activateMode(next: ActiveMode): void {
+    if (next.kind === 'match') {
+      // Новый match summary получает чистый дедуп-сет только когда реально
+      // становится активным; иначе queued summary не сбивает текущий матч.
+      sentChallengesRef.current = new Set()
+    }
+    modeRef.current = next
+    setMode(next)
+    playAlertFor(next)
+  }
+
+  function playAlertFor(next: ActiveMode): void {
+    const s = settingsRef.current
+    if (s?.soundEnabled) playBeep()
+    if (!s?.voicePromptsEnabled) return
+
+    const lang = s.language ?? 'ru'
+    if (next.kind === 'exercise') {
+      const ex = next.exercise
+      // Задержка 800ms даёт пользователю шанс decrement'нуть stepper до
+      // фактического количества — TTS прозвучит уже под реальную цифру,
+      // если успел нажать -. Иначе скажет планируемые reps.
+      setTimeout(() => {
+        const phrase =
+          lang === 'ru'
+            ? `${ex.name}. ${ex.reps} ${repWordRu(ex.reps)}`
+            : `${ex.name}. ${ex.reps} ${ex.reps === 1 ? 'rep' : 'reps'}`
+        speak(phrase, lang)
+      }, 800)
+      return
+    }
+
+    if (next.kind === 'meal') {
+      const phrase =
+        lang === 'ru'
+          ? `Пора поесть. ${next.meal.name}`
+          : `Time to eat. ${next.meal.name}`
+      speak(phrase, lang)
+      return
+    }
+
+    const total = next.summary.results.reduce((acc, r) => acc + r.reps, 0)
+    const phrase =
+      lang === 'ru'
+        ? `Матч завершён. ${total} ${repWordRu(total)} ждут.`
+        : `Match complete. ${total} ${total === 1 ? 'rep' : 'reps'} await.`
+    speak(phrase, lang)
+  }
+
   function close(): void {
     // Если в Match Summary остались незакрытые челленджи — подтверждаем,
     // чтобы пользователь не «пролетел» окно по привычке и не потерял
@@ -139,6 +171,12 @@ export default function ReminderApp(): JSX.Element {
         if (!nativeConfirm(msg)) return
       }
     }
+    const next = queueRef.current.shift()
+    if (next) {
+      activateMode(next)
+      return
+    }
+    modeRef.current = { kind: 'idle' }
     setMode({ kind: 'idle' })
     window.api.reminderClose()
   }
@@ -188,15 +226,16 @@ export default function ReminderApp(): JSX.Element {
           void window.api.markChallengeDone(id, result.reps)
         }
         // 2) Functional update: rapid-click race-safe.
-        setMode((m) =>
+        setMode((m) => {
-          m.kind === 'match'
+          if (m.kind !== 'match') return m
-            ? {
+          const nextMode: Mode = {
-                kind: 'match',
+            kind: 'match',
-                summary: m.summary,
+            summary: m.summary,
-                done: new Set([...m.done, id])
+            done: new Set([...m.done, id])
-              }
+          }
-            : m
+          modeRef.current = nextMode
-        )
+          return nextMode
+        })
       }}
       onClose={close}
     />
@@ -289,7 +328,7 @@ function ExerciseReminder({
           transition={{ type: 'spring', stiffness: 300, damping: 24 }}
           className="relative mb-6"
         >
-          <div className="w-24 h-24 rounded-full bg-accent text-white grid place-items-center shadow-[0_8px_30px_-8px_rgb(var(--accent)/0.5)]">
+          <div className="w-20 h-20 rounded-xl bg-accent text-white grid place-items-center shadow-[0_12px_36px_-24px_rgb(var(--accent)/0.75)]">
             <Icon name={exercise.icon} size={44} strokeWidth={2} />
           </div>
         </motion.div>
@@ -297,7 +336,7 @@ function ExerciseReminder({
         <div className="text-[13px] uppercase tracking-[0.18em] text-accent font-bold">
           {t(`category.${exercise.category ?? 'exercise'}.cta`)}
         </div>
-        <h1 className="font-serif text-[30px] leading-tight tracking-tight mt-2 mb-3 font-bold">
+        <h1 className="font-display text-[30px] leading-tight mt-2 mb-3 font-bold">
           {exercise.name}
         </h1>
 
@@ -305,7 +344,7 @@ function ExerciseReminder({
         <div className="inline-flex items-center gap-3 select-none">
           <button
             onClick={dec}
-            className="w-9 h-9 grid place-items-center rounded-full bg-surface-2 text-text/65 hover:text-text hover:bg-hairline/25 active:scale-90 transition-all"
+            className="w-9 h-9 grid place-items-center rounded-lg bg-surface-2 text-text/65 hover:text-text hover:bg-hairline/25 active:scale-95 transition-all"
             aria-label={t('reminder.aria.decrement')}
           >
             <Minus size={16} strokeWidth={2.5} />
@@ -313,7 +352,7 @@ function ExerciseReminder({
           <div className="inline-flex items-baseline gap-2 font-mono-num min-w-[120px] justify-center">
             <span
               className={[
-                'text-[56px] font-semibold tracking-tight leading-none',
+                'text-[54px] font-semibold leading-none',
                 adjusted ? 'text-accent' : 'text-text'
               ].join(' ')}
             >
@@ -325,7 +364,7 @@ function ExerciseReminder({
           </div>
           <button
             onClick={inc}
-            className="w-9 h-9 grid place-items-center rounded-full bg-surface-2 text-text/65 hover:text-text hover:bg-hairline/25 active:scale-90 transition-all"
+            className="w-9 h-9 grid place-items-center rounded-lg bg-surface-2 text-text/65 hover:text-text hover:bg-hairline/25 active:scale-95 transition-all"
             aria-label={t('reminder.aria.increment')}
           >
             <Plus size={16} strokeWidth={2.5} />
@@ -351,21 +390,21 @@ function ExerciseReminder({
       <div className="px-4 pb-4 space-y-2">
         <button
           onClick={done}
-          className="w-full h-12 rounded-2xl bg-accent text-white text-[16px] font-bold inline-flex items-center justify-center gap-1.5 active:scale-[0.98] transition-transform"
+          className="w-full h-11 rounded-lg bg-accent text-white text-[15px] font-bold inline-flex items-center justify-center gap-1.5 active:translate-y-px transition-transform"
         >
           <Check size={17} strokeWidth={2.5} /> {t('reminder.btn.done')}
         </button>
         <div className="grid grid-cols-2 gap-2">
           <button
             onClick={snooze}
-            className="h-11 rounded-2xl bg-surface-2 text-text text-[15px] font-semibold inline-flex items-center justify-center gap-1.5 active:scale-[0.98] transition-transform"
+            className="h-10 rounded-lg bg-surface-2 text-text text-[14px] font-semibold inline-flex items-center justify-center gap-1.5 active:translate-y-px transition-transform"
           >
             <Clock size={15} strokeWidth={2.5} />{' '}
             {t('btn.snooze_min', { n: snoozeMinutes })}
           </button>
           <button
             onClick={skip}
-            className="h-11 rounded-2xl bg-surface-2 text-text/65 text-[15px] font-semibold inline-flex items-center justify-center gap-1.5 active:scale-[0.98] transition-transform"
+            className="h-10 rounded-lg bg-surface-2 text-text/65 text-[14px] font-semibold inline-flex items-center justify-center gap-1.5 active:translate-y-px transition-transform"
           >
             {t('btn.skip')}
           </button>
@@ -411,7 +450,10 @@ function MealReminder({
       } else if (e.key === 'Escape') {
         e.preventDefault()
         onClose()
-      } else if ((e.key === ' ' || e.code === 'Space') && targetTag !== 'BUTTON') {
+      } else if (
+        (e.key === ' ' || e.code === 'Space') &&
+        targetTag !== 'BUTTON'
+      ) {
         e.preventDefault()
         void snooze()
       }
@@ -440,7 +482,7 @@ function MealReminder({
           transition={{ type: 'spring', stiffness: 300, damping: 24 }}
           className="relative mb-6"
         >
-          <div className="w-24 h-24 rounded-full bg-success text-white grid place-items-center shadow-[0_8px_30px_-8px_rgb(var(--success)/0.5)]">
+          <div className="w-20 h-20 rounded-xl bg-success text-white grid place-items-center shadow-[0_12px_36px_-24px_rgb(var(--success)/0.75)]">
             <Icon name={meal.icon} size={44} strokeWidth={2} />
           </div>
         </motion.div>
@@ -448,7 +490,7 @@ function MealReminder({
         <div className="text-[13px] uppercase tracking-[0.18em] text-success font-bold">
           {t('meal.cta')}
         </div>
-        <h1 className="font-serif text-[30px] leading-tight tracking-tight mt-2 mb-3 font-bold">
+        <h1 className="font-display text-[30px] leading-tight mt-2 mb-3 font-bold">
           {meal.name}
         </h1>
         <div className="text-[13px] text-text/65 mt-1 inline-flex items-center gap-1.5 font-medium font-mono-num">
@@ -459,13 +501,13 @@ function MealReminder({
       <div className="px-4 pb-4 space-y-2">
         <button
           onClick={done}
-          className="w-full h-12 rounded-2xl bg-success text-white text-[16px] font-bold inline-flex items-center justify-center gap-1.5 active:scale-[0.98] transition-transform"
+          className="w-full h-11 rounded-lg bg-success text-white text-[15px] font-bold inline-flex items-center justify-center gap-1.5 active:translate-y-px transition-transform"
         >
           <Check size={17} strokeWidth={2.5} /> {t('meal.btn.ate')}
         </button>
         <button
           onClick={snooze}
-          className="w-full h-11 rounded-2xl bg-surface-2 text-text text-[15px] font-semibold inline-flex items-center justify-center gap-1.5 active:scale-[0.98] transition-transform"
+          className="w-full h-10 rounded-lg bg-surface-2 text-text text-[14px] font-semibold inline-flex items-center justify-center gap-1.5 active:translate-y-px transition-transform"
         >
           <Clock size={15} strokeWidth={2.5} />{' '}
           {t('btn.snooze_min', { n: snoozeMinutes })}
@@ -526,7 +568,7 @@ function MatchSummaryView({
           animate={{ scale: 1, opacity: 1 }}
           transition={{ type: 'spring', stiffness: 280, damping: 22 }}
           className={[
-            'inline-flex items-center justify-center w-14 h-14 rounded-2xl mb-3 text-white',
+            'inline-flex items-center justify-center w-12 h-12 rounded-xl mb-3 text-white',
             won ? 'bg-success' : lost ? 'bg-destructive' : 'bg-accent'
           ].join(' ')}
         >
@@ -538,7 +580,7 @@ function MatchSummaryView({
             <Gamepad2 size={26} strokeWidth={2} />
           )}
         </motion.div>
-        <h1 className="font-serif text-[26px] tracking-tight font-bold">
+        <h1 className="font-display text-[25px] font-bold">
           {won
             ? t('match.title.won')
             : lost
@@ -585,7 +627,7 @@ function MatchSummaryView({
         <button
           onClick={onClose}
           className={[
-            'h-11 px-5 rounded-2xl text-white text-[14px] font-semibold inline-flex items-center gap-1.5 active:scale-[0.98] transition-all',
+            'h-10 px-4 rounded-lg text-white text-[14px] font-semibold inline-flex items-center gap-1.5 active:translate-y-px transition-all',
             allDone ? 'bg-success' : 'bg-accent'
           ].join(' ')}
         >
@@ -620,13 +662,13 @@ function ChallengeRow({
       initial={{ opacity: 0, x: -8 }}
       animate={{ opacity: 1, x: 0 }}
       className={[
-        'flex items-center gap-3 rounded-2xl p-3 transition-colors',
+        'flex items-center gap-3 rounded-lg p-3 transition-colors',
         done ? 'bg-success/10' : 'bg-surface-2'
       ].join(' ')}
     >
       <div
         className={[
-          'w-10 h-10 rounded-xl grid place-items-center shrink-0',
+          'w-9 h-9 rounded-lg grid place-items-center shrink-0',
           done ? 'bg-success text-white' : 'bg-accent text-white'
         ].join(' ')}
       >
@@ -650,7 +692,7 @@ function ChallengeRow({
       </div>
       <div
         className={[
-          'font-mono-num text-[20px] font-semibold tracking-tight',
+          'font-mono-num text-[20px] font-semibold',
           done ? 'text-success' : 'text-accent'
         ].join(' ')}
       >
@@ -660,7 +702,7 @@ function ChallengeRow({
         onClick={onMarkDone}
         disabled={done}
         className={[
-          'h-9 w-9 grid place-items-center rounded-full transition-all',
+          'h-9 w-9 grid place-items-center rounded-lg transition-all',
           done
             ? 'bg-success text-white cursor-default'
             : 'bg-accent text-white active:scale-90'

src/renderer/src/components/AchievementsCard.tsx

@@ -1,6 +1,13 @@
 import { useEffect, useMemo, useState } from 'react'
 import { motion } from 'framer-motion'
-import { Award, Activity, Flame, Sparkles, TrendingUp, Lock } from 'lucide-react'
+import {
+  Award,
+  Activity,
+  Flame,
+  Sparkles,
+  TrendingUp,
+  Lock
+} from 'lucide-react'
 import type { Exercise, HistoryEntry } from '@shared/types'
 import {
   computeAchievements,
@@ -106,7 +113,7 @@ export function AchievementsCard({ history, exercises }: Props): JSX.Element {
   if (visible.length === 0) return <></>
 
   return (
-    <div className="bg-surface rounded-2xl p-5 shadow-card dark:ring-0.5 dark:ring-hairline/30">
+    <div className="bg-surface rounded-xl p-4 shadow-card border border-hairline/30">
       <div className="flex items-center justify-between mb-3">
         <div className="flex items-center gap-2">
           <div className="w-7 h-7 rounded-lg bg-accent text-white grid place-items-center">
@@ -125,11 +132,7 @@ export function AchievementsCard({ history, exercises }: Props): JSX.Element {
       </div>
       <div className="grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 gap-2">
         {visible.map((a) => (
-          <Badge
+          <Badge key={a.def.id} a={a} fresh={freshlyUnlocked.has(a.def.id)} />
-            key={a.def.id}
-            a={a}
-            fresh={freshlyUnlocked.has(a.def.id)}
-          />
         ))}
       </div>
     </div>
@@ -177,7 +180,7 @@ function Badge({
           : {}
       }
       className={[
-        'rounded-xl p-2.5 transition-opacity',
+        'rounded-lg p-2.5 transition-opacity',
         a.unlocked ? 'bg-surface-2' : 'bg-surface-2 opacity-55'
       ].join(' ')}
       title={t(a.def.descKey, { target: a.target })}
@@ -185,7 +188,7 @@ function Badge({
       <div className="flex items-center gap-2 mb-1.5">
         <div
           className={[
-            'w-7 h-7 rounded-lg grid place-items-center text-white shrink-0',
+            'w-7 h-7 rounded-md grid place-items-center text-white shrink-0',
             a.unlocked ? toneBg : 'bg-text/30'
           ].join(' ')}
         >

src/renderer/src/components/ErrorBoundary.tsx

@@ -23,9 +23,13 @@ export class ErrorBoundary extends Component<Props, State> {
   }
 
   componentDidCatch(error: Error, info: ErrorInfo): void {
-    // No remote telemetry — log to the local console so a curious user
-    // (or dev tools session) can capture it.
     console.error('[ErrorBoundary]', error, info.componentStack)
+    void window.api?.reportRendererError?.({
+      source: 'ErrorBoundary',
+      message: error.message,
+      stack: error.stack,
+      componentStack: info.componentStack ?? undefined
+    })
   }
 
   reset = (): void => this.setState({ error: null })

src/renderer/src/components/ExerciseCard.tsx

@@ -19,11 +19,6 @@ type Props = {
   onMarkDone: () => void
 }
 
-/**
- * iOS-flavoured exercise card. White surface, soft shadow, big readable
- * countdown. A subtle ring around the icon shows interval progress —
- * Apple Fitness ring spirit but minimalist.
- */
 export function ExerciseCard({
   exercise,
   tick,
@@ -115,32 +110,31 @@ export function ExerciseCard({
       animate={{ opacity: 1, y: 0 }}
       exit={{ opacity: 0, scale: 0.97 }}
       transition={{ type: 'spring', stiffness: 380, damping: 30 }}
-      className="relative bg-surface rounded-3xl p-5 shadow-card dark:ring-0.5 dark:ring-hairline/30"
+      className="relative bg-surface rounded-xl p-4 shadow-card border border-hairline/30"
     >
-      <div className="flex items-start gap-4">
+      <div className="flex items-start gap-3">
-        {/* Icon + progress ring */}
+        <div className="relative w-12 h-12 shrink-0">
-        <div className="relative w-14 h-14 shrink-0">
           <svg
             className="absolute inset-0 -rotate-90"
-            viewBox="0 0 56 56"
+            viewBox="0 0 48 48"
-            width="56"
+            width="48"
-            height="56"
+            height="48"
           >
             <circle
-              cx="28"
+              cx="24"
-              cy="28"
+              cy="24"
               r={R}
               fill="none"
-              strokeWidth="2.5"
+              strokeWidth="2"
               className="stroke-hairline/15 dark:stroke-hairline/30"
             />
             {exercise.enabled && (
               <circle
-                cx="28"
+                cx="24"
-                cy="28"
+                cy="24"
                 r={R}
                 fill="none"
-                strokeWidth="2.5"
+                strokeWidth="2"
                 strokeLinecap="round"
                 strokeDasharray={C}
                 strokeDashoffset={dashOffset}
@@ -151,7 +145,7 @@ export function ExerciseCard({
           </svg>
           <div
             className={[
-              'absolute inset-[8px] rounded-full grid place-items-center',
+              'absolute inset-[7px] rounded-lg grid place-items-center',
               exercise.enabled
                 ? 'bg-accent/10 text-accent'
                 : 'bg-surface-2 text-text/40'
@@ -163,14 +157,14 @@ export function ExerciseCard({
 
         <div className="flex-1 min-w-0">
           <div className="flex items-center justify-between gap-2">
-            <h3 className="font-display text-[18px] font-bold leading-tight truncate">
+            <h3 className="font-display text-[17px] font-bold leading-tight truncate">
               {exercise.name}
             </h3>
             <div className="relative">
               <button
                 ref={triggerRef}
                 onClick={() => setMenuOpen((v) => !v)}
-                className="w-7 h-7 grid place-items-center rounded-full text-text/45 hover:bg-surface-2 active:scale-90 transition-all"
+                className="w-7 h-7 grid place-items-center rounded-md text-text/45 hover:bg-surface-2 active:scale-95 transition-all"
                 aria-label={t('titlebar.menu_aria')}
                 aria-haspopup="menu"
                 aria-expanded={menuOpen}
@@ -188,7 +182,7 @@ export function ExerciseCard({
                     role="menu"
                     aria-label={exercise.name}
                     onKeyDown={onMenuKeyDown}
-                    className="absolute right-0 top-8 z-20 min-w-[140px] bg-surface rounded-xl shadow-sheet ring-0.5 ring-hairline/30 py-1 overflow-hidden"
+                    className="absolute right-0 top-8 z-20 min-w-[140px] bg-surface rounded-lg shadow-sheet ring-1 ring-hairline/30 py-1 overflow-hidden"
                   >
                     <button
                       role="menuitem"
@@ -215,17 +209,16 @@ export function ExerciseCard({
               )}
             </div>
           </div>
-          <div className="text-[14px] text-text/65 mt-1 font-medium">
+          <div className="text-[13px] text-text/60 mt-1 font-medium">
             {t('editor.exercise.preview.meta', {
               reps: exercise.reps,
               min: exercise.intervalMinutes
             })}
           </div>
 
-          {/* Countdown + switch */}
+          <div className="flex items-end justify-between mt-3">
-          <div className="flex items-end justify-between mt-3.5">
             <div>
-              <div className="text-[12px] text-text/60 uppercase tracking-wider font-semibold inline-flex items-center gap-1">
+              <div className="text-[12px] text-text/60 font-semibold inline-flex items-center gap-1">
                 {goalReached ? (
                   <>
                     <CheckCircle2
@@ -251,7 +244,7 @@ export function ExerciseCard({
               </div>
               <div
                 className={[
-                  'font-mono-num text-[24px] font-bold leading-none mt-1 tracking-tight',
+                  'font-mono-num text-[22px] font-bold leading-none mt-1',
                   goalReached
                     ? 'text-success'
                     : isDue
@@ -283,7 +276,7 @@ export function ExerciseCard({
           initial={{ opacity: 0, y: 4 }}
           animate={{ opacity: 1, y: 0 }}
           onClick={handleMarkDone}
-          className="mt-4 w-full h-11 rounded-xl bg-accent text-white text-[15px] font-bold inline-flex items-center justify-center gap-1.5 active:scale-[0.98] transition-transform"
+          className="mt-3 w-full h-10 rounded-lg bg-accent text-white text-[14px] font-bold inline-flex items-center justify-center gap-1.5 active:translate-y-px transition-transform"
         >
           <Check size={15} strokeWidth={2.5} /> {t('btn.done')}
         </motion.button>

src/renderer/src/components/ExerciseEditor.tsx

@@ -85,12 +85,12 @@ export function ExerciseEditor({
       }
     >
       <div className="space-y-5">
-        <div className="rounded-2xl bg-surface-2 p-4 flex items-center gap-4">
+        <div className="rounded-lg bg-surface-2 p-4 flex items-center gap-4 border border-hairline/25">
-          <div className="w-14 h-14 rounded-2xl bg-accent text-white grid place-items-center shrink-0">
+          <div className="w-12 h-12 rounded-lg bg-accent text-white grid place-items-center shrink-0">
             <Icon name={draft.icon} size={26} strokeWidth={2.2} />
           </div>
           <div className="min-w-0">
-            <div className="font-display text-[18px] font-semibold tracking-tight truncate">
+            <div className="font-display text-[18px] font-semibold truncate">
               {draft.name || t('editor.exercise.preview.placeholder')}
             </div>
             <div className="text-[13px] text-text/55 mt-0.5 font-mono-num">
@@ -120,7 +120,7 @@ export function ExerciseEditor({
                 type="button"
                 onClick={() => setDraft({ ...draft, category: c })}
                 className={[
-                  'h-10 px-2 rounded-xl text-[13px] font-semibold transition-all active:scale-95 truncate',
+                  'h-9 px-2 rounded-lg text-[13px] font-semibold transition-colors active:translate-y-px truncate',
                   draft.category === c
                     ? 'bg-accent text-white'
                     : 'bg-surface-2 text-text/65 hover:text-text'
@@ -185,7 +185,7 @@ export function ExerciseEditor({
               <button
                 type="button"
                 onClick={() => setDraft({ ...draft, dailyGoal: undefined })}
-                className="h-9 px-3 rounded-xl bg-surface-2 text-text/65 text-[13px] font-semibold hover:text-text"
+                className="h-9 px-3 rounded-lg bg-surface-2 text-text/65 text-[13px] font-semibold hover:text-text"
               >
                 {t('editor.field.daily_goal.clear')}
               </button>
@@ -200,9 +200,7 @@ export function ExerciseEditor({
           <input
             type="checkbox"
             checked={draft.adaptive ?? false}
-            onChange={(e) =>
+            onChange={(e) => setDraft({ ...draft, adaptive: e.target.checked })}
-              setDraft({ ...draft, adaptive: e.target.checked })
-            }
             className="mt-0.5 w-4 h-4 accent-accent"
           />
           <div>
@@ -216,14 +214,14 @@ export function ExerciseEditor({
         </label>
 
         <Field label={t('editor.field.icon')}>
-          <div className="grid grid-cols-8 gap-2 max-h-44 overflow-y-auto p-2 rounded-2xl bg-surface-2">
+          <div className="grid grid-cols-8 gap-2 max-h-44 overflow-y-auto p-2 rounded-lg bg-surface-2">
             {ICON_CHOICES.map((name) => (
               <button
                 key={name}
                 type="button"
                 onClick={() => setDraft({ ...draft, icon: name })}
                 className={[
-                  'h-10 w-10 grid place-items-center rounded-xl transition-all active:scale-90',
+                  'h-10 w-10 grid place-items-center rounded-lg transition-colors active:translate-y-px',
                   draft.icon === name
                     ? 'bg-accent text-white'
                     : 'bg-surface text-text/65 hover:text-text'
@@ -241,9 +239,9 @@ export function ExerciseEditor({
           width: 100%;
           height: 44px;
           padding: 0 14px;
-          border-radius: 12px;
+          border-radius: 8px;
-          border: 0;
+          border: 1px solid rgb(var(--hairline) / 0.35);
-          background: rgb(var(--surface-2));
+          background: rgb(var(--surface));
           color: rgb(var(--text));
           font-size: 15px;
           outline: none;

src/renderer/src/components/HistoryHeatmap.tsx

@@ -109,7 +109,7 @@ export function HistoryHeatmap({
     translateN(lang, 'heatmap.tooltip.reps', n)
 
   return (
-    <div className="bg-surface rounded-2xl p-5 shadow-card dark:ring-0.5 dark:ring-hairline/30">
+    <div className="bg-surface rounded-xl p-4 shadow-card border border-hairline/30">
       <div className="flex items-center gap-2 mb-3">
         <div className="text-[14px] text-text/75 font-semibold">
           {t('heatmap.title')}

src/renderer/src/components/MealEditor.tsx

@@ -84,12 +84,12 @@ export function MealEditor({
       }
     >
       <div className="space-y-5">
-        <div className="rounded-2xl bg-surface-2 p-4 flex items-center gap-4">
+        <div className="rounded-lg bg-surface-2 p-4 flex items-center gap-4 border border-hairline/25">
-          <div className="w-14 h-14 rounded-2xl bg-accent text-white grid place-items-center shrink-0">
+          <div className="w-12 h-12 rounded-lg bg-accent text-white grid place-items-center shrink-0">
             <Icon name={draft.icon} size={26} strokeWidth={2.2} />
           </div>
           <div className="min-w-0">
-            <div className="font-display text-[18px] font-semibold tracking-tight truncate">
+            <div className="font-display text-[18px] font-semibold truncate">
               {draft.name || t('editor.meal.preview.placeholder')}
             </div>
             <div className="text-[13px] text-text/55 mt-0.5 font-mono-num">
@@ -128,7 +128,7 @@ export function MealEditor({
                   aria-pressed={active}
                   onClick={() => toggleDay(dow)}
                   className={[
-                    'h-10 rounded-xl text-[13px] font-semibold transition-all active:scale-95',
+                    'h-9 rounded-lg text-[13px] font-semibold transition-colors active:translate-y-px',
                     active
                       ? 'bg-accent text-white'
                       : 'bg-surface-2 text-text/65 hover:text-text'
@@ -145,14 +145,14 @@ export function MealEditor({
         </Field>
 
         <Field label={t('editor.field.icon')}>
-          <div className="grid grid-cols-8 gap-2 max-h-44 overflow-y-auto p-2 rounded-2xl bg-surface-2">
+          <div className="grid grid-cols-8 gap-2 max-h-44 overflow-y-auto p-2 rounded-lg bg-surface-2">
             {ICON_CHOICES.map((name) => (
               <button
                 key={name}
                 type="button"
                 onClick={() => setDraft({ ...draft, icon: name })}
                 className={[
-                  'h-10 w-10 grid place-items-center rounded-xl transition-all active:scale-90',
+                  'h-10 w-10 grid place-items-center rounded-lg transition-colors active:translate-y-px',
                   draft.icon === name
                     ? 'bg-accent text-white'
                     : 'bg-surface text-text/65 hover:text-text'
@@ -170,9 +170,9 @@ export function MealEditor({
           width: 100%;
           height: 44px;
           padding: 0 14px;
-          border-radius: 12px;
+          border-radius: 8px;
-          border: 0;
+          border: 1px solid rgb(var(--hairline) / 0.35);
-          background: rgb(var(--surface-2));
+          background: rgb(var(--surface));
           color: rgb(var(--text));
           font-size: 15px;
           outline: none;

src/renderer/src/components/PageScaffold.tsx

@@ -0,0 +1,104 @@
+import type { ReactNode } from 'react'
+
+type Tone = 'accent' | 'success' | 'warning' | 'info' | 'muted'
+
+export function PageHeader({
+  kicker,
+  title,
+  subtitle,
+  action
+}: {
+  kicker: string
+  title: string
+  subtitle?: string
+  action?: ReactNode
+}): JSX.Element {
+  return (
+    <div className="flex flex-col sm:flex-row sm:items-end sm:justify-between gap-4 mb-6">
+      <div className="min-w-0">
+        <div className="text-[13px] text-text/60 font-bold">{kicker}</div>
+        <h1 className="font-display text-[28px] sm:text-[32px] leading-tight mt-1 font-bold">
+          {title}
+        </h1>
+        {subtitle && (
+          <p className="text-[14px] text-text/60 mt-1.5 font-medium leading-relaxed max-w-2xl">
+            {subtitle}
+          </p>
+        )}
+      </div>
+      {action && <div className="shrink-0">{action}</div>}
+    </div>
+  )
+}
+
+export function InsightGrid({
+  children,
+  className = ''
+}: {
+  children: ReactNode
+  className?: string
+}): JSX.Element {
+  return (
+    <div
+      className={[
+        'grid grid-cols-1 sm:grid-cols-2 xl:grid-cols-3 gap-3 mb-6',
+        className
+      ].join(' ')}
+    >
+      {children}
+    </div>
+  )
+}
+
+export function InsightCard({
+  icon,
+  label,
+  value,
+  hint,
+  tone = 'accent'
+}: {
+  icon: ReactNode
+  label: string
+  value: string
+  hint?: string
+  tone?: Tone
+}): JSX.Element {
+  const iconClass =
+    tone === 'accent'
+      ? 'bg-accent text-white'
+      : tone === 'success'
+        ? 'bg-success text-white'
+        : tone === 'warning'
+          ? 'bg-warning text-white'
+          : tone === 'info'
+            ? 'bg-info text-white'
+            : 'bg-text/12 text-text/55'
+
+  return (
+    <div className="bg-surface rounded-xl p-4 shadow-card border border-hairline/30 min-w-0">
+      <div className="flex items-start gap-3">
+        <div
+          className={[
+            'w-8 h-8 rounded-lg grid place-items-center shrink-0',
+            iconClass
+          ].join(' ')}
+        >
+          {icon}
+        </div>
+        <div className="min-w-0">
+          <div className="text-[12px] text-text/50 font-bold leading-tight">
+            {label}
+          </div>
+          <div className="font-display text-[20px] font-bold leading-tight mt-1 break-words">
+            {value}
+          </div>
+          {hint && (
+            <div className="text-[13px] text-text/58 mt-2 leading-snug">
+              {hint}
+            </div>
+          )}
+        </div>
+      </div>
+    </div>
+  )
+}

src/renderer/src/components/Sidebar.tsx

@@ -11,6 +11,7 @@ import {
   X
 } from 'lucide-react'
 import { useT } from '../i18n'
+import { useAppStore } from '../store/appStore'
 
 type Item = {
   to: string
@@ -45,33 +46,31 @@ const items: Item[] = [
     to: '/settings',
     labelKey: 'nav.settings',
     icon: Settings2,
-    tint: 'bg-text/70'
+    tint: 'bg-sidebar-muted'
   }
 ]
 
 type Props = {
-  mobileOpen?: boolean
+  compactOpen?: boolean
-  onMobileClose?: () => void
+  onCompactClose?: () => void
 }
 
 export function Sidebar({
-  mobileOpen = false,
+  compactOpen = false,
-  onMobileClose
+  onCompactClose
 }: Props): JSX.Element {
   const { t } = useT()
   const drawerRef = useRef<HTMLElement | null>(null)
   const lastFocusedRef = useRef<HTMLElement | null>(null)
 
-  // Esc closes + focus trap while the mobile drawer is open. Mirrors the
-  // pattern used in Modal.tsx.
   useEffect(() => {
-    if (!mobileOpen) return undefined
+    if (!compactOpen) return undefined
     lastFocusedRef.current = document.activeElement as HTMLElement | null
 
     const onKeyDown = (e: KeyboardEvent): void => {
       if (e.key === 'Escape') {
         e.preventDefault()
-        onMobileClose?.()
+        onCompactClose?.()
         return
       }
       if (e.key !== 'Tab') return
@@ -89,31 +88,27 @@ export function Sidebar({
           e.preventDefault()
           last.focus()
         }
-      } else {
+      } else if (active === last || !root.contains(active)) {
-        if (active === last || !root.contains(active)) {
+        e.preventDefault()
-          e.preventDefault()
+        first.focus()
-          first.focus()
-        }
       }
     }
     document.addEventListener('keydown', onKeyDown, true)
     return () => {
       document.removeEventListener('keydown', onKeyDown, true)
-      // Return focus to the trigger (Titlebar's hamburger) so keyboard users
-      // pick up where they left off.
       const target = lastFocusedRef.current
       if (target && document.body.contains(target)) target.focus()
     }
-  }, [mobileOpen, onMobileClose])
+  }, [compactOpen, onCompactClose])
 
   return (
     <>
-      <aside className="hidden md:flex w-64 shrink-0 vibrancy hairline-b border-r-0 flex-col">
+      <aside className="hidden md:flex w-[276px] shrink-0 bg-sidebar text-sidebar-text flex-col border-r border-black/25">
         <SidebarContent />
       </aside>
 
       <AnimatePresence>
-        {mobileOpen && (
+        {compactOpen && (
           <motion.div
             className="md:hidden fixed inset-0 z-50 flex"
             initial={{ opacity: 0 }}
@@ -122,8 +117,8 @@ export function Sidebar({
             transition={{ duration: 0.18 }}
           >
             <motion.div
-              className="absolute inset-0 bg-black/30 backdrop-blur-md"
+              className="absolute inset-0 bg-black/35"
-              onClick={onMobileClose}
+              onClick={onCompactClose}
               initial={{ opacity: 0 }}
               animate={{ opacity: 1 }}
               exit={{ opacity: 0 }}
@@ -134,20 +129,20 @@ export function Sidebar({
               role="dialog"
               aria-modal="true"
               aria-label={t('sidebar.aria.nav')}
-              className="relative w-72 max-w-[85vw] h-full vibrancy flex flex-col"
+              className="relative w-72 max-w-[85vw] h-full bg-sidebar text-sidebar-text flex flex-col"
               initial={{ x: '-100%' }}
               animate={{ x: 0 }}
               exit={{ x: '-100%' }}
               transition={{ type: 'spring', stiffness: 420, damping: 38 }}
             >
               <button
-                onClick={onMobileClose}
+                onClick={onCompactClose}
-                className="absolute top-3 right-3 w-8 h-8 grid place-items-center rounded-full bg-surface-2 hover:bg-hairline/25 text-text/60 transition-colors active:scale-90"
+                className="absolute top-3 right-3 w-8 h-8 grid place-items-center rounded-md bg-white/[0.08] hover:bg-white/[0.14] text-sidebar-muted hover:text-sidebar-text transition-colors active:scale-95"
                 aria-label={t('btn.close')}
               >
                 <X size={14} strokeWidth={2.5} />
               </button>
-              <SidebarContent onNav={onMobileClose} />
+              <SidebarContent onNav={onCompactClose} />
             </motion.aside>
           </motion.div>
         )}
@@ -158,18 +153,26 @@ export function Sidebar({
 
 function SidebarContent({ onNav }: { onNav?: () => void }): JSX.Element {
   const { t } = useT()
+  const running = useAppStore((s) => s.state?.settings.globalEnabled ?? true)
   return (
     <>
-      <div className="px-5 pt-7 pb-6">
+      <div className="px-4 pt-5 pb-4">
-        <div className="font-serif text-[36px] leading-none tracking-tight font-bold">
+        <div className="h-10 flex items-center gap-3">
-          Laude
+          <div className="h-9 w-9 rounded-lg bg-accent text-white grid place-items-center font-display text-[18px] font-bold">
-        </div>
+            Р
-        <div className="text-[13px] text-text/55 mt-2 font-medium">
+          </div>
-          {t('sidebar.slogan')}
+          <div className="min-w-0">
+            <div className="font-display text-[20px] leading-tight font-bold">
+              Разомнись
+            </div>
+            <div className="text-[12px] text-sidebar-muted font-medium">
+              {t('sidebar.slogan')}
+            </div>
+          </div>
         </div>
       </div>
 
-      <nav className="px-2.5 flex flex-col gap-1">
+      <nav className="px-3 flex flex-col gap-1">
         {items.map(({ to, labelKey, icon: Icon, end, tint }) => (
           <NavLink
             key={to}
@@ -178,31 +181,32 @@ function SidebarContent({ onNav }: { onNav?: () => void }): JSX.Element {
             onClick={onNav}
             className={({ isActive }) =>
               [
-                'flex items-center gap-3 px-2.5 py-2 rounded-xl transition-colors duration-150',
+                'group relative flex items-center gap-3 px-3 py-2 rounded-lg transition-colors duration-150',
                 isActive
-                  ? 'bg-text/[0.06] dark:bg-white/[0.08]'
+                  ? 'bg-white/10 text-sidebar-text'
-                  : 'hover:bg-text/[0.04] dark:hover:bg-white/[0.04]'
+                  : 'text-sidebar-muted hover:bg-white/[0.06] hover:text-sidebar-text'
               ].join(' ')
             }
           >
             {({ isActive }) => (
               <>
+                <span
+                  className={[
+                    'absolute left-0 top-2 bottom-2 w-[3px] rounded-r-full',
+                    isActive ? 'bg-accent' : 'bg-transparent'
+                  ].join(' ')}
+                />
                 <div
                   className={[
-                    'w-8 h-8 rounded-[9px] grid place-items-center text-white shrink-0',
+                    'w-8 h-8 rounded-md grid place-items-center shrink-0',
-                    tint ?? 'bg-text/70'
+                    isActive
+                      ? `${tint ?? 'bg-accent'} text-white`
+                      : 'bg-white/[0.06] text-sidebar-muted group-hover:text-sidebar-text'
                   ].join(' ')}
                 >
                   <Icon size={17} strokeWidth={2.2} />
                 </div>
-                <span
+                <span className="text-[14px] truncate font-semibold">
-                  className={[
-                    'text-[15px] truncate',
-                    isActive
-                      ? 'text-text font-semibold'
-                      : 'text-text/85 font-medium'
-                  ].join(' ')}
-                >
                   {t(labelKey)}
                 </span>
               </>
@@ -211,13 +215,26 @@ function SidebarContent({ onNav }: { onNav?: () => void }): JSX.Element {
         ))}
       </nav>
 
-      <div className="mt-auto px-5 pb-5">
+      <div className="mt-auto px-4 pb-4">
-        <div className="flex items-center gap-2 text-[11px] text-text/45">
+        <div className="rounded-lg bg-white/[0.06] px-3 py-2.5">
-          <span className="relative flex h-1.5 w-1.5">
+          <div className="flex items-center gap-2 text-[12px] text-sidebar-muted">
-            <span className="absolute inline-flex h-full w-full rounded-full bg-success opacity-60 animate-ping" />
+            <span className="relative flex h-2 w-2">
-            <span className="relative inline-flex rounded-full h-1.5 w-1.5 bg-success" />
+              {running && (
-          </span>
+                <span className="absolute inline-flex h-full w-full rounded-full bg-success opacity-60 animate-ping" />
-          {t('sidebar.status_tracking')}
+              )}
+              <span
+                className={[
+                  'relative inline-flex rounded-full h-2 w-2',
+                  running ? 'bg-success' : 'bg-warning'
+                ].join(' ')}
+              />
+            </span>
+            <span className="font-semibold">
+              {running
+                ? t('sidebar.status_tracking')
+                : t('sidebar.status_paused')}
+            </span>
+          </div>
         </div>
       </div>
     </>

src/renderer/src/components/Titlebar.tsx

@@ -32,13 +32,13 @@ export function Titlebar({ title, onMenuClick }: Props): JSX.Element {
   return (
     <div
       onDoubleClick={onDoubleClick}
-      className="titlebar-drag relative h-10 px-2 sm:px-3 flex items-center justify-between vibrancy hairline-b"
+      className="titlebar-drag relative h-9 px-2 sm:px-3 flex items-center justify-between bg-sidebar text-sidebar-text hairline-b"
     >
       <div className="flex items-center gap-1 min-w-0 flex-1 basis-0">
         {onMenuClick && (
           <button
             onClick={onMenuClick}
-            className="titlebar-nodrag md:hidden w-8 h-7 grid place-items-center rounded-md hover:bg-text/[0.08] text-text/65 hover:text-text transition-colors"
+            className="titlebar-nodrag md:hidden w-8 h-7 grid place-items-center rounded-md hover:bg-white/10 text-sidebar-muted hover:text-sidebar-text transition-colors"
             aria-label={t('titlebar.menu_aria')}
           >
             <Menu size={15} strokeWidth={2} />
@@ -46,7 +46,7 @@ export function Titlebar({ title, onMenuClick }: Props): JSX.Element {
         )}
       </div>
 
-      <div className="text-[12px] font-medium text-text/55 truncate px-2">
+      <div className="text-[12px] font-semibold text-sidebar-muted truncate px-2">
         {effectiveTitle}
       </div>
 
@@ -63,9 +63,7 @@ export function Titlebar({ title, onMenuClick }: Props): JSX.Element {
         <WinBtn
           onClick={() => window.api.toggleMaximizeMain()}
           label={
-            maximized
+            maximized ? t('titlebar.restore_aria') : t('titlebar.maximize_aria')
-              ? t('titlebar.restore_aria')
-              : t('titlebar.maximize_aria')
           }
         >
           {maximized ? (
@@ -102,10 +100,10 @@ function WinBtn({
       onClick={onClick}
       aria-label={label}
       className={[
-        'titlebar-nodrag w-9 h-7 grid place-items-center rounded-md transition-colors text-text/55',
+        'titlebar-nodrag w-9 h-7 grid place-items-center rounded-md transition-colors text-sidebar-muted',
         danger
           ? 'hover:bg-destructive hover:text-white'
-          : 'hover:bg-text/[0.08] hover:text-text'
+          : 'hover:bg-white/10 hover:text-sidebar-text'
       ].join(' ')}
     >
       {children}

src/renderer/src/components/WhatsNewModal.tsx

@@ -25,11 +25,7 @@ const TAG_META = {
  * (a) автоматически после апдейта (когда `lastSeenVersion` != `currentVersion`)
  * и (b) вручную из Settings.
  */
-export function WhatsNewModal({
+export function WhatsNewModal({ open, versions, onClose }: Props): JSX.Element {
-  open,
-  versions,
-  onClose
-}: Props): JSX.Element {
   const { t, lang } = useT()
   return (
     <Modal
@@ -68,7 +64,7 @@ function VersionSection({
 
   return (
     <div>
-      <div className="text-[12px] uppercase tracking-wider text-text/55 font-bold mb-3 font-mono-num">
+      <div className="text-[12px] text-text/55 font-bold mb-3 font-mono-num">
         v{version}
       </div>
       <div className="space-y-2.5">

src/renderer/src/components/ui/Button.tsx

@@ -1,8 +1,8 @@
 import { ButtonHTMLAttributes, forwardRef } from 'react'
 
 /**
- * iOS-style button. Three primary flavours mirror iOS's filled / tinted / plain.
+ * Desktop button. Three primary flavours cover filled, bordered, and plain actions.
- * Press feedback is a subtle scale, mirroring UIKit's button highlight.
+ * Press feedback stays subtle so dense tool surfaces do not jump around.
  */
 type Variant = 'filled' | 'tinted' | 'plain' | 'destructive' | 'success'
 type Size = 'sm' | 'md' | 'lg'
@@ -24,19 +24,21 @@ const legacyMap: Record<LegacyVariant, Variant> = {
 }
 
 const variantClasses: Record<Variant, string> = {
-  filled: 'bg-accent text-white hover:brightness-105 active:brightness-95',
+  filled:
+    'bg-accent text-white hover:bg-accent/90 active:bg-accent/85 shadow-[0_1px_0_rgb(255_255_255_/_0.18)_inset]',
   tinted:
-    'bg-accent/12 text-accent hover:bg-accent/18 active:bg-accent/22 dark:bg-accent/20 dark:hover:bg-accent/25',
+    'bg-surface border border-hairline/45 text-text hover:border-accent/45 hover:text-accent active:bg-surface-2',
-  plain: 'text-accent hover:bg-accent/10 active:bg-accent/15',
+  plain:
+    'text-text/70 hover:bg-surface-2 hover:text-text active:bg-hairline/20',
   destructive:
-    'bg-destructive/12 text-destructive hover:bg-destructive/18 active:bg-destructive/22 dark:bg-destructive/20',
+    'bg-destructive/10 border border-destructive/20 text-destructive hover:bg-destructive/14 active:bg-destructive/18',
-  success: 'bg-success text-white hover:brightness-105 active:brightness-95'
+  success: 'bg-success text-white hover:bg-success/90 active:bg-success/80'
 }
 
 const sizeClasses: Record<Size, string> = {
-  sm: 'h-8 px-3.5 text-[13px] rounded-xl',
+  sm: 'h-8 px-3 text-[13px] rounded-lg',
-  md: 'h-10 px-4 text-[14px] rounded-2xl',
+  md: 'h-9 px-3.5 text-[14px] rounded-lg',
-  lg: 'h-12 px-6 text-[16px] rounded-2xl'
+  lg: 'h-10 px-4 text-[15px] rounded-lg'
 }
 
 export const Button = forwardRef<HTMLButtonElement, Props>(function Button(
@@ -49,9 +51,9 @@ export const Button = forwardRef<HTMLButtonElement, Props>(function Button(
     <button
       ref={ref}
       className={[
-        'inline-flex items-center justify-center gap-1.5 font-semibold transition-all duration-150 ease-out',
+        'inline-flex items-center justify-center gap-1.5 font-semibold transition-colors duration-150 ease-out',
         'disabled:opacity-40 disabled:cursor-not-allowed',
-        'active:scale-[0.97]',
+        'active:translate-y-px',
         variantClasses[v],
         sizeClasses[size],
         className

src/renderer/src/components/ui/Card.tsx

@@ -1,9 +1,5 @@
 import { ReactNode } from 'react'
 
-/**
- * iOS grouped-list card. Wraps rows; first/last row hairline rules handled
- * by `Row` itself (only top/middle hairline shown).
- */
 export function Card({
   children,
   className = ''
@@ -14,9 +10,7 @@ export function Card({
   return (
     <div
       className={[
-        'bg-surface rounded-2xl overflow-hidden',
+        'bg-surface rounded-xl overflow-hidden border border-hairline/35 shadow-card',
-        'shadow-[0_0.5px_0_rgb(0_0_0_/_0.04),_0_1px_2px_rgb(0_0_0_/_0.04)]',
-        'dark:shadow-none dark:ring-0.5 dark:ring-hairline/30',
         className
       ].join(' ')}
     >
@@ -25,10 +19,6 @@ export function Card({
   )
 }
 
-/**
- * Section heading above a Card group — iOS Settings style: tiny uppercase
- * label, generous spacing.
- */
 export function SectionHeader({
   title,
   hint,
@@ -39,13 +29,11 @@ export function SectionHeader({
   action?: ReactNode
 }): JSX.Element {
   return (
-    <div className="flex items-end justify-between px-4 mb-2.5">
+    <div className="flex items-end justify-between mb-2.5">
       <div>
-        <div className="text-[13px] font-semibold uppercase tracking-[0.06em] text-text/60">
+        <div className="text-[13px] font-bold text-text/70">{title}</div>
-          {title}
-        </div>
         {hint && (
-          <div className="text-[13px] text-text/55 mt-0.5 font-medium">
+          <div className="text-[12px] text-text/55 mt-0.5 font-medium">
             {hint}
           </div>
         )}
@@ -55,10 +43,6 @@ export function SectionHeader({
   )
 }
 
-/**
- * A single row inside Card — left icon (optional), title + subtitle, right
- * accessory (switch / chevron / button). Adds bottom hairline unless `last`.
- */
 export function Row({
   children,
   className = '',
@@ -75,9 +59,9 @@ export function Row({
     <div
       onClick={onClick}
       className={[
-        'flex items-center gap-3 px-4 py-3 relative',
+        'flex items-center gap-3 px-4 py-3 relative min-h-[58px]',
         interactive
-          ? 'cursor-pointer active:bg-surface-2 dark:active:bg-white/5 transition-colors'
+          ? 'cursor-pointer hover:bg-surface-2/65 active:bg-surface-2 transition-colors'
           : '',
         !last ? 'hairline-b' : '',
         className

src/renderer/src/components/ui/ConfirmModal.tsx

@@ -18,10 +18,10 @@ type Props = {
 }
 
 /**
- * iOS-style confirm-диалог. Заменяет `window.confirm()` — нативный prompt
+ * Desktop confirm-диалог. Заменяет `window.confirm()` — нативный prompt
- * выглядит инородно в дизайне приложения, без вибрации accent-цвета и без
+ * выглядит инородно в дизайне приложения и не поддерживает focus-trap.
- * focus-trap'a. Использует наш Modal под капотом, поэтому получаем
+ * Использует наш Modal под капотом, поэтому получаем focus-trap и
- * focus-trap и Esc-to-cancel бесплатно.
+ * Esc-to-cancel бесплатно.
  */
 export function ConfirmModal({
   open,

src/renderer/src/components/ui/Modal.tsx

@@ -27,17 +27,6 @@ function getFocusable(root: HTMLElement): HTMLElement[] {
   ).filter((el) => el.offsetParent !== null || el === document.activeElement)
 }
 
-/**
- * iOS-style centred sheet. Spring-snap on enter, soft fade-out.
- *
- * Accessibility:
- *  - role="dialog" + aria-modal="true" + aria-labelledby on the title <h2>
- *  - Focus is trapped inside the dialog while open; Tab/Shift-Tab cycle
- *    through focusable children and never escape to the underlying page.
- *  - On open the first focusable element is focused.
- *  - On close, focus returns to whatever was focused when the modal opened.
- *  - Esc closes (parent handles confirm-on-dirty if it wants).
- */
 export function Modal({
   open,
   onClose,
@@ -119,7 +108,7 @@ export function Modal({
     <AnimatePresence>
       {open && (
         <motion.div
-          className="fixed inset-0 z-50 grid place-items-center p-4 bg-black/40 backdrop-blur-md"
+          className="fixed inset-0 z-50 grid place-items-center p-4 bg-black/40"
           initial={{ opacity: 0 }}
           animate={{ opacity: 1 }}
           exit={{ opacity: 0 }}
@@ -132,39 +121,36 @@ export function Modal({
             aria-modal="true"
             aria-labelledby={titleId}
             className={[
-              'relative w-full bg-surface rounded-3xl shadow-sheet flex flex-col overflow-hidden',
+              'relative w-full bg-surface rounded-xl shadow-sheet flex flex-col overflow-hidden border border-hairline/45',
               sizeClass[size]
             ].join(' ')}
-            initial={{ scale: 0.94, y: 24, opacity: 0 }}
+            initial={{ scale: 0.98, y: 10, opacity: 0 }}
             animate={{ scale: 1, y: 0, opacity: 1 }}
-            exit={{ scale: 0.96, y: 12, opacity: 0 }}
+            exit={{ scale: 0.98, y: 6, opacity: 0 }}
             transition={{ type: 'spring', stiffness: 400, damping: 32 }}
             onClick={(e) => e.stopPropagation()}
           >
-            {/* Header — iOS large modal title */}
+            <div className="flex items-center justify-between px-5 py-3 hairline-b bg-surface-elevated">
-            <div className="flex items-center justify-between px-5 pt-5 pb-3">
               <h2
                 id={titleId}
-                className="font-display text-[20px] font-semibold tracking-tight"
+                className="font-display text-[18px] font-semibold"
               >
                 {title}
               </h2>
               <button
                 onClick={onClose}
                 data-modal-close=""
-                className="w-7 h-7 grid place-items-center rounded-full bg-surface-2 hover:bg-hairline/25 text-text/60 hover:text-text transition-colors active:scale-90"
+                className="w-7 h-7 grid place-items-center rounded-md bg-surface-2 hover:bg-hairline/25 text-text/60 hover:text-text transition-colors active:scale-95"
                 aria-label={t('btn.close')}
               >
                 <X size={14} strokeWidth={2.5} />
               </button>
             </div>
 
-            <div className="px-5 pb-5 overflow-y-auto max-h-[70vh]">
+            <div className="p-5 overflow-y-auto max-h-[72vh]">{children}</div>
-              {children}
-            </div>
 
             {footer && (
-              <div className="hairline-t px-5 py-3 flex justify-end gap-2 bg-surface">
+              <div className="hairline-t px-5 py-3 flex justify-end gap-2 bg-surface-elevated">
                 {footer}
               </div>
             )}

src/renderer/src/components/ui/Switch.tsx

@@ -7,9 +7,6 @@ type Props = {
   'aria-label'?: string
 }
 
-/**
- * iOS UISwitch — 51×31 spec, green when on, smooth spring knob.
- */
 export function Switch({
   checked,
   onChange,
@@ -25,17 +22,18 @@ export function Switch({
       onClick={() => !disabled && onChange(!checked)}
       disabled={disabled}
       className={[
-        'relative inline-flex h-[31px] w-[51px] shrink-0 cursor-pointer rounded-full transition-colors duration-200 ease-out',
+        'relative inline-flex h-6 w-11 shrink-0 cursor-pointer rounded-full transition-colors duration-150 ease-out border',
-        checked ? 'bg-success' : 'bg-hairline/25 dark:bg-hairline/50',
+        checked
+          ? 'bg-success border-success'
+          : 'bg-surface-2 border-hairline/55',
         disabled ? 'opacity-40 cursor-not-allowed' : ''
       ].join(' ')}
       style={{ padding: 2 }}
     >
       <motion.span
-        className="block h-[27px] w-[27px] rounded-full bg-white"
+        className="block h-[18px] w-[18px] rounded-full bg-white"
         style={{
-          boxShadow:
+          boxShadow: '0 1px 2px rgba(0,0,0,0.18), 0 0 0 0.5px rgba(0,0,0,0.08)'
-            '0 3px 8px rgba(0,0,0,0.15), 0 3px 1px rgba(0,0,0,0.06), 0 0 0 0.5px rgba(0,0,0,0.04)'
         }}
         animate={{ x: checked ? 20 : 0 }}
         transition={{ type: 'spring', stiffness: 700, damping: 35 }}

src/renderer/src/i18n/dict.ts

@@ -12,21 +12,22 @@ export type Dict = Record<string, string>
 
 export const ru: Dict = {
   // Sidebar / nav
-  'nav.today': 'Сегодня',
+  'nav.today': 'Обзор',
   'nav.exercises': 'Упражнения',
   'nav.meals': 'Питание',
   'nav.games': 'Игры',
   'nav.challenges': 'Челленджи',
   'nav.settings': 'Настройки',
-  'sidebar.slogan': 'Двигайся осознанно',
+  'sidebar.slogan': 'Лёгкий перерыв без потери фокуса',
   'sidebar.status_tracking': 'Активность отслеживается',
+  'sidebar.status_paused': 'Напоминания на паузе',
   'titlebar.menu_aria': 'Меню',
   'titlebar.minimize_aria': 'Свернуть',
   'titlebar.maximize_aria': 'Развернуть',
   'titlebar.restore_aria': 'Восстановить размер',
   'titlebar.tray_aria': 'В трей',
   'titlebar.close_aria': 'Закрыть',
-  'titlebar.app_title': 'Exercise Reminder',
+  'titlebar.app_title': 'Разомнись',
 
   // Common buttons / actions
   'btn.add': 'Добавить',
@@ -60,11 +61,34 @@ export const ru: Dict = {
   'btn.retry': 'Повторить',
 
   // Dashboard
-  'dashboard.kicker': 'Тренировка дня',
+  'dashboard.kicker': 'План перерывов',
-  'dashboard.title': 'Сегодня',
+  'dashboard.title': 'Что важно сейчас',
+  'dashboard.header.date': 'План на {date}',
+  'dashboard.header.status.paused': 'пауза',
+  'dashboard.header.status.meeting': 'встреча',
+  'dashboard.header.status.due': 'ждёт действия',
+  'dashboard.header.status.running': 'в работе',
+  'dashboard.header.status.clear': 'спокойно',
+  'dashboard.header.title.paused': 'Напоминания на паузе',
+  'dashboard.header.subtitle.paused':
+    'Запусти их снова, когда будешь готов вернуться к коротким перерывам.',
+  'dashboard.header.title.meeting': 'Встреча активна',
+  'dashboard.header.subtitle.meeting':
+    'Пауза на встречах включена. Напоминания продолжатся, когда звонок закончится.',
+  'dashboard.header.title.due': 'Пора сделать: {name}',
+  'dashboard.header.subtitle.due':
+    '{kind} · {meta}. Это ближайшее действие по плану.',
+  'dashboard.header.title.next': 'Следующее: {name}',
+  'dashboard.header.subtitle.next': '{kind} · {meta} · {time}',
+  'dashboard.header.title.empty': 'Настрой первый перерыв',
+  'dashboard.header.subtitle.empty':
+    'Добавь упражнение или питание, чтобы приложение собрало понятный план дня.',
+  'dashboard.header.title.clear': 'План под контролем',
+  'dashboard.header.subtitle.clear':
+    'Срочных действий нет. Ниже видно цели, ритм недели и игровые долги.',
   'dashboard.stat.active': 'Активных',
   'dashboard.stat.active.of': 'из {total}',
-  'dashboard.stat.today_done': 'Сегодня',
+  'dashboard.stat.today_done': 'Сделано',
   'dashboard.stat.today_done.subtitle': 'повторов за день',
   'dashboard.stat.streak': 'Стрик',
   'dashboard.stat.streak.subtitle': '{n} дн. подряд',
@@ -75,22 +99,106 @@ export const ru: Dict = {
   'dashboard.stat.tracking': 'Трекинг матчей',
   'dashboard.stat.tracking.on': 'On',
   'dashboard.stat.tracking.off': 'Off',
-  'dashboard.stat.tracking.pending': 'Setup',
+  'dashboard.stat.tracking.pending': 'Настройка',
   'dashboard.stat.tracking.subtitle_on': 'в реальном времени',
   'dashboard.stat.tracking.subtitle_off': 'выключен',
   'dashboard.stat.tracking.subtitle_pending':
     'нужно закрыть Steam и снова открыть',
   'dashboard.paused.title': 'Напоминания на паузе',
   'dashboard.paused.hint': 'Возобнови, чтобы продолжить отсчёт',
-  'dashboard.meeting.title': 'Не дёргаем — ты на встрече',
+  'dashboard.meeting.title': 'Встреча активна',
   'dashboard.meeting.hint':
-    'Запущен Zoom / Teams / Discord / Webex / Slack-huddle. Напоминания возобновятся когда закроешь.',
+    'Запущен Zoom / Teams / Webex / Slack-huddle. Напоминания возобновятся, когда встреча закончится.',
+  'dashboard.plan.title': 'Ближайший шаг',
+  'dashboard.plan.subtitle': 'Что сделать сейчас, дневные цели и питание',
+  'dashboard.plan.due_count': '{n} к выполнению',
+  'dashboard.plan.all_caught_up': 'всё спокойно',
+  'dashboard.plan.next_action': 'Следующее действие',
+  'dashboard.plan.kind.exercise': 'упражнение',
+  'dashboard.plan.kind.meal': 'питание',
+  'dashboard.plan.due_now': 'можно сделать сейчас',
+  'dashboard.plan.next_in': 'через {time}',
+  'dashboard.plan.paused': 'напоминания на паузе',
+  'dashboard.plan.meal_time': 'в {time}',
+  'dashboard.plan.done_now': 'Сделал',
+  'dashboard.plan.ate_now': 'Поел',
+  'dashboard.plan.clear.title': 'На сегодня чисто',
+  'dashboard.plan.clear.hint': 'Можно отдохнуть или добавить новое действие',
+  'dashboard.plan.goals': 'Дневные цели',
+  'dashboard.plan.goals.progress': '{done}/{goal}',
+  'dashboard.plan.goals.remaining': 'осталось {n} раз',
+  'dashboard.plan.goals.hint': 'прогресс по упражнениям с дневной целью',
+  'dashboard.plan.goals.empty':
+    'Добавь дневную цель в упражнении, чтобы видеть прогресс',
+  'dashboard.plan.meals': 'Питание',
+  'dashboard.plan.meals.progress': '{done}/{total}',
+  'dashboard.plan.recovery': 'Режим',
+  'dashboard.plan.recovery.first.title': 'Первый шаг',
+  'dashboard.plan.recovery.first.hint': 'Начни с одного лёгкого действия',
+  'dashboard.plan.recovery.return.title': 'Мягкий возврат',
+  'dashboard.plan.recovery.return.hint':
+    '{n} дн. без действий — начни с минимума',
+  'dashboard.plan.recovery.steady.title': 'Ритм держится',
+  'dashboard.plan.recovery.steady.today': 'сегодня уже есть действие',
+  'dashboard.plan.recovery.steady.yesterday': 'вчера был активный день',
+  'dashboard.plan.recovery.steady.none': 'держим спокойный темп',
+  'dashboard.plan.up_next': 'Дальше',
+  'dashboard.plan.item.remaining': 'осталось {n}',
+  'dashboard.plan.item.remaining_reps': 'осталось {n} раз',
+  'dashboard.plan.item.reps': '{n} раз',
   'dashboard.empty.title': 'Программа пуста',
   'dashboard.empty.hint': 'Добавь первое упражнение, чтобы начать',
 
+  // Momentum / today redesign
+  'momentum.level.title': 'Уровень',
+  'momentum.level.number': 'уровень {n}',
+  'momentum.level.next': 'до «{name}» осталось {n} XP',
+  'momentum.level.max': 'максимальный уровень',
+  'momentum.level.warmup': 'Разогрелся',
+  'momentum.level.rhythm': 'Вошёл в ритм',
+  'momentum.level.steady': 'Держу форму',
+  'momentum.level.back': 'Железная спина',
+  'momentum.level.machine': 'Машина привычек',
+  'momentum.level.legend': 'Легенда перерывов',
+  'momentum.week.kicker': 'Челленджи недели',
+  'momentum.week.title': 'Ритм за неделю',
+  'momentum.week.summary': '{days} дн · {reps} повт',
+  'momentum.quest.complete': 'закрыто',
+  'momentum.quest.week_rhythm.title': '5 дней без нуля',
+  'momentum.quest.week_rhythm.desc': 'отметь активность в 5 разных дней',
+  'momentum.quest.week_reps.title': '1000 повторов',
+  'momentum.quest.week_reps.desc': 'набери тысячу повторов за неделю',
+  'momentum.quest.match_debt.title': 'Закрыть катки',
+  'momentum.quest.match_debt.desc': 'закрой 3 игровых долга за неделю',
+  'momentum.quest.today_anchor.title': 'День не ноль',
+  'momentum.quest.today_anchor.desc': 'сделай хотя бы одно действие сегодня',
+  'momentum.game.kicker': 'После катки',
+  'momentum.game.title': 'Игровой долг',
+  'momentum.game.status': 'Dota GSI',
+  'momentum.game.live': 'live',
+  'momentum.game.setup': 'настройка',
+  'momentum.game.off': 'выкл',
+  'momentum.game.today': 'сегодня',
+  'momentum.game.week': 'неделя',
+  'momentum.game.reps': '{n} повт',
+  'momentum.game.entries': '{n} закрыто',
+  'momentum.game.last': 'последняя катка: {date}',
+  'momentum.game.no_matches': 'закрытых игровых долгов пока нет',
+  'momentum.game.no_rules':
+    'Добавь челлендж за матч, и здесь появится долг после каток.',
+
   // Exercises
   'exercises.kicker': 'Программа',
   'exercises.title': 'Упражнения',
+  'exercises.subtitle':
+    'Собери короткие действия, которые легко сделать между задачами.',
+  'exercises.insight.active': 'Активно',
+  'exercises.insight.active.hint': 'Напоминания, которые сейчас работают',
+  'exercises.insight.load': 'Нагрузка',
+  'exercises.insight.load.value': '{n} раз',
+  'exercises.insight.load.hint': 'Сумма повторов за один полный круг',
+  'exercises.insight.goals': 'Цели',
+  'exercises.insight.goals.hint': 'Упражнения с дневной нормой',
   'exercises.section.active': 'Активные · {n}',
   'exercises.section.disabled': 'Выключенные · {n}',
   'exercises.row.meta': '{reps} раз · {interval}',
@@ -99,7 +207,15 @@ export const ru: Dict = {
   // Meals (приёмы пищи)
   'meals.kicker': 'Режим питания',
   'meals.title': 'Питание',
+  'meals.subtitle': 'Держи еду в расписании, чтобы не выпадать из ритма.',
+  'meals.insight.active': 'Активно',
+  'meals.insight.active.hint': 'Приёмы пищи с включённым напоминанием',
+  'meals.insight.next': 'Следующее',
+  'meals.insight.next.hint': 'Ближайшее время сегодня',
+  'meals.insight.presets': 'Пресеты',
+  'meals.insight.presets.hint': 'Быстрые варианты для старта',
   'meals.presets': 'Быстрое добавление',
+  'meals.schedule': 'Расписание',
   'meals.section.active': 'Активные · {n}',
   'meals.section.disabled': 'Выключенные · {n}',
   'meals.empty': 'Пока нет приёмов пищи — добавь первый или выбери пресет',
@@ -139,6 +255,13 @@ export const ru: Dict = {
   'challenges.title': 'Челленджи',
   'challenges.subtitle': 'Повторов = {formula}',
   'challenges.subtitle.formula': 'статистика × коэффициент',
+  'challenges.insight.active': 'Активно',
+  'challenges.insight.active.hint': 'Правила, которые начисляют долг',
+  'challenges.insight.games': 'Игры',
+  'challenges.insight.games.hint': 'Включённые игровые интеграции',
+  'challenges.insight.debt': 'Тест долга',
+  'challenges.insight.debt.value': '{n} раз',
+  'challenges.insight.debt.hint': 'Если каждое правило поймает 5 событий',
   'challenges.warning.no_games':
     'Челленджи срабатывают после матча. Подключи игру во вкладке «Игры».',
   'challenges.section.all': 'Все · {n}',
@@ -164,6 +287,13 @@ export const ru: Dict = {
   'games.subtitle': 'Подключи игру — челленджи сработают сразу после матча',
   'games.subtitle.live': '{n} live',
   'games.section.supported': 'Поддерживаемые',
+  'games.insight.supported': 'Поддержка',
+  'games.insight.supported.hint': 'Игры, которые умеет отслеживать приложение',
+  'games.insight.connected': 'Подключено',
+  'games.insight.connected.hint': 'Интеграции с установленной GSI',
+  'games.insight.live': 'Сигнал',
+  'games.insight.live.hint': 'Live или ожидание перезапуска Steam',
+  'games.insight.queued': '{n} в очереди',
   'games.scanning': 'Сканируем установленные игры…',
   'games.queued.body':
     'Steam запущен. Параметр {opt} пропишется автоматически при следующем закрытии Steam.',
@@ -180,13 +310,38 @@ export const ru: Dict = {
   // Settings
   'settings.kicker': 'Конфигурация',
   'settings.title': 'Настройки',
+  'settings.insight.mode': 'Уведомления',
+  'settings.insight.mode.hint': 'Как приложение говорит о перерыве',
+  'settings.insight.theme': 'Тема',
+  'settings.insight.theme.hint': 'Визуальный режим интерфейса',
+  'settings.insight.language': 'Язык',
+  'settings.insight.language.hint': 'Применяется без перезапуска',
+  'settings.status.kicker': 'Состояние',
+  'settings.status.title.on': 'Напоминания работают',
+  'settings.status.title.off': 'Напоминания остановлены',
+  'settings.status.hint.paused':
+    'Перерывы не будут появляться, пока ты снова не запустишь напоминания.',
+  'settings.status.hint.quiet':
+    'Напоминания работают, но тихие часы {from}-{to} могут временно их скрывать.',
+  'settings.status.hint.autostart':
+    'После перезагрузки приложение не запустится само.',
+  'settings.status.hint.ready':
+    'Приложение запустится с Windows и будет мягко вести расписание перерывов.',
+  'settings.status.reminders': 'Напоминания',
+  'settings.status.quiet': 'Тихие часы',
+  'settings.status.meetings': 'Встречи',
+  'settings.status.autostart': 'Windows',
+  'settings.status.on': 'Вкл',
+  'settings.status.off': 'Выкл',
   'settings.section.reminders': 'Напоминания',
   'settings.section.quiet': 'Тихие часы',
   'settings.section.window': 'Окно и трей',
   'settings.section.appearance': 'Внешний вид',
   'settings.section.language': 'Язык',
+  'settings.section.interface': 'Интерфейс',
   'settings.section.updates': 'Обновления',
   'settings.section.data': 'Данные',
+  'settings.section.diagnostics': 'Диагностика',
   'settings.data.export.label': 'Экспортировать всё',
   'settings.data.export.hint':
     'Сохрани резервную копию упражнений, истории, челленджей и настроек в JSON-файл.',
@@ -201,6 +356,20 @@ export const ru: Dict = {
     'Все текущие упражнения, история и настройки будут заменены содержимым файла. Продолжить?',
   'settings.data.import.ok': 'Восстановлено',
   'settings.data.import.err': 'Файл не подошёл — это не наша резервная копия?',
+  'settings.diagnostics.app.label': 'Приложение',
+  'settings.diagnostics.data.label': 'Данные',
+  'settings.diagnostics.data.legend': 'упр/еда/чел/ист',
+  'settings.diagnostics.gsi.label': 'Dota GSI',
+  'settings.diagnostics.hint':
+    'Технический снимок без токенов: версии, пути, статусы и счетчики.',
+  'settings.diagnostics.loading': 'Загружаем…',
+  'settings.diagnostics.err': 'Не удалось собрать диагностику',
+  'settings.diagnostics.refresh': 'Обновить диагностику',
+  'settings.diagnostics.copy.btn': 'Копировать',
+  'settings.diagnostics.copy.ok': 'Диагностика скопирована',
+  'settings.diagnostics.logs.btn': 'Логи',
+  'settings.diagnostics.logs.ok': 'Папка логов открыта',
+  'settings.diagnostics.logs.err': 'Не удалось открыть папку логов',
   'settings.section.about': 'О приложении',
   'settings.version.label': 'Версия',
   'settings.version.hint': 'Текущая установленная версия приложения.',
@@ -215,6 +384,8 @@ export const ru: Dict = {
   'settings.notification_mode.modal': 'Окно поверх всех',
   'settings.notification_mode.toast': 'Системное уведомление',
   'settings.notification_mode.both': 'Окно и уведомление',
+  'settings.global.label': 'Напоминания включены',
+  'settings.global.hint': 'Главный режим работы приложения',
   'settings.sound.label': 'Звук уведомления',
   'settings.sound.hint': 'Короткий сигнал при срабатывании',
   'settings.voice.label': 'Голосовая подсказка',
@@ -222,7 +393,7 @@ export const ru: Dict = {
     'Диктор произносит название упражнения и количество — полезно когда фокус на коде.',
   'settings.meeting_pause.label': 'Пауза на встречах',
   'settings.meeting_pause.hint':
-    'Не дёргать, если запущен Zoom / Teams / Discord / Webex / Slack-huddle.',
+    'Ставить напоминания на паузу, если запущен Zoom / Teams / Webex / Slack-huddle.',
   'settings.snooze.label': '«Отложить» на',
   'settings.snooze.hint': 'Сколько минут добавлять при отложении',
   'settings.snooze.1': '1 минута',
@@ -267,9 +438,11 @@ export const ru: Dict = {
   'updater.available.title': 'Доступна v{v}',
   'updater.downloading.title': 'Загружаем обновление',
   'updater.downloading.subtitle': '{got} / {total} МБ · {speed} МБ/с',
-  'updater.downloading.hint': 'Можно закрыть это окно — скачивание продолжится в фоне.',
+  'updater.downloading.hint':
+    'Можно закрыть это окно — скачивание продолжится в фоне.',
   'updater.downloaded.title': 'Готово · v{v}',
-  'updater.downloaded.subtitle': 'Нажми «Рестарт» — приложение моментально откроется в новой версии.',
+  'updater.downloaded.subtitle':
+    'Нажми «Рестарт» — приложение моментально откроется в новой версии.',
   'updater.error.title': 'Ошибка проверки',
   'updater.idle.title': 'Проверить обновления',
   'updater.idle.subtitle': 'Авто-проверка раз в час',
@@ -373,21 +546,22 @@ export const ru: Dict = {
 
 export const en: Dict = {
   // Sidebar / nav
-  'nav.today': 'Today',
+  'nav.today': 'Overview',
   'nav.exercises': 'Exercises',
   'nav.meals': 'Meals',
   'nav.games': 'Games',
   'nav.challenges': 'Challenges',
   'nav.settings': 'Settings',
-  'sidebar.slogan': 'Move with intention',
+  'sidebar.slogan': 'A small break without losing focus',
   'sidebar.status_tracking': 'Activity tracking is on',
+  'sidebar.status_paused': 'Reminders paused',
   'titlebar.menu_aria': 'Menu',
   'titlebar.minimize_aria': 'Minimize',
   'titlebar.maximize_aria': 'Maximize',
   'titlebar.restore_aria': 'Restore size',
   'titlebar.tray_aria': 'To tray',
   'titlebar.close_aria': 'Close',
-  'titlebar.app_title': 'Exercise Reminder',
+  'titlebar.app_title': 'Razomnis',
 
   // Common buttons
   'btn.add': 'Add',
@@ -421,11 +595,34 @@ export const en: Dict = {
   'btn.retry': 'Retry',
 
   // Dashboard
-  'dashboard.kicker': 'Daily training',
+  'dashboard.kicker': 'Break plan',
-  'dashboard.title': 'Today',
+  'dashboard.title': 'What matters now',
+  'dashboard.header.date': 'Plan for {date}',
+  'dashboard.header.status.paused': 'paused',
+  'dashboard.header.status.meeting': 'meeting',
+  'dashboard.header.status.due': 'action due',
+  'dashboard.header.status.running': 'running',
+  'dashboard.header.status.clear': 'clear',
+  'dashboard.header.title.paused': 'Reminders are paused',
+  'dashboard.header.subtitle.paused':
+    'Start them again when you are ready to return to short breaks.',
+  'dashboard.header.title.meeting': 'Meeting active',
+  'dashboard.header.subtitle.meeting':
+    'Meeting pause is enabled. Reminders will continue when the call ends.',
+  'dashboard.header.title.due': 'Time to do: {name}',
+  'dashboard.header.subtitle.due':
+    '{kind} · {meta}. This is the closest action in the plan.',
+  'dashboard.header.title.next': 'Next: {name}',
+  'dashboard.header.subtitle.next': '{kind} · {meta} · {time}',
+  'dashboard.header.title.empty': 'Set up your first break',
+  'dashboard.header.subtitle.empty':
+    'Add an exercise or meal so the app can build a clear day plan.',
+  'dashboard.header.title.clear': 'Plan under control',
+  'dashboard.header.subtitle.clear':
+    'No urgent actions. Goals, weekly rhythm and game debts are below.',
   'dashboard.stat.active': 'Active',
   'dashboard.stat.active.of': 'of {total}',
-  'dashboard.stat.today_done': 'Today',
+  'dashboard.stat.today_done': 'Done',
   'dashboard.stat.today_done.subtitle': 'reps logged',
   'dashboard.stat.streak': 'Streak',
   'dashboard.stat.streak.subtitle': '{n} days in a row',
@@ -441,16 +638,100 @@ export const en: Dict = {
   'dashboard.stat.tracking.subtitle_off': 'disabled',
   'dashboard.stat.tracking.subtitle_pending': 'close & reopen Steam',
   'dashboard.paused.title': 'Reminders paused',
-  'dashboard.meeting.title': "You're in a meeting — won't interrupt",
+  'dashboard.meeting.title': 'Meeting active',
   'dashboard.meeting.hint':
-    'Zoom / Teams / Discord / Webex / Slack-huddle is running. Reminders resume when you close it.',
+    'Zoom / Teams / Webex / Slack-huddle is running. Reminders resume when the meeting ends.',
   'dashboard.paused.hint': 'Resume to continue countdown',
+  'dashboard.plan.title': 'Closest step',
+  'dashboard.plan.subtitle': 'What to do now, daily goals and meals',
+  'dashboard.plan.due_count': '{n} due',
+  'dashboard.plan.all_caught_up': 'all clear',
+  'dashboard.plan.next_action': 'Next action',
+  'dashboard.plan.kind.exercise': 'exercise',
+  'dashboard.plan.kind.meal': 'meal',
+  'dashboard.plan.due_now': 'ready now',
+  'dashboard.plan.next_in': 'in {time}',
+  'dashboard.plan.paused': 'reminders paused',
+  'dashboard.plan.meal_time': 'at {time}',
+  'dashboard.plan.done_now': 'Done',
+  'dashboard.plan.ate_now': 'Ate',
+  'dashboard.plan.clear.title': 'Clear for today',
+  'dashboard.plan.clear.hint': 'Rest or add another action',
+  'dashboard.plan.goals': 'Daily goals',
+  'dashboard.plan.goals.progress': '{done}/{goal}',
+  'dashboard.plan.goals.remaining': '{n} left',
+  'dashboard.plan.goals.hint': 'progress across exercises with daily goals',
+  'dashboard.plan.goals.empty':
+    'Add a daily goal to an exercise to see progress',
+  'dashboard.plan.meals': 'Meals',
+  'dashboard.plan.meals.progress': '{done}/{total}',
+  'dashboard.plan.recovery': 'Mode',
+  'dashboard.plan.recovery.first.title': 'First step',
+  'dashboard.plan.recovery.first.hint': 'Start with one easy action',
+  'dashboard.plan.recovery.return.title': 'Gentle return',
+  'dashboard.plan.recovery.return.hint':
+    '{n} days without actions — start small',
+  'dashboard.plan.recovery.steady.title': 'Rhythm holding',
+  'dashboard.plan.recovery.steady.today': 'you already logged one today',
+  'dashboard.plan.recovery.steady.yesterday': 'yesterday stayed active',
+  'dashboard.plan.recovery.steady.none': 'keep a calm pace',
+  'dashboard.plan.up_next': 'Up next',
+  'dashboard.plan.item.remaining': '{n} left',
+  'dashboard.plan.item.remaining_reps': '{n} reps left',
+  'dashboard.plan.item.reps': '{n} reps',
   'dashboard.empty.title': 'Program is empty',
   'dashboard.empty.hint': 'Add your first exercise to start',
 
+  // Momentum / today redesign
+  'momentum.level.title': 'Level',
+  'momentum.level.number': 'level {n}',
+  'momentum.level.next': '{n} XP to "{name}"',
+  'momentum.level.max': 'max level',
+  'momentum.level.warmup': 'Warmed up',
+  'momentum.level.rhythm': 'In rhythm',
+  'momentum.level.steady': 'Keeping shape',
+  'momentum.level.back': 'Iron back',
+  'momentum.level.machine': 'Habit machine',
+  'momentum.level.legend': 'Break legend',
+  'momentum.week.kicker': 'Weekly challenges',
+  'momentum.week.title': 'Week rhythm',
+  'momentum.week.summary': '{days} d · {reps} reps',
+  'momentum.quest.complete': 'done',
+  'momentum.quest.week_rhythm.title': '5 non-zero days',
+  'momentum.quest.week_rhythm.desc': 'log activity on 5 different days',
+  'momentum.quest.week_reps.title': '1000 reps',
+  'momentum.quest.week_reps.desc': 'reach one thousand reps this week',
+  'momentum.quest.match_debt.title': 'Close matches',
+  'momentum.quest.match_debt.desc': 'close 3 game debts this week',
+  'momentum.quest.today_anchor.title': 'Non-zero day',
+  'momentum.quest.today_anchor.desc': 'complete at least one action today',
+  'momentum.game.kicker': 'After match',
+  'momentum.game.title': 'Game debt',
+  'momentum.game.status': 'Dota GSI',
+  'momentum.game.live': 'live',
+  'momentum.game.setup': 'setup',
+  'momentum.game.off': 'off',
+  'momentum.game.today': 'today',
+  'momentum.game.week': 'week',
+  'momentum.game.reps': '{n} reps',
+  'momentum.game.entries': '{n} closed',
+  'momentum.game.last': 'last match: {date}',
+  'momentum.game.no_matches': 'no closed game debts yet',
+  'momentum.game.no_rules':
+    'Add a per-match challenge and game debt will show up here.',
+
   // Exercises
   'exercises.kicker': 'Program',
   'exercises.title': 'Exercises',
+  'exercises.subtitle':
+    'Build short actions that are easy to do between tasks.',
+  'exercises.insight.active': 'Active',
+  'exercises.insight.active.hint': 'Reminders currently running',
+  'exercises.insight.load': 'Load',
+  'exercises.insight.load.value': '{n} reps',
+  'exercises.insight.load.hint': 'Total reps in one full cycle',
+  'exercises.insight.goals': 'Goals',
+  'exercises.insight.goals.hint': 'Exercises with a daily target',
   'exercises.section.active': 'Active · {n}',
   'exercises.section.disabled': 'Disabled · {n}',
   'exercises.row.meta': '{reps} reps · {interval}',
@@ -459,7 +740,15 @@ export const en: Dict = {
   // Meals
   'meals.kicker': 'Eating schedule',
   'meals.title': 'Meals',
+  'meals.subtitle': 'Keep food on the schedule so the day stays steady.',
+  'meals.insight.active': 'Active',
+  'meals.insight.active.hint': 'Meals with enabled reminders',
+  'meals.insight.next': 'Next',
+  'meals.insight.next.hint': 'Closest time today',
+  'meals.insight.presets': 'Presets',
+  'meals.insight.presets.hint': 'Fast starter options',
   'meals.presets': 'Quick add',
+  'meals.schedule': 'Schedule',
   'meals.section.active': 'Active · {n}',
   'meals.section.disabled': 'Disabled · {n}',
   'meals.empty': 'No meals yet — add one or pick a preset',
@@ -499,6 +788,13 @@ export const en: Dict = {
   'challenges.title': 'Challenges',
   'challenges.subtitle': 'Reps = {formula}',
   'challenges.subtitle.formula': 'stat × multiplier',
+  'challenges.insight.active': 'Active',
+  'challenges.insight.active.hint': 'Rules that can add debt',
+  'challenges.insight.games': 'Games',
+  'challenges.insight.games.hint': 'Enabled game integrations',
+  'challenges.insight.debt': 'Debt test',
+  'challenges.insight.debt.value': '{n} reps',
+  'challenges.insight.debt.hint': 'If each rule catches 5 events',
   'challenges.warning.no_games':
     'Challenges trigger after a match. Connect a game in the Games tab.',
   'challenges.section.all': 'All · {n}',
@@ -524,6 +820,13 @@ export const en: Dict = {
   'games.subtitle': 'Connect a game — challenges fire right after the match',
   'games.subtitle.live': '{n} live',
   'games.section.supported': 'Supported',
+  'games.insight.supported': 'Support',
+  'games.insight.supported.hint': 'Games this app knows how to track',
+  'games.insight.connected': 'Connected',
+  'games.insight.connected.hint': 'Integrations with installed GSI',
+  'games.insight.live': 'Signal',
+  'games.insight.live.hint': 'Live or waiting for Steam restart',
+  'games.insight.queued': '{n} queued',
   'games.scanning': 'Scanning installed games…',
   'games.queued.body':
     'Steam is running. The {opt} option will be added automatically next time Steam closes.',
@@ -540,13 +843,38 @@ export const en: Dict = {
   // Settings
   'settings.kicker': 'Configuration',
   'settings.title': 'Settings',
+  'settings.insight.mode': 'Notifications',
+  'settings.insight.mode.hint': 'How the app talks about a break',
+  'settings.insight.theme': 'Theme',
+  'settings.insight.theme.hint': 'Visual interface mode',
+  'settings.insight.language': 'Language',
+  'settings.insight.language.hint': 'Applied without restart',
+  'settings.status.kicker': 'Status',
+  'settings.status.title.on': 'Reminders are running',
+  'settings.status.title.off': 'Reminders are paused',
+  'settings.status.hint.paused':
+    'Breaks will not appear until reminders are started again.',
+  'settings.status.hint.quiet':
+    'Reminders are running, but quiet hours {from}-{to} can hide them temporarily.',
+  'settings.status.hint.autostart':
+    'The app will not start automatically after reboot.',
+  'settings.status.hint.ready':
+    'The app will start with Windows and keep the break schedule moving.',
+  'settings.status.reminders': 'Reminders',
+  'settings.status.quiet': 'Quiet hours',
+  'settings.status.meetings': 'Meetings',
+  'settings.status.autostart': 'Windows',
+  'settings.status.on': 'On',
+  'settings.status.off': 'Off',
   'settings.section.reminders': 'Reminders',
   'settings.section.quiet': 'Quiet hours',
   'settings.section.window': 'Window & tray',
   'settings.section.appearance': 'Appearance',
   'settings.section.language': 'Language',
+  'settings.section.interface': 'Interface',
   'settings.section.updates': 'Updates',
   'settings.section.data': 'Data',
+  'settings.section.diagnostics': 'Diagnostics',
   'settings.data.export.label': 'Export everything',
   'settings.data.export.hint':
     'Save a backup of exercises, history, challenges and settings to a JSON file.',
@@ -561,6 +889,20 @@ export const en: Dict = {
     'All current exercises, history and settings will be replaced with the file contents. Continue?',
   'settings.data.import.ok': 'Restored',
   'settings.data.import.err': "Couldn't read the file — not our backup?",
+  'settings.diagnostics.app.label': 'Application',
+  'settings.diagnostics.data.label': 'Data',
+  'settings.diagnostics.data.legend': 'ex/meal/ch/hist',
+  'settings.diagnostics.gsi.label': 'Dota GSI',
+  'settings.diagnostics.hint':
+    'Technical snapshot without tokens: versions, paths, statuses and counts.',
+  'settings.diagnostics.loading': 'Loading…',
+  'settings.diagnostics.err': 'Could not collect diagnostics',
+  'settings.diagnostics.refresh': 'Refresh diagnostics',
+  'settings.diagnostics.copy.btn': 'Copy',
+  'settings.diagnostics.copy.ok': 'Diagnostics copied',
+  'settings.diagnostics.logs.btn': 'Logs',
+  'settings.diagnostics.logs.ok': 'Logs folder opened',
+  'settings.diagnostics.logs.err': 'Could not open logs folder',
   'settings.section.about': 'About',
   'settings.version.label': 'Version',
   'settings.version.hint': 'Currently installed app version.',
@@ -575,6 +917,8 @@ export const en: Dict = {
   'settings.notification_mode.modal': 'Window on top',
   'settings.notification_mode.toast': 'System notification',
   'settings.notification_mode.both': 'Window and notification',
+  'settings.global.label': 'Reminders enabled',
+  'settings.global.hint': 'Main operating mode for the app',
   'settings.sound.label': 'Notification sound',
   'settings.sound.hint': 'Short beep on trigger',
   'settings.voice.label': 'Voice prompt',
@@ -582,7 +926,7 @@ export const en: Dict = {
     'Speaks the exercise name and count — useful when your eyes are on the code.',
   'settings.meeting_pause.label': 'Pause during meetings',
   'settings.meeting_pause.hint':
-    'Skip reminders when Zoom / Teams / Discord / Webex / Slack-huddle is running.',
+    'Pause reminders when Zoom / Teams / Webex / Slack-huddle is running.',
   'settings.snooze.label': '“Snooze” for',
   'settings.snooze.hint': 'How many minutes to postpone',
   'settings.snooze.1': '1 minute',
@@ -627,9 +971,11 @@ export const en: Dict = {
   'updater.available.title': 'v{v} available',
   'updater.downloading.title': 'Downloading update',
   'updater.downloading.subtitle': '{got} / {total} MB · {speed} MB/s',
-  'updater.downloading.hint': 'You can close this window — download continues in the background.',
+  'updater.downloading.hint':
+    'You can close this window — download continues in the background.',
   'updater.downloaded.title': 'Ready · v{v}',
-  'updater.downloaded.subtitle': 'Click Restart — the app will reopen instantly in the new version.',
+  'updater.downloaded.subtitle':
+    'Click Restart — the app will reopen instantly in the new version.',
   'updater.error.title': 'Check failed',
   'updater.idle.title': 'Check for updates',
   'updater.idle.subtitle': 'Auto-check every hour',

src/renderer/src/lib/day-plan.test.ts

@@ -0,0 +1,135 @@
+import { describe, expect, it } from 'vitest'
+import type { Exercise, HistoryEntry, Meal } from '@shared/types'
+import { computeTodayPlan } from './day-plan'
+
+const NOW = new Date(2026, 5, 6, 12, 0, 0, 0).getTime()
+const HOUR = 60 * 60 * 1000
+const DAY = 24 * HOUR
+
+function exercise(partial: Partial<Exercise> & { id: string }): Exercise {
+  return {
+    id: partial.id,
+    name: partial.name ?? partial.id,
+    reps: partial.reps ?? 10,
+    icon: partial.icon ?? 'Activity',
+    intervalMinutes: partial.intervalMinutes ?? 30,
+    enabled: partial.enabled ?? true,
+    nextFireAt: partial.nextFireAt ?? NOW + HOUR,
+    category: partial.category,
+    dailyGoal: partial.dailyGoal,
+    adaptive: partial.adaptive
+  }
+}
+
+function meal(partial: Partial<Meal> & { id: string }): Meal {
+  return {
+    id: partial.id,
+    name: partial.name ?? partial.id,
+    time: partial.time ?? '13:00',
+    icon: partial.icon ?? 'UtensilsCrossed',
+    enabled: partial.enabled ?? true,
+    days: partial.days ?? [],
+    nextFireAt: partial.nextFireAt ?? NOW + HOUR
+  }
+}
+
+function done(
+  exerciseId: string,
+  ts = NOW,
+  reps?: number,
+  actualReps?: number
+): HistoryEntry {
+  const entry: HistoryEntry = { exerciseId, ts, action: 'done' }
+  if (reps !== undefined) entry.reps = reps
+  if (actualReps !== undefined) entry.actualReps = actualReps
+  return entry
+}
+
+describe('computeTodayPlan', () => {
+  it('summarises daily goals and puts due exercises first', () => {
+    const plan = computeTodayPlan({
+      now: NOW,
+      exercises: [
+        exercise({ id: 'pushups', dailyGoal: 30, nextFireAt: NOW - 1 }),
+        exercise({ id: 'water', dailyGoal: 2, reps: 1, nextFireAt: NOW + HOUR })
+      ],
+      meals: [meal({ id: 'lunch', nextFireAt: NOW + 30 * 60_000 })],
+      history: [done('pushups', NOW - HOUR, 10)]
+    })
+
+    expect(plan.goalDone).toBe(10)
+    expect(plan.goalTarget).toBe(32)
+    expect(plan.goalRemaining).toBe(22)
+    expect(plan.dueCount).toBe(1)
+    expect(plan.nextItem?.id).toBe('pushups')
+    expect(plan.nextItem?.due).toBe(true)
+  })
+
+  it('removes completed daily goals from the action list', () => {
+    const plan = computeTodayPlan({
+      now: NOW,
+      exercises: [
+        exercise({ id: 'squats', dailyGoal: 20, nextFireAt: NOW - HOUR })
+      ],
+      meals: [],
+      history: [done('squats', NOW - HOUR, 20)]
+    })
+
+    expect(plan.goalRemaining).toBe(0)
+    expect(plan.items).toHaveLength(0)
+    expect(plan.nextItem).toBeUndefined()
+  })
+
+  it('tracks meal completion via meal history entries', () => {
+    const plan = computeTodayPlan({
+      now: NOW,
+      exercises: [],
+      meals: [
+        meal({ id: 'breakfast', nextFireAt: NOW - HOUR }),
+        meal({ id: 'lunch', nextFireAt: NOW + HOUR })
+      ],
+      history: [done('meal:breakfast', NOW - 2 * HOUR, 1)]
+    })
+
+    expect(plan.enabledMeals).toBe(2)
+    expect(plan.doneMeals).toBe(1)
+    expect(plan.remainingMeals).toBe(1)
+    expect(plan.items.map((item) => item.id)).toEqual(['lunch'])
+  })
+
+  it('enters recovery mode after two inactive days', () => {
+    const plan = computeTodayPlan({
+      now: NOW,
+      exercises: [exercise({ id: 'a' })],
+      meals: [],
+      history: [done('a', NOW - 3 * DAY)]
+    })
+
+    expect(plan.recovery).toEqual({ kind: 'recovery', daysSinceDone: 3 })
+  })
+
+  it('uses first-run state when no done history exists', () => {
+    const plan = computeTodayPlan({
+      now: NOW,
+      exercises: [exercise({ id: 'a' })],
+      meals: [],
+      history: []
+    })
+
+    expect(plan.recovery).toEqual({ kind: 'first-run' })
+  })
+
+  it('ignores disabled exercises and meals', () => {
+    const plan = computeTodayPlan({
+      now: NOW,
+      exercises: [exercise({ id: 'a', enabled: false, dailyGoal: 100 })],
+      meals: [meal({ id: 'm', enabled: false })],
+      history: []
+    })
+
+    expect(plan.enabledExercises).toBe(0)
+    expect(plan.enabledMeals).toBe(0)
+    expect(plan.goalTarget).toBe(0)
+    expect(plan.items).toHaveLength(0)
+  })
+})

src/renderer/src/lib/day-plan.ts

@@ -0,0 +1,187 @@
+import type {
+  Exercise,
+  HistoryEntry,
+  Meal,
+  ReminderCategory
+} from '@shared/types'
+import { dayKey } from './history'
+
+export type PlanItemKind = 'exercise' | 'meal'
+
+export type PlanItem = {
+  kind: PlanItemKind
+  id: string
+  name: string
+  icon: string
+  nextFireAt: number
+  due: boolean
+  doneToday: boolean
+  category?: ReminderCategory
+  reps?: number
+  goal?: number
+  doneReps?: number
+  remainingReps?: number
+  time?: string
+}
+
+export type RecoveryState =
+  | { kind: 'first-run' }
+  | { kind: 'recovery'; daysSinceDone: number }
+  | { kind: 'steady'; daysSinceDone: number | null }
+
+export type TodayPlan = {
+  goalDone: number
+  goalTarget: number
+  goalRemaining: number
+  enabledExercises: number
+  enabledMeals: number
+  doneMeals: number
+  remainingMeals: number
+  dueCount: number
+  items: PlanItem[]
+  nextItem?: PlanItem
+  recovery: RecoveryState
+}
+
+function localDayOrdinal(ts: number): number {
+  const d = new Date(ts)
+  return Math.floor(
+    Date.UTC(d.getFullYear(), d.getMonth(), d.getDate()) / 86_400_000
+  )
+}
+
+function doneRepsForExercise(
+  entries: HistoryEntry[],
+  exercise: Exercise,
+  today: string
+): number {
+  let sum = 0
+  for (const e of entries) {
+    if (e.action !== 'done') continue
+    if (e.exerciseId !== exercise.id) continue
+    if (dayKey(e.ts) !== today) continue
+    sum += e.actualReps ?? e.reps ?? exercise.reps
+  }
+  return sum
+}
+
+function mealDoneToday(
+  entries: HistoryEntry[],
+  meal: Meal,
+  today: string
+): boolean {
+  const id = `meal:${meal.id}`
+  return entries.some(
+    (e) => e.action === 'done' && e.exerciseId === id && dayKey(e.ts) === today
+  )
+}
+
+function computeRecovery(entries: HistoryEntry[], now: number): RecoveryState {
+  const latestDone = entries
+    .filter((e) => e.action === 'done' && e.ts <= now)
+    .reduce<number | null>((latest, e) => {
+      if (latest === null) return e.ts
+      return e.ts > latest ? e.ts : latest
+    }, null)
+
+  if (latestDone === null) return { kind: 'first-run' }
+
+  const daysSinceDone = Math.max(
+    0,
+    localDayOrdinal(now) - localDayOrdinal(latestDone)
+  )
+  return daysSinceDone >= 2
+    ? { kind: 'recovery', daysSinceDone }
+    : { kind: 'steady', daysSinceDone }
+}
+
+function sortPlanItems(a: PlanItem, b: PlanItem): number {
+  if (a.due !== b.due) return a.due ? -1 : 1
+  if (a.nextFireAt !== b.nextFireAt) return a.nextFireAt - b.nextFireAt
+  if (a.kind !== b.kind) return a.kind === 'exercise' ? -1 : 1
+  return a.name.localeCompare(b.name)
+}
+
+export function computeTodayPlan({
+  exercises,
+  meals,
+  history,
+  now = Date.now()
+}: {
+  exercises: Exercise[]
+  meals: Meal[]
+  history: HistoryEntry[]
+  now?: number
+}): TodayPlan {
+  const today = dayKey(now)
+  const enabledExercises = exercises.filter((e) => e.enabled)
+  const enabledMeals = meals.filter((m) => m.enabled)
+
+  let goalDone = 0
+  let goalTarget = 0
+
+  const exerciseItems = enabledExercises
+    .map<PlanItem>((exercise) => {
+      const doneReps = doneRepsForExercise(history, exercise, today)
+      const goal =
+        exercise.dailyGoal !== undefined && exercise.dailyGoal > 0
+          ? exercise.dailyGoal
+          : undefined
+      const remainingReps =
+        goal !== undefined ? Math.max(0, goal - doneReps) : undefined
+      const complete = goal !== undefined && remainingReps === 0
+
+      if (goal !== undefined) {
+        goalTarget += goal
+        goalDone += Math.min(doneReps, goal)
+      }
+
+      return {
+        kind: 'exercise',
+        id: exercise.id,
+        name: exercise.name,
+        icon: exercise.icon,
+        category: exercise.category ?? 'exercise',
+        reps: exercise.reps,
+        goal,
+        doneReps,
+        remainingReps,
+        doneToday: doneReps > 0,
+        due: !complete && exercise.nextFireAt <= now,
+        nextFireAt: exercise.nextFireAt
+      }
+    })
+    .filter((item) => item.remainingReps !== 0)
+
+  const mealItems = enabledMeals
+    .map<PlanItem>((meal) => {
+      const doneToday = mealDoneToday(history, meal, today)
+      return {
+        kind: 'meal',
+        id: meal.id,
+        name: meal.name,
+        icon: meal.icon,
+        time: meal.time,
+        doneToday,
+        due: !doneToday && meal.nextFireAt <= now,
+        nextFireAt: meal.nextFireAt
+      }
+    })
+    .filter((item) => !item.doneToday)
+
+  const items = [...exerciseItems, ...mealItems].sort(sortPlanItems)
+
+  return {
+    goalDone,
+    goalTarget,
+    goalRemaining: Math.max(0, goalTarget - goalDone),
+    enabledExercises: enabledExercises.length,
+    enabledMeals: enabledMeals.length,
+    doneMeals: enabledMeals.length - mealItems.length,
+    remainingMeals: mealItems.length,
+    dueCount: items.filter((item) => item.due).length,
+    items,
+    nextItem: items[0],
+    recovery: computeRecovery(history, now)
+  }
+}

src/renderer/src/lib/dev-api.ts

@@ -0,0 +1,597 @@
+import {
+  DEFAULT_SETTINGS,
+  nextMealOccurrence,
+  type AppState,
+  type Challenge,
+  type DiagnosticsInfo,
+  type Exercise,
+  type GameId,
+  type GameStatus,
+  type HistoryEntry,
+  type Meal,
+  type RendererErrorReport,
+  type Settings,
+  type Tick,
+  type UpdaterStatus
+} from '@shared/types'
+
+type Api = Window['api']
+type Handler<T> = (payload: T) => void
+
+const now = Date.now()
+
+let state: AppState = {
+  exercises: [
+    {
+      id: 'dev-ex-squats',
+      name: 'Приседания',
+      reps: 10,
+      icon: 'Activity',
+      intervalMinutes: 30,
+      enabled: true,
+      nextFireAt: now - 90_000,
+      lastDoneAt: now - 2 * 60 * 60 * 1000,
+      category: 'exercise',
+      dailyGoal: 40,
+      adaptive: true
+    },
+    {
+      id: 'dev-ex-eyes',
+      name: 'Отдых глазам 20-20-20',
+      reps: 1,
+      icon: 'Eye',
+      intervalMinutes: 20,
+      enabled: true,
+      nextFireAt: now + 9 * 60_000,
+      category: 'eyes'
+    },
+    {
+      id: 'dev-ex-water',
+      name: 'Стакан воды',
+      reps: 1,
+      icon: 'GlassWater',
+      intervalMinutes: 60,
+      enabled: true,
+      nextFireAt: now + 26 * 60_000,
+      category: 'hydration',
+      dailyGoal: 6
+    },
+    {
+      id: 'dev-ex-posture',
+      name: 'Проверь осанку',
+      reps: 1,
+      icon: 'PersonStanding',
+      intervalMinutes: 25,
+      enabled: false,
+      nextFireAt: now + 25 * 60_000,
+      category: 'posture'
+    }
+  ],
+  meals: [
+    {
+      id: 'dev-meal-breakfast',
+      name: 'Завтрак',
+      time: '08:00',
+      icon: 'Coffee',
+      enabled: true,
+      days: [],
+      nextFireAt: nextMealOccurrence('08:00', [], now),
+      lastDoneAt: now - 5 * 60 * 60 * 1000
+    },
+    {
+      id: 'dev-meal-lunch',
+      name: 'Обед',
+      time: '13:00',
+      icon: 'UtensilsCrossed',
+      enabled: true,
+      days: [],
+      nextFireAt: nextMealOccurrence('13:00', [], now)
+    },
+    {
+      id: 'dev-meal-dinner',
+      name: 'Ужин',
+      time: '19:00',
+      icon: 'Soup',
+      enabled: false,
+      days: [],
+      nextFireAt: nextMealOccurrence('19:00', [], now)
+    }
+  ],
+  settings: {
+    ...DEFAULT_SETTINGS,
+    lastSeenVersion: '0.6.5'
+  },
+  challenges: [
+    {
+      id: 'dev-ch-deaths',
+      name: 'За смерти в Dota',
+      gameId: 'dota2',
+      stat: 'deaths',
+      multiplier: 3,
+      exerciseName: 'Приседания',
+      icon: 'Activity',
+      enabled: true
+    },
+    {
+      id: 'dev-ch-kills',
+      name: 'За убийства',
+      gameId: 'dota2',
+      stat: 'kills',
+      multiplier: 1,
+      exerciseName: 'Отжимания',
+      icon: 'Dumbbell',
+      enabled: false
+    }
+  ],
+  gamesEnabled: { dota2: true }
+}
+
+let history: HistoryEntry[] = [
+  {
+    ts: now - 2 * 60 * 60 * 1000,
+    exerciseId: 'dev-ex-squats',
+    action: 'done',
+    reps: 10,
+    name: 'Приседания',
+    source: 'reminder'
+  },
+  {
+    ts: now - 5 * 60 * 60 * 1000,
+    exerciseId: 'meal:dev-meal-breakfast',
+    action: 'done',
+    reps: 1,
+    name: 'Завтрак',
+    source: 'meal'
+  },
+  {
+    ts: now - 26 * 60 * 60 * 1000,
+    exerciseId: 'dev-ex-eyes',
+    action: 'done',
+    reps: 1,
+    name: 'Отдых глазам 20-20-20',
+    source: 'reminder'
+  },
+  {
+    ts: now - 48 * 60 * 60 * 1000,
+    exerciseId: 'dev-ex-squats',
+    action: 'done',
+    reps: 10,
+    name: 'Приседания',
+    source: 'reminder'
+  }
+]
+
+let games: GameStatus[] = [
+  {
+    id: 'dota2',
+    name: 'Dota 2',
+    installed: true,
+    installPath:
+      'C:\\Program Files (x86)\\Steam\\steamapps\\common\\dota 2 beta',
+    integrationActive: false,
+    launchOption: '-gamestateintegration',
+    launchOptionStatus: 'queued',
+    steamRunning: true,
+    enabled: true
+  }
+]
+
+let updaterStatus: UpdaterStatus = {
+  kind: 'not-available',
+  currentVersion: '0.6.5',
+  lastCheckedAt: now - 12 * 60_000
+}
+
+const stateHandlers = new Set<Handler<AppState>>()
+const tickHandlers = new Set<Handler<Tick[]>>()
+const historyHandlers = new Set<Handler<void>>()
+const gamesHandlers = new Set<Handler<GameStatus[]>>()
+const updaterHandlers = new Set<Handler<UpdaterStatus>>()
+const themeHandlers = new Set<Handler<'light' | 'dark'>>()
+const emptyUnsub = (): void => undefined
+let tickTimer: number | undefined
+
+function cloneState(): AppState {
+  return structuredClone(state)
+}
+
+function emitState(): void {
+  const snapshot = cloneState()
+  stateHandlers.forEach((handler) => handler(snapshot))
+}
+
+function emitHistory(): void {
+  historyHandlers.forEach((handler) => handler())
+}
+
+function emitGames(): void {
+  const snapshot = structuredClone(games)
+  gamesHandlers.forEach((handler) => handler(snapshot))
+}
+
+function emitUpdater(): void {
+  updaterHandlers.forEach((handler) => handler(updaterStatus))
+}
+
+function pushHistory(entry: HistoryEntry): void {
+  history = [entry, ...history]
+  emitHistory()
+}
+
+function findExercise(id: string): Exercise {
+  const exercise = state.exercises.find((item) => item.id === id)
+  if (!exercise) throw new Error(`Unknown exercise ${id}`)
+  return exercise
+}
+
+function findMeal(id: string): Meal {
+  const meal = state.meals.find((item) => item.id === id)
+  if (!meal) throw new Error(`Unknown meal ${id}`)
+  return meal
+}
+
+function nextId(prefix: string): string {
+  return `${prefix}-${Math.random().toString(36).slice(2, 9)}`
+}
+
+function subscribe<T>(set: Set<Handler<T>>, handler: Handler<T>): () => void {
+  set.add(handler)
+  return () => set.delete(handler)
+}
+
+function buildTicks(): Tick[] {
+  return state.exercises.map((exercise) => ({
+    exerciseId: exercise.id,
+    enabled: exercise.enabled,
+    msUntilFire: exercise.nextFireAt - Date.now()
+  }))
+}
+
+if (import.meta.hot) {
+  import.meta.hot.dispose(() => {
+    if (tickTimer !== undefined) window.clearInterval(tickTimer)
+  })
+}
+
+export function installDevApi(): void {
+  if (window.api || !import.meta.env.DEV) return
+
+  const api: Api = {
+    getState: async () => cloneState(),
+    addExercise: async (input) => {
+      const exercise: Exercise = {
+        ...input,
+        id: nextId('dev-ex'),
+        nextFireAt: Date.now() + input.intervalMinutes * 60_000
+      }
+      state = { ...state, exercises: [...state.exercises, exercise] }
+      emitState()
+      return structuredClone(exercise)
+    },
+    updateExercise: async (id, patch) => {
+      let updated = findExercise(id)
+      state = {
+        ...state,
+        exercises: state.exercises.map((exercise) => {
+          if (exercise.id !== id) return exercise
+          updated = { ...exercise, ...patch, id }
+          return updated
+        })
+      }
+      emitState()
+      return structuredClone(updated)
+    },
+    deleteExercise: async (id) => {
+      const before = state.exercises.length
+      state = {
+        ...state,
+        exercises: state.exercises.filter((exercise) => exercise.id !== id)
+      }
+      emitState()
+      return state.exercises.length !== before
+    },
+    toggleExercise: async (id, enabled) => {
+      return api.updateExercise(id, { enabled })
+    },
+    markDone: async (id, actualReps) => {
+      const exercise = findExercise(id)
+      const updated = await api.updateExercise(id, {
+        lastDoneAt: Date.now(),
+        nextFireAt: Date.now() + exercise.intervalMinutes * 60_000
+      })
+      pushHistory({
+        ts: Date.now(),
+        exerciseId: id,
+        action: 'done',
+        actualReps,
+        reps: exercise.reps,
+        name: exercise.name,
+        source: 'reminder'
+      })
+      return updated
+    },
+    snooze: async (id, minutes) => {
+      return api.updateExercise(id, {
+        nextFireAt: Date.now() + minutes * 60_000
+      })
+    },
+    skip: async (id) => {
+      const exercise = findExercise(id)
+      const updated = await api.updateExercise(id, {
+        nextFireAt: Date.now() + exercise.intervalMinutes * 60_000
+      })
+      pushHistory({
+        ts: Date.now(),
+        exerciseId: id,
+        action: 'skip',
+        reps: exercise.reps,
+        name: exercise.name,
+        source: 'reminder'
+      })
+      return updated
+    },
+    addMeal: async (input) => {
+      const meal: Meal = {
+        ...input,
+        id: nextId('dev-meal'),
+        nextFireAt: nextMealOccurrence(input.time, input.days, Date.now())
+      }
+      state = { ...state, meals: [...state.meals, meal] }
+      emitState()
+      return structuredClone(meal)
+    },
+    updateMeal: async (id, patch) => {
+      let updated = findMeal(id)
+      state = {
+        ...state,
+        meals: state.meals.map((meal) => {
+          if (meal.id !== id) return meal
+          updated = { ...meal, ...patch, id }
+          if (
+            (patch.time !== undefined ||
+              patch.days !== undefined ||
+              patch.enabled !== undefined) &&
+            patch.nextFireAt === undefined
+          ) {
+            updated.nextFireAt = nextMealOccurrence(
+              updated.time,
+              updated.days,
+              Date.now()
+            )
+          }
+          return updated
+        })
+      }
+      emitState()
+      return structuredClone(updated)
+    },
+    deleteMeal: async (id) => {
+      const before = state.meals.length
+      state = { ...state, meals: state.meals.filter((meal) => meal.id !== id) }
+      emitState()
+      return state.meals.length !== before
+    },
+    toggleMeal: async (id, enabled) => api.updateMeal(id, { enabled }),
+    markMealDone: async (id) => {
+      const meal = findMeal(id)
+      const updated = await api.updateMeal(id, {
+        lastDoneAt: Date.now(),
+        nextFireAt: nextMealOccurrence(meal.time, meal.days, Date.now())
+      })
+      pushHistory({
+        ts: Date.now(),
+        exerciseId: `meal:${id}`,
+        action: 'done',
+        reps: 1,
+        name: meal.name,
+        source: 'meal'
+      })
+      return updated
+    },
+    updateSettings: async (patch: Partial<Settings>) => {
+      state = { ...state, settings: { ...state.settings, ...patch } }
+      if (patch.theme === 'light' || patch.theme === 'dark') {
+        themeHandlers.forEach((handler) =>
+          handler(patch.theme as 'light' | 'dark')
+        )
+      }
+      emitState()
+      return structuredClone(state.settings)
+    },
+    getAccentColor: async () => '#ff6b35',
+    getOsTheme: async () => 'light',
+    getAppVersion: async () => '0.6.5',
+    getMeetingActive: async () => false,
+    getDiagnostics: async () => diagnostics(),
+    openLogsFolder: async () => ({ ok: true }),
+    copyDiagnostics: async () => diagnostics(),
+    reportRendererError: async (report: RendererErrorReport) => {
+      console.warn('[dev-api] renderer error', report)
+      return true
+    },
+    pauseAll: async () => {
+      await api.updateSettings({ globalEnabled: false })
+    },
+    resumeAll: async () => {
+      await api.updateSettings({ globalEnabled: true })
+    },
+    quit: async () => undefined,
+    reminderClose: async () => undefined,
+    minimizeMain: () => undefined,
+    toggleMaximizeMain: () => undefined,
+    isMaximizedMain: async () => false,
+    closeMain: () => undefined,
+    hideMain: () => undefined,
+    listGames: async () => structuredClone(games),
+    installGame: async (id: GameId) => {
+      games = games.map((game) =>
+        game.id === id
+          ? {
+              ...game,
+              enabled: true,
+              integrationActive: true,
+              launchOptionStatus: 'applied'
+            }
+          : game
+      )
+      emitGames()
+      return structuredClone(games.find((game) => game.id === id)!)
+    },
+    uninstallGame: async (id: GameId) => {
+      games = games.map((game) =>
+        game.id === id
+          ? { ...game, enabled: false, integrationActive: false }
+          : game
+      )
+      emitGames()
+      return structuredClone(games.find((game) => game.id === id)!)
+    },
+    toggleGame: async (id, enabled) => {
+      games = games.map((game) =>
+        game.id === id ? { ...game, enabled } : game
+      )
+      state = {
+        ...state,
+        gamesEnabled: { ...state.gamesEnabled, [id]: enabled }
+      }
+      emitGames()
+      emitState()
+    },
+    openGameLaunchOptions: async () => undefined,
+    addChallenge: async (input) => {
+      const challenge: Challenge = { ...input, id: nextId('dev-ch') }
+      state = { ...state, challenges: [...state.challenges, challenge] }
+      emitState()
+      return structuredClone(challenge)
+    },
+    updateChallenge: async (id, patch) => {
+      let updated = state.challenges.find((challenge) => challenge.id === id)
+      if (!updated) throw new Error(`Unknown challenge ${id}`)
+      state = {
+        ...state,
+        challenges: state.challenges.map((challenge) => {
+          if (challenge.id !== id) return challenge
+          updated = { ...challenge, ...patch, id }
+          return updated
+        })
+      }
+      emitState()
+      return structuredClone(updated)
+    },
+    deleteChallenge: async (id) => {
+      const before = state.challenges.length
+      state = {
+        ...state,
+        challenges: state.challenges.filter((challenge) => challenge.id !== id)
+      }
+      emitState()
+      return state.challenges.length !== before
+    },
+    toggleChallenge: async (id, enabled) => {
+      return api.updateChallenge(id, { enabled })
+    },
+    markChallengeDone: async (id, reps) => {
+      const challenge = state.challenges.find((item) => item.id === id)
+      pushHistory({
+        ts: Date.now(),
+        exerciseId: `challenge:${id}`,
+        action: 'done',
+        actualReps: reps,
+        reps,
+        name: challenge?.exerciseName ?? challenge?.name,
+        source: 'match'
+      })
+      return true
+    },
+    closeMatchSummary: async () => undefined,
+    simulateMatchEnd: async () => undefined,
+    updaterStatus: async () => updaterStatus,
+    updaterCheck: async () => {
+      updaterStatus = {
+        kind: 'not-available',
+        currentVersion: '0.6.5',
+        lastCheckedAt: Date.now()
+      }
+      emitUpdater()
+      return updaterStatus
+    },
+    updaterDownload: () => undefined,
+    updaterInstall: () => undefined,
+    getHistory: async (sinceMs) =>
+      structuredClone(
+        sinceMs === undefined
+          ? history
+          : history.filter((entry) => entry.ts >= sinceMs)
+      ),
+    clearHistory: async (beforeTs) => {
+      const before = history.length
+      history =
+        beforeTs === undefined
+          ? history
+          : history.filter((entry) => entry.ts >= beforeTs)
+      emitHistory()
+      return before - history.length
+    },
+    exportState: async () => ({
+      ok: true,
+      canceled: false,
+      path: 'C:\\Users\\Demo\\Desktop\\razomnis-backup.json'
+    }),
+    importState: async () => ({ ok: true, canceled: false }),
+    onTick: (handler) => subscribe(tickHandlers, handler),
+    onFire: () => emptyUnsub,
+    onFireMeal: () => emptyUnsub,
+    onMatchEnd: () => emptyUnsub,
+    onStateChanged: (handler) => subscribe(stateHandlers, handler),
+    onThemeChanged: (handler) => subscribe(themeHandlers, handler),
+    onAccentChanged: () => emptyUnsub,
+    onGamesChanged: (handler) => subscribe(gamesHandlers, handler),
+    onUpdaterStatus: (handler) => subscribe(updaterHandlers, handler),
+    onMaximizeChanged: () => emptyUnsub,
+    onMeetingChanged: () => emptyUnsub,
+    onHistoryChanged: (handler) => subscribe(historyHandlers, handler)
+  }
+
+  window.api = api
+  tickTimer = window.setInterval(() => {
+    const ticks = buildTicks()
+    tickHandlers.forEach((handler) => handler(ticks))
+  }, 1000)
+}
+
+function diagnostics(): DiagnosticsInfo {
+  return {
+    generatedAt: Date.now(),
+    app: {
+      version: '0.6.5',
+      isPackaged: false,
+      platform: 'win32',
+      arch: 'x64'
+    },
+    runtime: {
+      electron: 'dev',
+      chrome: 'dev',
+      node: 'dev'
+    },
+    paths: {
+      userData: 'dev-renderer',
+      store: 'dev-renderer',
+      logs: 'dev-renderer'
+    },
+    store: {
+      bytes: null,
+      exercises: state.exercises.length,
+      meals: state.meals.length,
+      challenges: state.challenges.length,
+      history: history.length
+    },
+    updater: updaterStatus,
+    games,
+    gsi: {
+      running: games.some((game) => game.integrationActive),
+      port: 38087,
+      baseUrl: 'http://127.0.0.1:38087'
+    },
+    meetingActive: false
+  }
+}

src/renderer/src/lib/momentum.test.ts

@@ -0,0 +1,112 @@
+import { describe, expect, it } from 'vitest'
+import type { Challenge, Exercise, HistoryEntry } from '@shared/types'
+import { computeMomentumSummary } from './momentum'
+
+const NOW = new Date(2026, 5, 10, 12, 0, 0, 0).getTime()
+const DAY = 24 * 60 * 60 * 1000
+
+function exercise(partial: Partial<Exercise> & { id: string }): Exercise {
+  return {
+    id: partial.id,
+    name: partial.name ?? partial.id,
+    reps: partial.reps ?? 10,
+    icon: partial.icon ?? 'Activity',
+    intervalMinutes: partial.intervalMinutes ?? 30,
+    enabled: partial.enabled ?? true,
+    nextFireAt: partial.nextFireAt ?? NOW + 60_000,
+    category: partial.category,
+    dailyGoal: partial.dailyGoal,
+    adaptive: partial.adaptive
+  }
+}
+
+function challenge(partial: Partial<Challenge> & { id: string }): Challenge {
+  return {
+    id: partial.id,
+    name: partial.name ?? partial.id,
+    gameId: 'dota2',
+    stat: partial.stat ?? 'deaths',
+    multiplier: partial.multiplier ?? 3,
+    exerciseName: partial.exerciseName ?? 'Squats',
+    icon: partial.icon ?? 'Dumbbell',
+    enabled: partial.enabled ?? true
+  }
+}
+
+function done(
+  exerciseId: string,
+  daysAgo: number,
+  reps: number,
+  source?: HistoryEntry['source']
+): HistoryEntry {
+  return {
+    exerciseId,
+    ts: NOW - daysAgo * DAY,
+    action: 'done',
+    reps,
+    source
+  }
+}
+
+describe('computeMomentumSummary', () => {
+  it('tracks weekly quests and match debt from history', () => {
+    const summary = computeMomentumSummary({
+      now: NOW,
+      exercises: [exercise({ id: 'pushups', reps: 15 })],
+      challenges: [challenge({ id: 'c1' })],
+      history: [
+        done('pushups', 0, 15),
+        done('pushups', 1, 20),
+        done('pushups', 2, 25),
+        done('challenge:c1', 0, 30, 'match'),
+        done('challenge:c1', 2, 45, 'match')
+      ]
+    })
+
+    expect(summary.todayReps).toBe(45)
+    expect(summary.weekReps).toBe(135)
+    expect(summary.weekActiveDays).toBe(3)
+    expect(summary.gameDebt.matchEntriesToday).toBe(1)
+    expect(summary.gameDebt.matchEntriesWeek).toBe(2)
+    expect(summary.gameDebt.matchRepsWeek).toBe(75)
+    expect(summary.weeklyQuests.map((quest) => quest.id)).toEqual([
+      'week_rhythm',
+      'week_reps',
+      'match_debt',
+      'today_anchor'
+    ])
+  })
+
+  it('hides match quest when there are no enabled challenge rules', () => {
+    const summary = computeMomentumSummary({
+      now: NOW,
+      exercises: [exercise({ id: 'pushups' })],
+      challenges: [challenge({ id: 'c1', enabled: false })],
+      history: [done('pushups', 0, 10)]
+    })
+
+    expect(summary.gameDebt.activeRules).toBe(0)
+    expect(summary.weeklyQuests.map((quest) => quest.id)).toEqual([
+      'week_rhythm',
+      'week_reps',
+      'today_anchor'
+    ])
+  })
+
+  it('computes a soft level from reps, active days and match activity', () => {
+    const summary = computeMomentumSummary({
+      now: NOW,
+      exercises: [exercise({ id: 'pushups' })],
+      challenges: [challenge({ id: 'c1' })],
+      history: [
+        done('pushups', 0, 100),
+        done('pushups', 1, 100),
+        done('challenge:c1', 0, 100, 'match')
+      ]
+    })
+
+    expect(summary.level.xp).toBe(425)
+    expect(summary.level.key).toBe('momentum.level.rhythm')
+    expect(summary.level.progressPct).toBeGreaterThan(0)
+  })
+})

src/renderer/src/lib/momentum.ts

@@ -0,0 +1,216 @@
+import type { Challenge, Exercise, HistoryEntry } from '@shared/types'
+import { dayKey } from './history'
+
+export type MomentumLevel = {
+  key: string
+  xp: number
+  levelIndex: number
+  current: number
+  target: number
+  progressPct: number
+  nextKey?: string
+}
+
+export type WeeklyQuest = {
+  id: 'week_rhythm' | 'week_reps' | 'match_debt' | 'today_anchor'
+  titleKey: string
+  descKey: string
+  current: number
+  target: number
+  progressPct: number
+  complete: boolean
+  tone: 'accent' | 'success' | 'warning' | 'info'
+}
+
+export type GameDebtSummary = {
+  activeRules: number
+  matchRepsToday: number
+  matchRepsWeek: number
+  matchEntriesToday: number
+  matchEntriesWeek: number
+  lastMatchAt?: number
+}
+
+export type MomentumSummary = {
+  level: MomentumLevel
+  weeklyQuests: WeeklyQuest[]
+  gameDebt: GameDebtSummary
+  weekReps: number
+  weekActiveDays: number
+  todayReps: number
+}
+
+const LEVELS = [
+  { key: 'momentum.level.warmup', xp: 0 },
+  { key: 'momentum.level.rhythm', xp: 120 },
+  { key: 'momentum.level.steady', xp: 450 },
+  { key: 'momentum.level.back', xp: 1000 },
+  { key: 'momentum.level.machine', xp: 2500 },
+  { key: 'momentum.level.legend', xp: 6000 }
+] as const
+
+function startOfDay(ts: number): Date {
+  const d = new Date(ts)
+  d.setHours(0, 0, 0, 0)
+  return d
+}
+
+function startOfWeek(ts: number): Date {
+  const d = startOfDay(ts)
+  const day = d.getDay()
+  const delta = day === 0 ? -6 : 1 - day
+  d.setDate(d.getDate() + delta)
+  return d
+}
+
+function entryReps(
+  entry: HistoryEntry,
+  exercisesById: Map<string, Exercise>
+): number {
+  return (
+    entry.actualReps ??
+    entry.reps ??
+    exercisesById.get(entry.exerciseId)?.reps ??
+    0
+  )
+}
+
+function isMatchEntry(entry: HistoryEntry): boolean {
+  return entry.source === 'match' || entry.exerciseId.startsWith('challenge:')
+}
+
+function computeLevel(xp: number): MomentumLevel {
+  let index = 0
+  for (let i = 0; i < LEVELS.length; i++) {
+    if (xp >= LEVELS[i].xp) index = i
+  }
+
+  const currentLevel = LEVELS[index]
+  const nextLevel = LEVELS[index + 1]
+  const current = Math.max(0, xp - currentLevel.xp)
+  const target = nextLevel ? nextLevel.xp - currentLevel.xp : current || 1
+  const progressPct = nextLevel
+    ? Math.min(100, Math.round((current / target) * 100))
+    : 100
+
+  return {
+    key: currentLevel.key,
+    xp,
+    levelIndex: index + 1,
+    current,
+    target,
+    progressPct,
+    nextKey: nextLevel?.key
+  }
+}
+
+function quest(
+  id: WeeklyQuest['id'],
+  current: number,
+  target: number,
+  tone: WeeklyQuest['tone']
+): WeeklyQuest {
+  return {
+    id,
+    titleKey: `momentum.quest.${id}.title`,
+    descKey: `momentum.quest.${id}.desc`,
+    current,
+    target,
+    progressPct: Math.min(100, Math.round((current / target) * 100)),
+    complete: current >= target,
+    tone
+  }
+}
+
+export function computeMomentumSummary({
+  history,
+  exercises,
+  challenges,
+  now = Date.now()
+}: {
+  history: HistoryEntry[]
+  exercises: Exercise[]
+  challenges: Challenge[]
+  now?: number
+}): MomentumSummary {
+  const exercisesById = new Map(
+    exercises.map((exercise) => [exercise.id, exercise])
+  )
+  const today = dayKey(now)
+  const weekStart = startOfWeek(now).getTime()
+
+  let totalReps = 0
+  let todayReps = 0
+  let weekReps = 0
+  let matchRepsToday = 0
+  let matchRepsWeek = 0
+  let matchEntriesToday = 0
+  let matchEntriesWeek = 0
+  let lastMatchAt: number | undefined
+  const allActiveDays = new Set<string>()
+  const weekActiveDays = new Set<string>()
+
+  for (const entry of history) {
+    if (entry.action !== 'done') continue
+
+    const reps = entryReps(entry, exercisesById)
+    const key = dayKey(entry.ts)
+    const inWeek = entry.ts >= weekStart && entry.ts <= now
+    const match = isMatchEntry(entry)
+
+    totalReps += reps
+    allActiveDays.add(key)
+
+    if (key === today) todayReps += reps
+    if (inWeek) {
+      weekReps += reps
+      weekActiveDays.add(key)
+    }
+
+    if (match) {
+      if (lastMatchAt === undefined || entry.ts > lastMatchAt) {
+        lastMatchAt = entry.ts
+      }
+      if (key === today) {
+        matchEntriesToday++
+        matchRepsToday += reps
+      }
+      if (inWeek) {
+        matchEntriesWeek++
+        matchRepsWeek += reps
+      }
+    }
+  }
+
+  const activeRules = challenges.filter((challenge) => challenge.enabled).length
+  const xp = totalReps + allActiveDays.size * 50 + matchEntriesWeek * 25
+  const weeklyQuests: WeeklyQuest[] = [
+    quest('week_rhythm', weekActiveDays.size, 5, 'success'),
+    quest('week_reps', weekReps, 1000, 'accent'),
+    quest('today_anchor', todayReps > 0 ? 1 : 0, 1, 'info')
+  ]
+
+  if (activeRules > 0) {
+    weeklyQuests.splice(
+      2,
+      0,
+      quest('match_debt', matchEntriesWeek, 3, 'warning')
+    )
+  }
+
+  return {
+    level: computeLevel(xp),
+    weeklyQuests,
+    gameDebt: {
+      activeRules,
+      matchRepsToday,
+      matchRepsWeek,
+      matchEntriesToday,
+      matchEntriesWeek,
+      lastMatchAt
+    },
+    weekReps,
+    weekActiveDays: weekActiveDays.size,
+    todayReps
+  }
+}

src/renderer/src/lib/reporting.ts

@@ -0,0 +1,32 @@
+function errorFields(err: unknown): { message: string; stack?: string } {
+  if (err instanceof Error) {
+    return {
+      message: err.message || err.name,
+      stack: err.stack
+    }
+  }
+  if (typeof err === 'string') return { message: err }
+  try {
+    return { message: JSON.stringify(err) }
+  } catch {
+    return { message: String(err) }
+  }
+}
+
+function report(source: string, err: unknown): void {
+  const { message, stack } = errorFields(err)
+  if (!message) return
+  void window.api
+    ?.reportRendererError?.({ source, message, stack })
+    .catch(() => undefined)
+}
+
+export function installRendererErrorReporting(): void {
+  window.addEventListener('error', (event) => {
+    report('window.error', event.error ?? event.message)
+  })
+
+  window.addEventListener('unhandledrejection', (event) => {
+    report('window.unhandledrejection', event.reason)
+  })
+}

src/renderer/src/main.tsx

@@ -5,6 +5,7 @@ import './styles/globals.css'
 import App from './App'
 import ReminderApp from './ReminderApp'
 import { ThemeProvider } from './providers/ThemeProvider'
+import { installRendererErrorReporting } from './lib/reporting'
 
 const params = new URLSearchParams(window.location.search)
 const which = params.get('window') ?? 'main'
@@ -12,12 +13,21 @@ const which = params.get('window') ?? 'main'
 // reducedMotion="user" — framer-motion сам читает системную настройку
 // «уменьшить движение» и глушит transform/layout-анимации (оставляя opacity).
 // Один источник истины для обоих окон и всех motion-компонентов.
-ReactDOM.createRoot(document.getElementById('root')!).render(
+async function bootstrap(): Promise<void> {
-  <React.StrictMode>
+  if (import.meta.env.DEV && !window.api) {
-    <MotionConfig reducedMotion="user">
+    const { installDevApi } = await import('./lib/dev-api')
-      <ThemeProvider>
+    installDevApi()
-        {which === 'reminder' ? <ReminderApp /> : <App />}
+  }
-      </ThemeProvider>
+  installRendererErrorReporting()
-    </MotionConfig>
+  ReactDOM.createRoot(document.getElementById('root')!).render(
-  </React.StrictMode>
+    <React.StrictMode>
-)
+      <MotionConfig reducedMotion="user">
+        <ThemeProvider>
+          {which === 'reminder' ? <ReminderApp /> : <App />}
+        </ThemeProvider>
+      </MotionConfig>
+    </React.StrictMode>
+  )
+}
+
+void bootstrap()

src/renderer/src/pages/Challenges.tsx

@@ -1,7 +1,15 @@
 import { useEffect, useState } from 'react'
-import { Plus, ChevronRight, AlertTriangle, Gamepad2 } from 'lucide-react'
+import {
+  AlertTriangle,
+  BadgeCheck,
+  ChevronRight,
+  Gamepad2,
+  Plus,
+  Swords
+} from 'lucide-react'
 import { useAppStore } from '../store/appStore'
 import { Button } from '../components/ui/Button'
+import { InsightCard, InsightGrid } from '../components/PageScaffold'
 import { Switch } from '../components/ui/Switch'
 import { Modal } from '../components/ui/Modal'
 import { Card, Row, SectionHeader } from '../components/ui/Card'
@@ -49,16 +57,22 @@ export default function ChallengesPage(): JSX.Element {
   }, [])
 
   const noGamesActive = games.length > 0 && !games.some((g) => g.enabled)
+  const activeChallenges = challenges.filter((c) => c.enabled)
+  const enabledGames = games.filter((g) => g.enabled).length
+  const previewDebt = activeChallenges.reduce(
+    (sum, challenge) => sum + Math.round(5 * challenge.multiplier),
+    0
+  )
 
   return (
-    <div className="h-full overflow-y-auto">
+    <div className="h-full overflow-y-auto desktop-scroll">
-      <div className="max-w-3xl mx-auto px-4 sm:px-6 lg:px-10 pt-8 pb-12">
+      <div className="max-w-[980px] mx-auto px-5 lg:px-8 pt-6 pb-10">
-        <div className="flex flex-col sm:flex-row sm:items-end sm:justify-between gap-4 mb-8">
+        <div className="flex flex-col sm:flex-row sm:items-end sm:justify-between gap-4 mb-6">
           <div>
             <div className="text-[14px] text-text/65 font-semibold">
               {t('challenges.kicker')}
             </div>
-            <h1 className="font-serif text-[34px] sm:text-[40px] leading-[1.02] tracking-tight mt-1 font-bold">
+            <h1 className="font-display text-[30px] sm:text-[34px] leading-tight mt-1 font-bold">
               {t('challenges.title')}
             </h1>
             <p className="text-[15px] text-text/65 mt-2 font-medium">
@@ -78,7 +92,7 @@ export default function ChallengesPage(): JSX.Element {
         </div>
 
         {noGamesActive && (
-          <div className="mb-6 rounded-2xl bg-warning/12 p-4 flex items-start gap-3">
+          <div className="mb-5 rounded-xl border border-warning/25 bg-warning/10 p-4 flex items-start gap-3">
             <div className="w-10 h-10 rounded-xl bg-warning/18 text-warning grid place-items-center shrink-0">
               <AlertTriangle size={18} strokeWidth={2.5} />
             </div>
@@ -88,6 +102,30 @@ export default function ChallengesPage(): JSX.Element {
           </div>
         )}
 
+        <InsightGrid>
+          <InsightCard
+            icon={<BadgeCheck size={17} strokeWidth={2.5} />}
+            label={t('challenges.insight.active')}
+            value={`${activeChallenges.length}/${challenges.length}`}
+            hint={t('challenges.insight.active.hint')}
+            tone={activeChallenges.length > 0 ? 'success' : 'muted'}
+          />
+          <InsightCard
+            icon={<Gamepad2 size={17} strokeWidth={2.5} />}
+            label={t('challenges.insight.games')}
+            value={`${enabledGames}`}
+            hint={t('challenges.insight.games.hint')}
+            tone={enabledGames > 0 ? 'info' : 'warning'}
+          />
+          <InsightCard
+            icon={<Swords size={17} strokeWidth={2.5} />}
+            label={t('challenges.insight.debt')}
+            value={t('challenges.insight.debt.value', { n: previewDebt })}
+            hint={t('challenges.insight.debt.hint')}
+            tone={previewDebt > 0 ? 'warning' : 'muted'}
+          />
+        </InsightGrid>
+
         {challenges.length > 0 ? (
           <>
             <SectionHeader
@@ -140,7 +178,7 @@ export default function ChallengesPage(): JSX.Element {
         ) : (
           <Card>
             <div className="px-5 py-12 flex flex-col items-center text-center">
-              <div className="inline-flex w-14 h-14 rounded-2xl bg-accent text-white items-center justify-center mb-4">
+              <div className="inline-flex w-12 h-12 rounded-xl bg-accent text-white items-center justify-center mb-4">
                 <Gamepad2 size={24} strokeWidth={2.4} />
               </div>
               <div className="text-text/65 text-[15px] font-medium max-w-xs leading-snug">
@@ -304,7 +342,7 @@ function ChallengeEditor({
         </Field>
 
         <Field label={t('editor.field.icon')}>
-          <div className="grid grid-cols-8 gap-2 max-h-44 overflow-y-auto p-2 rounded-2xl bg-surface-2">
+          <div className="grid grid-cols-8 gap-2 max-h-44 overflow-y-auto p-2 rounded-lg bg-surface-2">
             {ICON_CHOICES.map((name) => (
               <button
                 key={name}
@@ -323,8 +361,8 @@ function ChallengeEditor({
           </div>
         </Field>
 
-        <div className="rounded-2xl bg-accent/8 p-4">
+        <div className="rounded-lg bg-accent/[0.08] p-4">
-          <div className="text-[11px] uppercase tracking-wider text-accent font-semibold mb-2">
+          <div className="text-[11px] text-accent font-semibold mb-2">
             {t('editor.challenge.preview.kicker')}
           </div>
           <div className="font-mono-num text-[14px] text-text/75 flex items-baseline gap-1.5 flex-wrap">
@@ -332,7 +370,7 @@ function ChallengeEditor({
             <span className="text-text/40">×</span>
             <span>{draft.multiplier}</span>
             <span className="text-text/40">=</span>
-            <span className="text-[32px] font-display font-semibold text-accent leading-none ml-1 tracking-tight">
+            <span className="text-[32px] font-display font-semibold text-accent leading-none ml-1">
               {previewReps}
             </span>
             <span className="text-text/55">

src/renderer/src/pages/Dashboard.tsx

@@ -7,7 +7,14 @@ import {
   Flame,
   Activity,
   TrendingUp,
-  Video
+  Video,
+  CalendarCheck,
+  Target,
+  RotateCcw,
+  Check,
+  Trophy,
+  Swords,
+  BadgeCheck
 } from 'lucide-react'
 import { useAppStore } from '../store/appStore'
 import { ExerciseCard } from '../components/ExerciseCard'
@@ -16,15 +23,31 @@ import { HistoryHeatmap } from '../components/HistoryHeatmap'
 import { AchievementsCard } from '../components/AchievementsCard'
 import { Button } from '../components/ui/Button'
 import { ConfirmModal } from '../components/ui/ConfirmModal'
-import type { Exercise, GameStatus, HistoryEntry } from '@shared/types'
+import type {
+  Exercise,
+  GameStatus,
+  HistoryEntry,
+  Language
+} from '@shared/types'
 import { formatCountdown } from '../lib/format'
-import { useT } from '../i18n'
+import { useT, type TFn } from '../i18n'
+import { Icon } from '../lib/icon'
+import {
+  computeTodayPlan,
+  type PlanItem,
+  type TodayPlan
+} from '../lib/day-plan'
 import {
   currentStreak,
   dailyReps,
   repsDoneTodayForExercise,
   todayKey
 } from '../lib/history'
+import {
+  computeMomentumSummary,
+  type MomentumSummary,
+  type WeeklyQuest
+} from '../lib/momentum'
 
 export default function Dashboard(): JSX.Element {
   const state = useAppStore((s) => s.state)
@@ -38,7 +61,10 @@ export default function Dashboard(): JSX.Element {
   // on every render — `state?.exercises ?? []` creates a fresh array each time
   // the parent re-renders even when nothing changed.
   const exercises = useMemo(() => state?.exercises ?? [], [state?.exercises])
+  const meals = useMemo(() => state?.meals ?? [], [state?.meals])
+  const challenges = useMemo(() => state?.challenges ?? [], [state?.challenges])
   const settings = state?.settings
+  const [planActionKey, setPlanActionKey] = useState<string | null>(null)
 
   // Игры: запрашиваем реальный статус (integrationActive + launchOption
   // applied), а не просто `state.gamesEnabled`. Без этого badge показывал
@@ -51,13 +77,12 @@ export default function Dashboard(): JSX.Element {
   }, [])
   const gamesLive = games.some(
     (g) =>
-      g.enabled &&
+      g.enabled && g.integrationActive && g.launchOptionStatus === 'applied'
-      g.integrationActive &&
-      g.launchOptionStatus === 'applied'
   )
   // «Включена, но не готова» — отдельное состояние, в badge другой tone.
   const gamesEnabledButNotLive = games.some(
-    (g) => g.enabled && (!g.integrationActive || g.launchOptionStatus !== 'applied')
+    (g) =>
+      g.enabled && (!g.integrationActive || g.launchOptionStatus !== 'applied')
   )
 
   // Local history mirror. Перетягиваем (а) на mount, (б) при изменении
@@ -109,6 +134,15 @@ export default function Dashboard(): JSX.Element {
     }
   }, [exercises, ticks])
 
+  const plan = useMemo(() => {
+    void ticks
+    return computeTodayPlan({ exercises, meals, history })
+  }, [exercises, meals, history, ticks])
+  const momentum = useMemo(
+    () => computeMomentumSummary({ history, exercises, challenges }),
+    [history, exercises, challenges]
+  )
+
   const paused = !settings?.globalEnabled
 
   function openCreate(): void {
@@ -137,43 +171,77 @@ export default function Dashboard(): JSX.Element {
     if (!settings) return
     await window.api.updateSettings({ globalEnabled: !settings.globalEnabled })
   }
+  async function handlePlanItemDone(item: PlanItem): Promise<void> {
+    const key = `${item.kind}:${item.id}`
+    if (planActionKey !== null) return
+    setPlanActionKey(key)
+    try {
+      if (item.kind === 'meal') await window.api.markMealDone(item.id)
+      else await window.api.markDone(item.id)
+    } finally {
+      setPlanActionKey(null)
+    }
+  }
 
   const today = new Date().toLocaleDateString(
     lang === 'en' ? 'en-US' : 'ru-RU',
     { weekday: 'long', day: 'numeric', month: 'long' }
   )
+  const header = dashboardHeaderCopy({
+    plan,
+    paused,
+    meetingPaused,
+    hasSetup: exercises.length > 0 || meals.length > 0,
+    lang,
+    t
+  })
 
   return (
-    <div className="h-full overflow-y-auto">
+    <div className="h-full overflow-y-auto desktop-scroll">
-      <div className="max-w-5xl mx-auto px-4 sm:px-6 lg:px-10 pt-8 pb-12">
+      <div className="max-w-[1180px] mx-auto px-5 lg:px-8 pt-6 pb-10">
-        <div className="flex flex-col sm:flex-row sm:items-end sm:justify-between gap-4 mb-8">
+        <section className="mb-4 rounded-xl border border-hairline/35 bg-surface p-5 shadow-card">
-          <div className="min-w-0">
+          <div className="flex flex-col xl:flex-row xl:items-start xl:justify-between gap-4">
-            <div className="text-[14px] text-text/65 font-semibold capitalize">
+            <div className="min-w-0">
-              {today}
+              <div className="text-[13px] text-text/60 font-bold">
+                {t('dashboard.header.date', { date: today })}
+              </div>
+              <div className="mt-1.5 flex flex-wrap items-center gap-3">
+                <h1 className="font-display text-[30px] sm:text-[34px] leading-tight font-bold">
+                  {header.title}
+                </h1>
+                <span
+                  className={[
+                    'h-7 px-2.5 rounded-md inline-flex items-center text-[12px] font-bold',
+                    dashboardStatusClass(header.tone)
+                  ].join(' ')}
+                >
+                  {header.status}
+                </span>
+              </div>
+              <p className="text-[14px] text-text/60 mt-2 font-medium leading-relaxed max-w-3xl">
+                {header.subtitle}
+              </p>
+            </div>
+            <div className="flex items-center gap-2">
+              <Button variant="tinted" onClick={togglePause}>
+                {!paused ? (
+                  <>
+                    <Pause size={14} strokeWidth={2.5} /> {t('btn.pause')}
+                  </>
+                ) : (
+                  <>
+                    <Play size={14} strokeWidth={2.5} /> {t('btn.start')}
+                  </>
+                )}
+              </Button>
+              <Button onClick={openCreate}>
+                <Plus size={15} strokeWidth={2.5} /> {t('btn.add')}
+              </Button>
             </div>
-            <h1 className="font-serif text-[34px] sm:text-[40px] leading-[1.02] tracking-tight mt-1 font-bold">
-              {t('dashboard.title')}
-            </h1>
           </div>
-          <div className="flex items-center gap-2">
+        </section>
-            <Button variant="tinted" onClick={togglePause}>
-              {!paused ? (
-                <>
-                  <Pause size={14} strokeWidth={2.5} /> {t('btn.pause')}
-                </>
-              ) : (
-                <>
-                  <Play size={14} strokeWidth={2.5} /> {t('btn.start')}
-                </>
-              )}
-            </Button>
-            <Button onClick={openCreate}>
-              <Plus size={15} strokeWidth={2.5} /> {t('btn.add')}
-            </Button>
-          </div>
-        </div>
 
-        <div className="grid grid-cols-2 lg:grid-cols-4 gap-3 mb-8">
+        <div className="grid grid-cols-2 xl:grid-cols-4 gap-3 mb-5">
           <HeroStat
             tone="accent"
             label={t('dashboard.stat.today_done')}
@@ -211,7 +279,11 @@ export default function Dashboard(): JSX.Element {
           />
           <HeroStat
             tone={
-              gamesLive ? 'success' : gamesEnabledButNotLive ? 'warning' : 'muted'
+              gamesLive
+                ? 'success'
+                : gamesEnabledButNotLive
+                  ? 'warning'
+                  : 'muted'
             }
             label={t('dashboard.stat.tracking')}
             value={
@@ -239,18 +311,11 @@ export default function Dashboard(): JSX.Element {
           />
         </div>
 
-        {history.length > 0 && (
-          <div className="mb-8 space-y-3">
-            <HistoryHeatmap history={history} exercises={exercises} />
-            <AchievementsCard history={history} exercises={exercises} />
-          </div>
-        )}
-
         {paused && (
           <motion.div
             initial={{ opacity: 0, y: -4 }}
             animate={{ opacity: 1, y: 0 }}
-            className="mb-6 rounded-2xl bg-warning/12 p-4 flex items-center gap-3"
+            className="mb-4 rounded-xl border border-warning/25 bg-warning/10 p-4 flex items-center gap-3"
           >
             <div className="w-10 h-10 rounded-xl bg-warning/18 text-warning grid place-items-center shrink-0">
               <Pause size={18} strokeWidth={2.5} />
@@ -273,7 +338,7 @@ export default function Dashboard(): JSX.Element {
           <motion.div
             initial={{ opacity: 0, y: -4 }}
             animate={{ opacity: 1, y: 0 }}
-            className="mb-6 rounded-2xl bg-info/12 p-4 flex items-center gap-3"
+            className="mb-4 rounded-xl border border-info/25 bg-info/10 p-4 flex items-center gap-3"
           >
             <div className="w-10 h-10 rounded-xl bg-info/18 text-info grid place-items-center shrink-0">
               <Video size={18} strokeWidth={2.5} />
@@ -289,7 +354,31 @@ export default function Dashboard(): JSX.Element {
           </motion.div>
         )}
 
-        <div className="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-2 gap-4">
+        <TodayPlanPanel
+          plan={plan}
+          paused={paused}
+          lang={lang}
+          t={t}
+          actionBusy={planActionKey !== null}
+          onItemDone={(item) => void handlePlanItemDone(item)}
+        />
+
+        <MomentumPanel
+          momentum={momentum}
+          gamesLive={gamesLive}
+          gamesEnabledButNotLive={gamesEnabledButNotLive}
+          lang={lang}
+          t={t}
+        />
+
+        {history.length > 0 && (
+          <div className="mb-8 space-y-3">
+            <HistoryHeatmap history={history} exercises={exercises} />
+            <AchievementsCard history={history} exercises={exercises} />
+          </div>
+        )}
+
+        <div className="grid grid-cols-1 xl:grid-cols-2 gap-3">
           <AnimatePresence>
             {exercises.map((ex) => (
               <ExerciseCard
@@ -312,7 +401,7 @@ export default function Dashboard(): JSX.Element {
 
         {exercises.length === 0 && (
           <div className="mt-12 text-center">
-            <div className="inline-flex w-14 h-14 rounded-2xl bg-accent text-white items-center justify-center mb-4">
+            <div className="inline-flex w-12 h-12 rounded-xl bg-accent text-white items-center justify-center mb-4">
               <Plus size={24} strokeWidth={2.5} />
             </div>
             <div className="font-display text-[20px] font-semibold">
@@ -348,6 +437,677 @@ export default function Dashboard(): JSX.Element {
   )
 }
 
+type DashboardHeaderTone = 'accent' | 'success' | 'warning' | 'info' | 'muted'
+
+function dashboardHeaderCopy({
+  plan,
+  paused,
+  meetingPaused,
+  hasSetup,
+  lang,
+  t
+}: {
+  plan: TodayPlan
+  paused: boolean
+  meetingPaused: boolean
+  hasSetup: boolean
+  lang: Language
+  t: TFn
+}): {
+  title: string
+  subtitle: string
+  status: string
+  tone: DashboardHeaderTone
+} {
+  if (paused) {
+    return {
+      title: t('dashboard.header.title.paused'),
+      subtitle: t('dashboard.header.subtitle.paused'),
+      status: t('dashboard.header.status.paused'),
+      tone: 'muted'
+    }
+  }
+
+  if (meetingPaused) {
+    return {
+      title: t('dashboard.header.title.meeting'),
+      subtitle: t('dashboard.header.subtitle.meeting'),
+      status: t('dashboard.header.status.meeting'),
+      tone: 'info'
+    }
+  }
+
+  if (!hasSetup) {
+    return {
+      title: t('dashboard.header.title.empty'),
+      subtitle: t('dashboard.header.subtitle.empty'),
+      status: t('dashboard.header.status.clear'),
+      tone: 'warning'
+    }
+  }
+
+  const nextItem = plan.nextItem
+  if (nextItem) {
+    const payload = {
+      name: nextItem.name,
+      kind: t(`dashboard.plan.kind.${nextItem.kind}`),
+      meta: planItemMeta(nextItem, t),
+      time: planItemTiming(nextItem, false, lang, t)
+    }
+    if (nextItem.due) {
+      return {
+        title: t('dashboard.header.title.due', payload),
+        subtitle: t('dashboard.header.subtitle.due', payload),
+        status: t('dashboard.header.status.due'),
+        tone: 'accent'
+      }
+    }
+    return {
+      title: t('dashboard.header.title.next', payload),
+      subtitle: t('dashboard.header.subtitle.next', payload),
+      status: t('dashboard.header.status.running'),
+      tone: 'success'
+    }
+  }
+
+  return {
+    title: t('dashboard.header.title.clear'),
+    subtitle: t('dashboard.header.subtitle.clear'),
+    status: t('dashboard.header.status.clear'),
+    tone: 'success'
+  }
+}
+
+function dashboardStatusClass(tone: DashboardHeaderTone): string {
+  if (tone === 'accent') return 'bg-accent/12 text-accent'
+  if (tone === 'success') return 'bg-success/12 text-success'
+  if (tone === 'warning') return 'bg-warning/12 text-warning'
+  if (tone === 'info') return 'bg-info/12 text-info'
+  return 'bg-text/10 text-text/55'
+}
+
+function MomentumPanel({
+  momentum,
+  gamesLive,
+  gamesEnabledButNotLive,
+  lang,
+  t
+}: {
+  momentum: MomentumSummary
+  gamesLive: boolean
+  gamesEnabledButNotLive: boolean
+  lang: Language
+  t: TFn
+}): JSX.Element {
+  const gameStatus = gamesLive
+    ? t('momentum.game.live')
+    : gamesEnabledButNotLive
+      ? t('momentum.game.setup')
+      : t('momentum.game.off')
+
+  return (
+    <section className="mb-6 grid grid-cols-1 xl:grid-cols-[0.9fr_1.15fr_0.95fr] gap-3">
+      <div className="bg-surface rounded-xl p-4 shadow-card border border-hairline/30 min-w-0">
+        <div className="flex items-center gap-3">
+          <div className="w-9 h-9 rounded-lg bg-warning text-white grid place-items-center shrink-0">
+            <Trophy size={19} strokeWidth={2.5} />
+          </div>
+          <div className="min-w-0">
+            <div className="text-[13px] text-text/55 font-semibold">
+              {t('momentum.level.title')}
+            </div>
+            <div className="font-display text-[20px] font-bold leading-tight truncate">
+              {t(momentum.level.key)}
+            </div>
+          </div>
+        </div>
+        <div className="mt-5 flex items-end justify-between gap-3">
+          <div>
+            <div className="text-[12px] text-text/55 font-semibold">
+              {t('momentum.level.number', {
+                n: momentum.level.levelIndex
+              })}
+            </div>
+            <div className="font-mono-num text-[28px] leading-none font-bold">
+              {momentum.level.xp}
+            </div>
+          </div>
+          <div className="text-[13px] text-text/60 text-right">
+            {momentum.level.nextKey
+              ? t('momentum.level.next', {
+                  name: t(momentum.level.nextKey),
+                  n: momentum.level.target - momentum.level.current
+                })
+              : t('momentum.level.max')}
+          </div>
+        </div>
+        <ProgressBar pct={momentum.level.progressPct} tone="warning" />
+      </div>
+
+      <div className="bg-surface rounded-xl p-4 shadow-card border border-hairline/30 min-w-0">
+        <div className="flex items-start justify-between gap-3 mb-3">
+          <div className="min-w-0">
+            <div className="text-[13px] text-text/55 font-semibold">
+              {t('momentum.week.kicker')}
+            </div>
+            <h2 className="font-display text-[20px] font-bold leading-tight">
+              {t('momentum.week.title')}
+            </h2>
+          </div>
+          <div className="text-[12px] text-text/55 font-mono-num font-semibold shrink-0">
+            {t('momentum.week.summary', {
+              days: momentum.weekActiveDays,
+              reps: momentum.weekReps
+            })}
+          </div>
+        </div>
+        <div className="divide-y divide-hairline/35">
+          {momentum.weeklyQuests.map((quest) => (
+            <WeeklyQuestRow key={quest.id} quest={quest} t={t} />
+          ))}
+        </div>
+      </div>
+
+      <div className="bg-surface rounded-xl p-4 shadow-card border border-hairline/30 min-w-0">
+        <div className="flex items-center gap-3">
+          <div className="w-9 h-9 rounded-lg bg-accent-2 text-white grid place-items-center shrink-0">
+            <Swords size={19} strokeWidth={2.5} />
+          </div>
+          <div className="min-w-0">
+            <div className="text-[13px] text-text/55 font-semibold">
+              {t('momentum.game.kicker')}
+            </div>
+            <h2 className="font-display text-[20px] font-bold leading-tight">
+              {t('momentum.game.title')}
+            </h2>
+          </div>
+        </div>
+
+        <div className="mt-4 rounded-lg bg-surface-2 p-3.5">
+          <div className="flex items-center justify-between gap-3">
+            <div className="text-[13px] text-text/60 font-semibold">
+              {t('momentum.game.status')}
+            </div>
+            <div
+              className={[
+                'text-[12px] px-2 py-1 rounded-md font-semibold',
+                gamesLive
+                  ? 'bg-success/12 text-success'
+                  : gamesEnabledButNotLive
+                    ? 'bg-warning/12 text-warning'
+                    : 'bg-text/10 text-text/55'
+              ].join(' ')}
+            >
+              {gameStatus}
+            </div>
+          </div>
+
+          {momentum.gameDebt.activeRules > 0 ? (
+            <>
+              <div className="mt-4 grid grid-cols-2 gap-3">
+                <GameDebtStat
+                  label={t('momentum.game.today')}
+                  value={t('momentum.game.reps', {
+                    n: momentum.gameDebt.matchRepsToday
+                  })}
+                  hint={t('momentum.game.entries', {
+                    n: momentum.gameDebt.matchEntriesToday
+                  })}
+                />
+                <GameDebtStat
+                  label={t('momentum.game.week')}
+                  value={t('momentum.game.reps', {
+                    n: momentum.gameDebt.matchRepsWeek
+                  })}
+                  hint={t('momentum.game.entries', {
+                    n: momentum.gameDebt.matchEntriesWeek
+                  })}
+                />
+              </div>
+              <div className="mt-4 text-[13px] text-text/60 leading-relaxed">
+                {momentum.gameDebt.lastMatchAt
+                  ? t('momentum.game.last', {
+                      date: new Date(
+                        momentum.gameDebt.lastMatchAt
+                      ).toLocaleDateString(lang === 'en' ? 'en-US' : 'ru-RU', {
+                        day: 'numeric',
+                        month: 'short'
+                      })
+                    })
+                  : t('momentum.game.no_matches')}
+              </div>
+            </>
+          ) : (
+            <div className="mt-4 text-[14px] text-text/65 leading-relaxed">
+              {t('momentum.game.no_rules')}
+            </div>
+          )}
+        </div>
+      </div>
+    </section>
+  )
+}
+
+function WeeklyQuestRow({
+  quest,
+  t
+}: {
+  quest: WeeklyQuest
+  t: TFn
+}): JSX.Element {
+  const IconCmp =
+    quest.id === 'match_debt'
+      ? Swords
+      : quest.id === 'today_anchor'
+        ? BadgeCheck
+        : quest.id === 'week_rhythm'
+          ? Flame
+          : TrendingUp
+
+  return (
+    <div className="py-3 flex items-center gap-3 min-w-0">
+      <div
+        className={[
+          'w-8 h-8 rounded-lg grid place-items-center text-white shrink-0',
+          quest.complete
+            ? 'bg-success'
+            : quest.tone === 'warning'
+              ? 'bg-warning'
+              : quest.tone === 'info'
+                ? 'bg-info'
+                : 'bg-accent'
+        ].join(' ')}
+      >
+        <IconCmp size={16} strokeWidth={2.5} />
+      </div>
+      <div className="flex-1 min-w-0">
+        <div className="flex items-center justify-between gap-3">
+          <div className="font-semibold text-[15px] truncate">
+            {t(quest.titleKey)}
+          </div>
+          <div className="font-mono-num text-[12px] text-text/55 shrink-0">
+            {quest.current}/{quest.target}
+          </div>
+        </div>
+        <div className="text-[12px] text-text/55 mt-1 truncate">
+          {quest.complete ? t('momentum.quest.complete') : t(quest.descKey)}
+        </div>
+        <ProgressBar pct={quest.progressPct} tone={quest.tone} compact />
+      </div>
+    </div>
+  )
+}
+
+function GameDebtStat({
+  label,
+  value,
+  hint
+}: {
+  label: string
+  value: string
+  hint: string
+}): JSX.Element {
+  return (
+    <div className="min-w-0">
+      <div className="text-[12px] text-text/55 font-semibold">{label}</div>
+      <div className="font-mono-num text-[20px] font-bold leading-tight mt-1 truncate">
+        {value}
+      </div>
+      <div className="text-[11px] text-text/50 mt-1 truncate">{hint}</div>
+    </div>
+  )
+}
+
+function TodayPlanPanel({
+  plan,
+  paused,
+  lang,
+  t,
+  actionBusy,
+  onItemDone
+}: {
+  plan: TodayPlan
+  paused: boolean
+  lang: Language
+  t: TFn
+  actionBusy: boolean
+  onItemDone: (item: PlanItem) => void
+}): JSX.Element {
+  const nextItem = plan.nextItem
+  const upcoming = plan.items.slice(nextItem ? 1 : 0, nextItem ? 4 : 3)
+  const goalPct =
+    plan.goalTarget > 0
+      ? Math.min(100, Math.round((plan.goalDone / plan.goalTarget) * 100))
+      : 0
+  const mealPct =
+    plan.enabledMeals > 0
+      ? Math.min(100, Math.round((plan.doneMeals / plan.enabledMeals) * 100))
+      : 0
+  const recovery = recoveryCopy(plan, t)
+
+  return (
+    <section className="mb-6 bg-surface rounded-xl p-4 shadow-card border border-hairline/30">
+      <div className="flex flex-col sm:flex-row sm:items-center sm:justify-between gap-3">
+        <div className="flex items-center gap-3 min-w-0">
+          <div className="w-9 h-9 rounded-lg bg-accent/12 text-accent grid place-items-center shrink-0">
+            <CalendarCheck size={19} strokeWidth={2.5} />
+          </div>
+          <div className="min-w-0">
+            <h2 className="font-display text-[20px] font-bold leading-tight">
+              {t('dashboard.plan.title')}
+            </h2>
+            <div className="text-[14px] text-text/60 mt-0.5">
+              {t('dashboard.plan.subtitle')}
+            </div>
+          </div>
+        </div>
+        <div
+          className={[
+            'self-start sm:self-auto h-8 px-2.5 rounded-md inline-flex items-center text-[13px] font-semibold',
+            plan.dueCount > 0
+              ? 'bg-accent/12 text-accent'
+              : 'bg-success/12 text-success'
+          ].join(' ')}
+        >
+          {plan.dueCount > 0
+            ? t('dashboard.plan.due_count', { n: plan.dueCount })
+            : t('dashboard.plan.all_caught_up')}
+        </div>
+      </div>
+
+      <div className="mt-5 grid grid-cols-1 lg:grid-cols-[1.35fr_0.95fr_0.95fr] border-y border-hairline/35 divide-y lg:divide-y-0 lg:divide-x divide-hairline/35">
+        <div className="py-4 lg:pr-5 min-w-0">
+          <div className="text-[13px] text-text/55 font-semibold">
+            {t('dashboard.plan.next_action')}
+          </div>
+
+          {nextItem ? (
+            <>
+              <div className="mt-3 flex items-center gap-3 min-w-0">
+                <PlanItemGlyph item={nextItem} />
+                <div className="flex-1 min-w-0">
+                  <div className="flex items-center gap-2 min-w-0">
+                    <div className="font-display text-[20px] leading-tight font-bold truncate">
+                      {nextItem.name}
+                    </div>
+                    {nextItem.due && (
+                      <span className="shrink-0 w-2 h-2 rounded-full bg-accent" />
+                    )}
+                  </div>
+                  <div className="text-[13px] text-text/60 mt-1 truncate">
+                    {t(`dashboard.plan.kind.${nextItem.kind}`)} ·{' '}
+                    {planItemMeta(nextItem, t)}
+                  </div>
+                </div>
+              </div>
+              <div className="mt-4 flex flex-col sm:flex-row sm:items-center gap-3">
+                <div className="text-[14px] text-text/70 flex-1 min-w-0">
+                  {planItemTiming(nextItem, paused, lang, t)}
+                </div>
+                <Button
+                  size="sm"
+                  variant={nextItem.kind === 'meal' ? 'success' : 'filled'}
+                  disabled={actionBusy}
+                  onClick={() => onItemDone(nextItem)}
+                  className="sm:w-auto w-full"
+                >
+                  <Check size={14} strokeWidth={2.5} />
+                  {nextItem.kind === 'meal'
+                    ? t('dashboard.plan.ate_now')
+                    : t('dashboard.plan.done_now')}
+                </Button>
+              </div>
+            </>
+          ) : (
+            <div className="mt-3 min-w-0">
+              <div className="font-display text-[19px] leading-tight font-bold">
+                {t('dashboard.plan.clear.title')}
+              </div>
+              <div className="text-[14px] text-text/60 mt-1">
+                {t('dashboard.plan.clear.hint')}
+              </div>
+            </div>
+          )}
+        </div>
+
+        <div className="py-4 lg:px-5 min-w-0">
+          <div className="flex items-center gap-2 text-[13px] text-text/55 font-semibold">
+            <Target size={14} strokeWidth={2.5} />
+            {t('dashboard.plan.goals')}
+          </div>
+          <div className="mt-3 flex items-end justify-between gap-3">
+            <div className="font-mono-num text-[24px] font-bold leading-none">
+              {plan.goalTarget > 0
+                ? t('dashboard.plan.goals.progress', {
+                    done: plan.goalDone,
+                    goal: plan.goalTarget
+                  })
+                : '—'}
+            </div>
+            {plan.goalTarget > 0 && (
+              <div className="text-[13px] text-text/60">
+                {t('dashboard.plan.goals.remaining', {
+                  n: plan.goalRemaining
+                })}
+              </div>
+            )}
+          </div>
+          <ProgressBar pct={goalPct} tone="accent" />
+          <div className="text-[13px] text-text/58 mt-3">
+            {plan.goalTarget > 0
+              ? t('dashboard.plan.goals.hint')
+              : t('dashboard.plan.goals.empty')}
+          </div>
+
+          {plan.enabledMeals > 0 && (
+            <div className="mt-5">
+              <div className="flex items-center justify-between gap-3">
+                <div className="text-[13px] text-text/55 font-semibold">
+                  {t('dashboard.plan.meals')}
+                </div>
+                <div className="font-mono-num text-[14px] font-bold">
+                  {t('dashboard.plan.meals.progress', {
+                    done: plan.doneMeals,
+                    total: plan.enabledMeals
+                  })}
+                </div>
+              </div>
+              <ProgressBar pct={mealPct} tone="success" />
+            </div>
+          )}
+        </div>
+
+        <div className="py-4 lg:pl-5 min-w-0">
+          <div className="flex items-center gap-2 text-[13px] text-text/55 font-semibold">
+            <RotateCcw size={14} strokeWidth={2.5} />
+            {t('dashboard.plan.recovery')}
+          </div>
+          <div className="mt-3 flex items-start gap-3">
+            <div
+              className={[
+                'w-8 h-8 rounded-lg grid place-items-center shrink-0',
+                recovery.tone
+              ].join(' ')}
+            >
+              <RotateCcw size={17} strokeWidth={2.5} />
+            </div>
+            <div className="min-w-0">
+              <div className="font-display text-[20px] leading-tight font-bold">
+                {recovery.title}
+              </div>
+              <div className="text-[14px] text-text/60 mt-1">
+                {recovery.hint}
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      {upcoming.length > 0 && (
+        <div className="pt-4">
+          <div className="text-[13px] text-text/55 font-semibold mb-2">
+            {t('dashboard.plan.up_next')}
+          </div>
+          <div className="divide-y divide-hairline/35">
+            {upcoming.map((item) => (
+              <PlanListRow
+                key={`${item.kind}:${item.id}`}
+                item={item}
+                paused={paused}
+                lang={lang}
+                t={t}
+              />
+            ))}
+          </div>
+        </div>
+      )}
+    </section>
+  )
+}
+
+function PlanItemGlyph({ item }: { item: PlanItem }): JSX.Element {
+  const dueClass = item.due
+    ? 'bg-accent text-white'
+    : item.kind === 'meal'
+      ? 'bg-success/12 text-success'
+      : 'bg-accent/12 text-accent'
+
+  return (
+    <div
+      className={[
+        'w-9 h-9 rounded-lg grid place-items-center shrink-0',
+        dueClass
+      ].join(' ')}
+    >
+      <Icon name={item.icon} size={20} />
+    </div>
+  )
+}
+
+function PlanListRow({
+  item,
+  paused,
+  lang,
+  t
+}: {
+  item: PlanItem
+  paused: boolean
+  lang: Language
+  t: TFn
+}): JSX.Element {
+  return (
+    <div className="py-3 flex items-center gap-3 min-w-0">
+      <PlanItemGlyph item={item} />
+      <div className="flex-1 min-w-0">
+        <div className="font-semibold text-[15px] leading-tight truncate">
+          {item.name}
+        </div>
+        <div className="text-[13px] text-text/58 mt-1 truncate">
+          {planItemMeta(item, t)}
+        </div>
+      </div>
+      <div className="text-[13px] text-text/60 shrink-0 max-w-[42%] truncate">
+        {planItemTiming(item, paused, lang, t)}
+      </div>
+    </div>
+  )
+}
+
+function ProgressBar({
+  pct,
+  tone,
+  compact = false
+}: {
+  pct: number
+  tone: 'accent' | 'success' | 'warning' | 'info'
+  compact?: boolean
+}): JSX.Element {
+  const toneClass =
+    tone === 'accent'
+      ? 'bg-accent'
+      : tone === 'success'
+        ? 'bg-success'
+        : tone === 'warning'
+          ? 'bg-warning'
+          : 'bg-info'
+
+  return (
+    <div
+      className={[
+        'rounded-full bg-hairline/35 overflow-hidden',
+        compact ? 'mt-2 h-1.5' : 'mt-3 h-2'
+      ].join(' ')}
+    >
+      <div
+        className={[
+          'h-full rounded-full transition-all duration-300',
+          toneClass
+        ].join(' ')}
+        style={{ width: `${pct}%` }}
+      />
+    </div>
+  )
+}
+
+function planItemMeta(item: PlanItem, t: TFn): string {
+  if (item.kind === 'meal') {
+    return item.time
+      ? t('dashboard.plan.meal_time', { time: item.time })
+      : t('dashboard.plan.kind.meal')
+  }
+  if (item.goal !== undefined) {
+    return t('dashboard.plan.item.remaining_reps', {
+      n: item.remainingReps ?? 0
+    })
+  }
+  return t('dashboard.plan.item.reps', { n: item.reps ?? 1 })
+}
+
+function planItemTiming(
+  item: PlanItem,
+  paused: boolean,
+  lang: Language,
+  t: TFn
+): string {
+  if (item.due) return t('dashboard.plan.due_now')
+  if (paused) return t('dashboard.plan.paused')
+  return t('dashboard.plan.next_in', {
+    time: formatCountdown(item.nextFireAt - Date.now(), lang)
+  })
+}
+
+function recoveryCopy(
+  plan: TodayPlan,
+  t: TFn
+): { title: string; hint: string; tone: string } {
+  if (plan.recovery.kind === 'first-run') {
+    return {
+      title: t('dashboard.plan.recovery.first.title'),
+      hint: t('dashboard.plan.recovery.first.hint'),
+      tone: 'bg-info/12 text-info'
+    }
+  }
+  if (plan.recovery.kind === 'recovery') {
+    return {
+      title: t('dashboard.plan.recovery.return.title'),
+      hint: t('dashboard.plan.recovery.return.hint', {
+        n: plan.recovery.daysSinceDone
+      }),
+      tone: 'bg-warning/12 text-warning'
+    }
+  }
+  return {
+    title: t('dashboard.plan.recovery.steady.title'),
+    hint:
+      plan.recovery.daysSinceDone === 0
+        ? t('dashboard.plan.recovery.steady.today')
+        : plan.recovery.daysSinceDone === 1
+          ? t('dashboard.plan.recovery.steady.yesterday')
+          : t('dashboard.plan.recovery.steady.none'),
+    tone: 'bg-success/12 text-success'
+  }
+}
+
 function HeroStat({
   tone,
   label,
@@ -373,23 +1133,25 @@ function HeroStat({
             : 'bg-text/40'
 
   return (
-    <div className="bg-surface rounded-2xl p-5 shadow-card dark:ring-0.5 dark:ring-hairline/30">
+    <div className="bg-surface rounded-xl p-4 shadow-card border border-hairline/30 min-w-0">
-      <div className="flex items-center gap-2 mb-3">
+      <div className="flex items-center gap-2 mb-2">
         <div
           className={[
-            'w-7 h-7 rounded-lg grid place-items-center text-white',
+            'w-7 h-7 rounded-md grid place-items-center text-white shrink-0',
             toneBg
           ].join(' ')}
         >
           {icon}
         </div>
-        <div className="text-[14px] text-text/75 font-semibold">{label}</div>
+        <div className="text-[13px] text-text/70 font-bold truncate">
+          {label}
+        </div>
       </div>
-      <div className="font-display text-[28px] font-bold tracking-tight leading-none">
+      <div className="font-display text-[24px] font-bold leading-tight truncate">
         {value}
       </div>
       {subvalue && (
-        <div className="text-[13px] text-text/60 mt-2 font-medium">
+        <div className="text-[12px] text-text/58 mt-1 font-medium truncate">
           {subvalue}
         </div>
       )}

src/renderer/src/pages/Exercises.tsx

@@ -1,7 +1,12 @@
 import { useState } from 'react'
-import { Plus, ChevronRight } from 'lucide-react'
+import { Activity, ChevronRight, Dumbbell, Plus, Target } from 'lucide-react'
 import { useAppStore } from '../store/appStore'
 import { ExerciseEditor } from '../components/ExerciseEditor'
+import {
+  InsightCard,
+  InsightGrid,
+  PageHeader
+} from '../components/PageScaffold'
 import { Button } from '../components/ui/Button'
 import { Switch } from '../components/ui/Switch'
 import { Card, Row, SectionHeader } from '../components/ui/Card'
@@ -18,28 +23,51 @@ export default function Exercises(): JSX.Element {
 
   const enabled = exercises.filter((e) => e.enabled)
   const disabled = exercises.filter((e) => !e.enabled)
+  const goalCount = exercises.filter((e) => e.dailyGoal !== undefined).length
+  const totalReps = enabled.reduce((sum, e) => sum + e.reps, 0)
 
   return (
-    <div className="h-full overflow-y-auto">
+    <div className="h-full overflow-y-auto desktop-scroll">
-      <div className="max-w-3xl mx-auto px-4 sm:px-6 lg:px-10 pt-8 pb-12">
+      <div className="max-w-[980px] mx-auto px-5 lg:px-8 pt-6 pb-10">
-        <div className="flex flex-col sm:flex-row sm:items-end sm:justify-between gap-4 mb-8">
+        <PageHeader
-          <div>
+          kicker={t('exercises.kicker')}
-            <div className="text-[14px] text-text/65 font-semibold">
+          title={t('exercises.title')}
-              {t('exercises.kicker')}
+          subtitle={t('exercises.subtitle')}
-            </div>
+          action={
-            <h1 className="font-serif text-[34px] sm:text-[40px] leading-[1.02] tracking-tight mt-1 font-bold">
+            <Button
-              {t('exercises.title')}
+              onClick={() => {
-            </h1>
+                setEditing(null)
-          </div>
+                setEditorOpen(true)
-          <Button
+              }}
-            onClick={() => {
+            >
-              setEditing(null)
+              <Plus size={15} strokeWidth={2.5} /> {t('btn.add')}
-              setEditorOpen(true)
+            </Button>
-            }}
+          }
-          >
+        />
-            <Plus size={15} strokeWidth={2.5} /> {t('btn.add')}
+
-          </Button>
+        <InsightGrid>
-        </div>
+          <InsightCard
+            icon={<Activity size={17} strokeWidth={2.5} />}
+            label={t('exercises.insight.active')}
+            value={`${enabled.length}/${exercises.length}`}
+            hint={t('exercises.insight.active.hint')}
+            tone={enabled.length > 0 ? 'success' : 'muted'}
+          />
+          <InsightCard
+            icon={<Dumbbell size={17} strokeWidth={2.5} />}
+            label={t('exercises.insight.load')}
+            value={t('exercises.insight.load.value', { n: totalReps })}
+            hint={t('exercises.insight.load.hint')}
+            tone="accent"
+          />
+          <InsightCard
+            icon={<Target size={17} strokeWidth={2.5} />}
+            label={t('exercises.insight.goals')}
+            value={`${goalCount}`}
+            hint={t('exercises.insight.goals.hint')}
+            tone={goalCount > 0 ? 'info' : 'muted'}
+          />
+        </InsightGrid>
 
         {enabled.length > 0 && (
           <>
@@ -94,7 +122,7 @@ export default function Exercises(): JSX.Element {
         {exercises.length === 0 && (
           <Card>
             <div className="px-5 py-12 flex flex-col items-center text-center">
-              <div className="inline-flex w-14 h-14 rounded-2xl bg-accent text-white items-center justify-center mb-4">
+              <div className="inline-flex w-12 h-12 rounded-xl bg-accent text-white items-center justify-center mb-4">
                 <Plus size={24} strokeWidth={2.5} />
               </div>
               <div className="text-text/65 text-[15px] font-medium max-w-xs leading-snug">

src/renderer/src/pages/Games.tsx

@@ -9,6 +9,7 @@ import {
   AlertTriangle
 } from 'lucide-react'
 import { motion } from 'framer-motion'
+import { InsightCard, InsightGrid } from '../components/PageScaffold'
 import { Button } from '../components/ui/Button'
 import { Switch } from '../components/ui/Switch'
 import { Spinner } from '../components/ui/Spinner'
@@ -55,17 +56,24 @@ export default function GamesPage(): JSX.Element {
     }
   }
 
-  const liveCount = games.filter((g) => g.enabled && g.integrationActive).length
+  const connectedCount = games.filter((g) => g.integrationActive).length
+  const liveCount = games.filter(
+    (g) =>
+      g.enabled && g.integrationActive && g.launchOptionStatus === 'applied'
+  ).length
+  const queuedCount = games.filter(
+    (g) => g.integrationActive && g.launchOptionStatus === 'queued'
+  ).length
 
   return (
-    <div className="h-full overflow-y-auto">
+    <div className="h-full overflow-y-auto desktop-scroll">
-      <div className="max-w-3xl mx-auto px-4 sm:px-6 lg:px-10 pt-8 pb-12">
+      <div className="max-w-[980px] mx-auto px-5 lg:px-8 pt-6 pb-10">
-        <div className="flex flex-col sm:flex-row sm:items-end sm:justify-between gap-4 mb-8">
+        <div className="flex flex-col sm:flex-row sm:items-end sm:justify-between gap-4 mb-6">
           <div>
             <div className="text-[14px] text-text/65 font-semibold">
               {t('games.kicker')}
             </div>
-            <h1 className="font-serif text-[34px] sm:text-[40px] leading-[1.02] tracking-tight mt-1 font-bold">
+            <h1 className="font-display text-[30px] sm:text-[34px] leading-tight mt-1 font-bold">
               {t('games.title')}
             </h1>
             <p className="text-[15px] text-text/65 mt-2 font-medium leading-relaxed">
@@ -85,8 +93,38 @@ export default function GamesPage(): JSX.Element {
           </Button>
         </div>
 
+        <InsightGrid>
+          <InsightCard
+            icon={<Gamepad2 size={17} strokeWidth={2.5} />}
+            label={t('games.insight.supported')}
+            value={`${games.length}`}
+            hint={t('games.insight.supported.hint')}
+            tone="info"
+          />
+          <InsightCard
+            icon={<CheckCircle2 size={17} strokeWidth={2.5} />}
+            label={t('games.insight.connected')}
+            value={`${connectedCount}`}
+            hint={t('games.insight.connected.hint')}
+            tone={connectedCount > 0 ? 'success' : 'muted'}
+          />
+          <InsightCard
+            icon={<Hourglass size={17} strokeWidth={2.5} />}
+            label={t('games.insight.live')}
+            value={
+              queuedCount > 0
+                ? t('games.insight.queued', { n: queuedCount })
+                : t('games.subtitle.live', { n: liveCount })
+            }
+            hint={t('games.insight.live.hint')}
+            tone={
+              liveCount > 0 ? 'success' : queuedCount > 0 ? 'warning' : 'muted'
+            }
+          />
+        </InsightGrid>
+
         <SectionHeader title={t('games.section.supported')} />
-        <div className="space-y-4">
+        <div className="space-y-3">
           {games.map((g, i) => (
             <motion.div
               key={g.id}
@@ -109,7 +147,11 @@ export default function GamesPage(): JSX.Element {
                 className="px-5 py-12 flex flex-col items-center gap-3 text-center text-text/55 text-[14px]"
                 role="status"
               >
-                <Spinner size={22} className="text-accent" label={t('games.scanning')} />
+                <Spinner
+                  size={22}
+                  className="text-accent"
+                  label={t('games.scanning')}
+                />
                 {t('games.scanning')}
               </div>
             </Card>
@@ -143,12 +185,12 @@ function GameCard({
     game.enabled
 
   return (
-    <div className="bg-surface rounded-3xl p-5 shadow-card dark:ring-0.5 dark:ring-hairline/30">
+    <div className="bg-surface rounded-xl p-4 shadow-card border border-hairline/30">
       <div className="flex items-start justify-between gap-4">
         <div className="flex items-start gap-4 min-w-0 flex-1">
           <div
             className={[
-              'w-12 h-12 rounded-2xl grid place-items-center shrink-0 text-white',
+              'w-10 h-10 rounded-lg grid place-items-center shrink-0 text-white',
               isLive
                 ? 'bg-success'
                 : game.integrationActive
@@ -160,7 +202,7 @@ function GameCard({
           </div>
           <div className="flex-1 min-w-0">
             <div className="flex items-center gap-2 flex-wrap">
-              <h3 className="font-display text-[18px] font-bold tracking-tight">
+              <h3 className="font-display text-[18px] font-bold">
                 {game.name}
               </h3>
               <StatusBadge game={game} isLive={isLive} />
@@ -178,7 +220,7 @@ function GameCard({
       </div>
 
       {game.integrationActive && game.launchOptionStatus === 'queued' && (
-        <div className="mt-4 rounded-2xl bg-warning/12 p-4 text-[14px] leading-relaxed flex items-start gap-2.5 font-medium">
+        <div className="mt-4 rounded-lg bg-warning/12 p-3.5 text-[14px] leading-relaxed flex items-start gap-2.5 font-medium">
           <Hourglass
             size={17}
             className="text-warning shrink-0 mt-0.5"
@@ -193,7 +235,7 @@ function GameCard({
       )}
 
       {game.integrationActive && game.launchOptionStatus === 'no_user' && (
-        <div className="mt-4 rounded-2xl bg-destructive/10 p-4 text-[14px] leading-relaxed flex items-start gap-2.5 font-medium">
+        <div className="mt-4 rounded-lg bg-destructive/10 p-3.5 text-[14px] leading-relaxed flex items-start gap-2.5 font-medium">
           <AlertTriangle
             size={17}
             className="text-destructive shrink-0 mt-0.5"
@@ -221,7 +263,11 @@ function GameCard({
             disabled={busy}
             size="sm"
           >
-            {busy ? <Spinner size={14} /> : <Trash2 size={14} strokeWidth={2.5} />}{' '}
+            {busy ? (
+              <Spinner size={14} />
+            ) : (
+              <Trash2 size={14} strokeWidth={2.5} />
+            )}{' '}
             {t('btn.disconnect')}
           </Button>
         )}
@@ -299,7 +345,7 @@ function DevPanel({ games }: { games: GameStatus[] }): JSX.Element | null {
     <div className="mt-10">
       <button
         onClick={() => setOpen(!open)}
-        className="text-[12px] uppercase tracking-wider text-text/40 hover:text-text/70 font-mono-num font-medium transition-colors"
+        className="text-[12px] text-text/40 hover:text-text/70 font-mono-num font-medium transition-colors"
       >
         {open ? '▾' : '▸'} {t('games.dev.toggle')}
       </button>

src/renderer/src/pages/Meals.tsx

@@ -1,7 +1,19 @@
 import { useState } from 'react'
-import { Plus, ChevronRight, UtensilsCrossed } from 'lucide-react'
+import {
+  CalendarDays,
+  ChevronRight,
+  Clock,
+  Plus,
+  UtensilsCrossed
+} from 'lucide-react'
+import { AnimatePresence, motion } from 'framer-motion'
 import { useAppStore } from '../store/appStore'
 import { MealEditor, type MealDraft } from '../components/MealEditor'
+import {
+  InsightCard,
+  InsightGrid,
+  PageHeader
+} from '../components/PageScaffold'
 import { Button } from '../components/ui/Button'
 import { Switch } from '../components/ui/Switch'
 import { Card, Row, SectionHeader } from '../components/ui/Card'
@@ -27,8 +39,17 @@ export default function Meals(): JSX.Element {
   const [editing, setEditing] = useState<Meal | null>(null)
   const { t } = useT()
 
-  const enabled = meals.filter((m) => m.enabled)
+  // Единый список (включённые сверху). Важно: НЕ разбиваем на два <Card>, иначе
-  const disabled = meals.filter((m) => !m.enabled)
+  // при переключении строка переезжает между списками → её Switch
+  // размонтируется/монтируется заново, и анимация ползунка есть только при
+  // включении (mount с x:0→20), а при выключении нет. В одном keyed-списке
+  // компонент остаётся смонтированным → ползунок плавно ездит в обе стороны,
+  // а строка «переезжает» в свою группу через layout-анимацию.
+  const ordered = [...meals].sort((a, b) =>
+    a.enabled === b.enabled ? 0 : a.enabled ? -1 : 1
+  )
+  const activeMeals = meals.filter((m) => m.enabled)
+  const nextMeal = getNextMealLabel(activeMeals)
 
   async function addPreset(
     preset: (typeof MEAL_PRESETS)[number]
@@ -43,26 +64,47 @@ export default function Meals(): JSX.Element {
   }
 
   return (
-    <div className="h-full overflow-y-auto">
+    <div className="h-full overflow-y-auto desktop-scroll">
-      <div className="max-w-3xl mx-auto px-4 sm:px-6 lg:px-10 pt-8 pb-12">
+      <div className="max-w-[980px] mx-auto px-5 lg:px-8 pt-6 pb-10">
-        <div className="flex flex-col sm:flex-row sm:items-end sm:justify-between gap-4 mb-8">
+        <PageHeader
-          <div>
+          kicker={t('meals.kicker')}
-            <div className="text-[14px] text-text/65 font-semibold">
+          title={t('meals.title')}
-              {t('meals.kicker')}
+          subtitle={t('meals.subtitle')}
-            </div>
+          action={
-            <h1 className="font-serif text-[34px] sm:text-[40px] leading-[1.02] tracking-tight mt-1 font-bold">
+            <Button
-              {t('meals.title')}
+              onClick={() => {
-            </h1>
+                setEditing(null)
-          </div>
+                setEditorOpen(true)
-          <Button
+              }}
-            onClick={() => {
+            >
-              setEditing(null)
+              <Plus size={15} strokeWidth={2.5} /> {t('btn.add')}
-              setEditorOpen(true)
+            </Button>
-            }}
+          }
-          >
+        />
-            <Plus size={15} strokeWidth={2.5} /> {t('btn.add')}
+
-          </Button>
+        <InsightGrid>
-        </div>
+          <InsightCard
+            icon={<UtensilsCrossed size={17} strokeWidth={2.5} />}
+            label={t('meals.insight.active')}
+            value={`${activeMeals.length}/${meals.length}`}
+            hint={t('meals.insight.active.hint')}
+            tone={activeMeals.length > 0 ? 'success' : 'muted'}
+          />
+          <InsightCard
+            icon={<Clock size={17} strokeWidth={2.5} />}
+            label={t('meals.insight.next')}
+            value={nextMeal ?? '—'}
+            hint={t('meals.insight.next.hint')}
+            tone={nextMeal ? 'accent' : 'muted'}
+          />
+          <InsightCard
+            icon={<CalendarDays size={17} strokeWidth={2.5} />}
+            label={t('meals.insight.presets')}
+            value={`${MEAL_PRESETS.length}`}
+            hint={t('meals.insight.presets.hint')}
+            tone="info"
+          />
+        </InsightGrid>
 
         {/* Пресеты быстрого добавления */}
         <SectionHeader title={t('meals.presets')} />
@@ -71,7 +113,7 @@ export default function Meals(): JSX.Element {
             <button
               key={p.nameKey}
               onClick={() => addPreset(p)}
-              className="inline-flex items-center gap-2 h-10 px-3.5 rounded-2xl bg-surface-2 hover:bg-accent/15 hover:text-accent text-text/80 text-[14px] font-semibold transition-colors active:scale-95"
+              className="inline-flex items-center gap-2 h-9 px-3 rounded-lg bg-surface border border-hairline/35 hover:border-accent/45 hover:text-accent text-text/80 text-[14px] font-semibold transition-colors active:translate-y-px"
             >
               <Icon name={p.icon} size={16} strokeWidth={2.3} />
               {t(p.nameKey)}
@@ -82,46 +124,32 @@ export default function Meals(): JSX.Element {
           ))}
         </div>
 
-        {enabled.length > 0 && (
+        {meals.length > 0 && (
           <>
-            <SectionHeader
+            <SectionHeader title={t('meals.schedule')} />
-              title={t('meals.section.active', { n: enabled.length })}
-            />
-            <Card className="mb-6">
-              {enabled.map((m, i) => (
-                <MealRow
-                  key={m.id}
-                  meal={m}
-                  last={i === enabled.length - 1}
-                  meta={`${m.time} · ${daysLabel(m.days, t)}`}
-                  onEdit={() => {
-                    setEditing(m)
-                    setEditorOpen(true)
-                  }}
-                />
-              ))}
-            </Card>
-          </>
-        )}
-
-        {disabled.length > 0 && (
-          <>
-            <SectionHeader
-              title={t('meals.section.disabled', { n: disabled.length })}
-            />
             <Card>
-              {disabled.map((m, i) => (
+              <AnimatePresence initial={false}>
-                <MealRow
+                {ordered.map((m, i) => (
-                  key={m.id}
+                  <motion.div
-                  meal={m}
+                    key={m.id}
-                  last={i === disabled.length - 1}
+                    layout
-                  meta={`${m.time} · ${daysLabel(m.days, t)}`}
+                    initial={{ opacity: 0 }}
-                  onEdit={() => {
+                    animate={{ opacity: 1 }}
-                    setEditing(m)
+                    exit={{ opacity: 0 }}
-                    setEditorOpen(true)
+                    transition={{ duration: 0.18, ease: 'easeOut' }}
-                  }}
+                  >
-                />
+                    <MealRow
-              ))}
+                      meal={m}
+                      last={i === ordered.length - 1}
+                      meta={`${m.time} · ${daysLabel(m.days, t)}`}
+                      onEdit={() => {
+                        setEditing(m)
+                        setEditorOpen(true)
+                      }}
+                    />
+                  </motion.div>
+                ))}
+              </AnimatePresence>
             </Card>
           </>
         )}
@@ -129,7 +157,7 @@ export default function Meals(): JSX.Element {
         {meals.length === 0 && (
           <Card>
             <div className="px-5 py-12 flex flex-col items-center text-center">
-              <div className="inline-flex w-14 h-14 rounded-2xl bg-accent text-white items-center justify-center mb-4">
+              <div className="inline-flex w-12 h-12 rounded-xl bg-accent text-white items-center justify-center mb-4">
                 <UtensilsCrossed size={24} strokeWidth={2.3} />
               </div>
               <div className="text-text/65 text-[15px] font-medium max-w-xs leading-snug">
@@ -154,6 +182,25 @@ export default function Meals(): JSX.Element {
   )
 }
 
+function getNextMealLabel(meals: Meal[]): string | null {
+  const today = new Date().getDay()
+  const now = new Date()
+  const nowMinutes = now.getHours() * 60 + now.getMinutes()
+  const candidates = meals
+    .filter((meal) => meal.days.length === 0 || meal.days.includes(today))
+    .map((meal) => {
+      const [hh, mm] = meal.time.split(':').map(Number)
+      return {
+        meal,
+        minutes: (hh || 0) * 60 + (mm || 0)
+      }
+    })
+    .filter((item) => item.minutes >= nowMinutes)
+    .sort((a, b) => a.minutes - b.minutes)
+
+  return candidates[0]?.meal.time ?? null
+}
+
 function MealRow({
   meal,
   last,
@@ -169,7 +216,7 @@ function MealRow({
     <Row last={last}>
       <div
         className={[
-          'w-9 h-9 rounded-lg grid place-items-center shrink-0',
+          'w-9 h-9 rounded-lg grid place-items-center shrink-0 transition-colors duration-200',
           meal.enabled ? 'bg-accent text-white' : 'bg-text/15 text-text/45'
         ].join(' ')}
       >

src/renderer/src/pages/Settings.tsx

@@ -1,6 +1,17 @@
-import { useEffect, useState } from 'react'
+import { useCallback, useEffect, useState } from 'react'
+import {
+  Bell,
+  Copy,
+  FolderOpen,
+  Languages,
+  Palette,
+  Power,
+  RefreshCw
+} from 'lucide-react'
 import { useAppStore } from '../store/appStore'
 import { Switch } from '../components/ui/Switch'
+import { Button } from '../components/ui/Button'
+import { InsightCard, InsightGrid } from '../components/PageScaffold'
 import { Card, Row, SectionHeader } from '../components/ui/Card'
 import { UpdaterCard } from '../components/UpdaterCard'
 import { WhatsNewModal } from '../components/WhatsNewModal'
@@ -8,14 +19,16 @@ import { ConfirmModal } from '../components/ui/ConfirmModal'
 import { Skeleton } from '../components/ui/Skeleton'
 import { Spinner } from '../components/ui/Spinner'
 import { RELEASE_NOTES } from '@shared/release-notes'
-import { useT } from '../i18n'
+import { translate, useT, type TFn } from '../i18n'
 import type {
+  DiagnosticsInfo,
   Language,
   NotificationMode,
   QuietHours,
   Settings as SettingsType,
   Theme
 } from '@shared/types'
+import { parseHHMM } from '@shared/types'
 
 export default function SettingsPage(): JSX.Element {
   const settings = useAppStore((s) => s.state?.settings)
@@ -23,7 +36,7 @@ export default function SettingsPage(): JSX.Element {
   if (!settings)
     return (
       <div
-        className="max-w-2xl mx-auto px-4 sm:px-6 lg:px-10 pt-8 pb-12 space-y-5"
+        className="max-w-[980px] mx-auto px-5 lg:px-8 pt-6 pb-10 space-y-5"
         role="status"
         aria-label={t('settings.loading')}
       >
@@ -39,18 +52,49 @@ export default function SettingsPage(): JSX.Element {
   }
 
   return (
-    <div className="h-full overflow-y-auto">
+    <div className="h-full overflow-y-auto desktop-scroll">
-      <div className="max-w-2xl mx-auto px-4 sm:px-6 lg:px-10 pt-8 pb-12">
+      <div className="max-w-[980px] mx-auto px-5 lg:px-8 pt-6 pb-10">
-        <div className="mb-8">
+        <div className="mb-6">
           <div className="text-[14px] text-text/65 font-semibold">
             {t('settings.kicker')}
           </div>
-          <h1 className="font-serif text-[34px] sm:text-[40px] leading-[1.02] tracking-tight mt-1 font-bold">
+          <h1 className="font-display text-[30px] sm:text-[34px] leading-tight mt-1 font-bold">
             {t('settings.title')}
           </h1>
         </div>
 
-        <SectionHeader title={t('settings.section.language')} />
+        <SettingsStatusPanel
+          settings={settings}
+          onToggleGlobal={() =>
+            patch({ globalEnabled: !settings.globalEnabled })
+          }
+        />
+
+        <InsightGrid>
+          <InsightCard
+            icon={<Bell size={17} strokeWidth={2.5} />}
+            label={t('settings.insight.mode')}
+            value={t(`settings.notification_mode.${settings.notificationMode}`)}
+            hint={t('settings.insight.mode.hint')}
+            tone={settings.soundEnabled ? 'success' : 'info'}
+          />
+          <InsightCard
+            icon={<Palette size={17} strokeWidth={2.5} />}
+            label={t('settings.insight.theme')}
+            value={t(`settings.theme.${settings.theme}`)}
+            hint={t('settings.insight.theme.hint')}
+            tone="accent"
+          />
+          <InsightCard
+            icon={<Languages size={17} strokeWidth={2.5} />}
+            label={t('settings.insight.language')}
+            value={t(`settings.language.${settings.language}`)}
+            hint={t('settings.insight.language.hint')}
+            tone="info"
+          />
+        </InsightGrid>
+
+        <SectionHeader title={t('settings.section.interface')} />
         <Card className="mb-6">
           <SelectRow
             label={t('settings.language.label')}
@@ -61,12 +105,29 @@ export default function SettingsPage(): JSX.Element {
               { value: 'ru', label: t('settings.language.ru') },
               { value: 'en', label: t('settings.language.en') }
             ]}
+          />
+          <SelectRow
+            label={t('settings.theme.label')}
+            hint={t('settings.theme.hint')}
+            value={settings.theme}
+            onChange={(v) => patch({ theme: v as Theme })}
+            options={[
+              { value: 'system', label: t('settings.theme.system') },
+              { value: 'light', label: t('settings.theme.light') },
+              { value: 'dark', label: t('settings.theme.dark') }
+            ]}
             last
           />
         </Card>
 
         <SectionHeader title={t('settings.section.reminders')} />
         <Card className="mb-6">
+          <ToggleRow
+            label={t('settings.global.label')}
+            hint={t('settings.global.hint')}
+            checked={settings.globalEnabled}
+            onChange={(v) => patch({ globalEnabled: v })}
+          />
           <SelectRow
             label={t('settings.notification_mode.label')}
             hint={t('settings.notification_mode.hint')}
@@ -168,22 +229,6 @@ export default function SettingsPage(): JSX.Element {
           />
         </Card>
 
-        <SectionHeader title={t('settings.section.appearance')} />
-        <Card className="mb-6">
-          <SelectRow
-            label={t('settings.theme.label')}
-            hint={t('settings.theme.hint')}
-            value={settings.theme}
-            onChange={(v) => patch({ theme: v as Theme })}
-            options={[
-              { value: 'system', label: t('settings.theme.system') },
-              { value: 'light', label: t('settings.theme.light') },
-              { value: 'dark', label: t('settings.theme.dark') }
-            ]}
-            last
-          />
-        </Card>
-
         <SectionHeader title={t('settings.section.updates')} />
         <UpdaterCard />
 
@@ -192,6 +237,11 @@ export default function SettingsPage(): JSX.Element {
           <DataCard />
         </div>
 
+        <div className="mt-6">
+          <SectionHeader title={t('settings.section.diagnostics')} />
+          <DiagnosticsCard />
+        </div>
+
         <div className="mt-6">
           <SectionHeader title={t('settings.section.about')} />
           <AboutCard />
@@ -201,6 +251,282 @@ export default function SettingsPage(): JSX.Element {
   )
 }
 
+function SettingsStatusPanel({
+  settings,
+  onToggleGlobal
+}: {
+  settings: SettingsType
+  onToggleGlobal: () => void
+}): JSX.Element {
+  const { t } = useT()
+  return (
+    <section className="mb-5 rounded-xl bg-surface p-4 shadow-card border border-hairline/30">
+      <div className="flex flex-col sm:flex-row sm:items-start sm:justify-between gap-4">
+        <div className="flex items-start gap-3 min-w-0">
+          <div
+            className={[
+              'w-10 h-10 rounded-lg grid place-items-center text-white shrink-0',
+              settings.globalEnabled ? 'bg-success' : 'bg-warning'
+            ].join(' ')}
+          >
+            <Power size={20} strokeWidth={2.5} />
+          </div>
+          <div className="min-w-0 flex-1">
+            <div className="text-[13px] text-text/50 font-bold">
+              {t('settings.status.kicker')}
+            </div>
+            <h2 className="font-display text-[20px] font-bold leading-tight mt-1">
+              {settings.globalEnabled
+                ? t('settings.status.title.on')
+                : t('settings.status.title.off')}
+            </h2>
+            <p className="text-[14px] text-text/60 mt-1 leading-relaxed max-w-xl break-words">
+              {settingsStatusHint(settings, t)}
+            </p>
+          </div>
+        </div>
+        <Button
+          type="button"
+          variant={settings.globalEnabled ? 'tinted' : 'filled'}
+          onClick={onToggleGlobal}
+          className="self-start sm:self-auto"
+        >
+          {settings.globalEnabled ? t('btn.pause') : t('btn.start')}
+        </Button>
+      </div>
+
+      <div className="mt-5 grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-2">
+        <StatusPill
+          label={t('settings.status.reminders')}
+          value={
+            settings.globalEnabled
+              ? t('settings.status.on')
+              : t('settings.status.off')
+          }
+          active={settings.globalEnabled}
+        />
+        <StatusPill
+          label={t('settings.status.quiet')}
+          value={
+            settings.quietHours.enabled
+              ? `${settings.quietHours.from}-${settings.quietHours.to}`
+              : t('settings.status.off')
+          }
+          active={settings.quietHours.enabled}
+          tone="info"
+        />
+        <StatusPill
+          label={t('settings.status.meetings')}
+          value={
+            settings.meetingAutoPause
+              ? t('settings.status.on')
+              : t('settings.status.off')
+          }
+          active={settings.meetingAutoPause}
+          tone="info"
+        />
+        <StatusPill
+          label={t('settings.status.autostart')}
+          value={
+            settings.startWithWindows
+              ? t('settings.status.on')
+              : t('settings.status.off')
+          }
+          active={settings.startWithWindows}
+        />
+      </div>
+    </section>
+  )
+}
+
+function StatusPill({
+  label,
+  value,
+  active,
+  tone = 'success'
+}: {
+  label: string
+  value: string
+  active: boolean
+  tone?: 'success' | 'info'
+}): JSX.Element {
+  const activeClass = tone === 'info' ? 'text-info' : 'text-success'
+  return (
+    <div className="rounded-lg bg-surface-2 px-3.5 py-3 min-w-0">
+      <div className="text-[12px] text-text/50 font-semibold leading-tight">
+        {label}
+      </div>
+      <div
+        className={[
+          'mt-1 text-[14px] font-bold leading-tight break-words',
+          active ? activeClass : 'text-text/55'
+        ].join(' ')}
+      >
+        {value}
+      </div>
+    </div>
+  )
+}
+
+function settingsStatusHint(settings: SettingsType, t: TFn): string {
+  if (!settings.globalEnabled) return t('settings.status.hint.paused')
+  if (settings.quietHours.enabled) {
+    return t('settings.status.hint.quiet', {
+      from: settings.quietHours.from,
+      to: settings.quietHours.to
+    })
+  }
+  if (!settings.startWithWindows) return t('settings.status.hint.autostart')
+  return t('settings.status.hint.ready')
+}
+
+function DiagnosticsCard(): JSX.Element {
+  const { t, lang } = useT()
+  const [info, setInfo] = useState<DiagnosticsInfo | null>(null)
+  const [busy, setBusy] = useState<'refresh' | 'copy' | 'logs' | null>(null)
+  const [toast, setToast] = useState<string | null>(null)
+
+  const refresh = useCallback(async (): Promise<void> => {
+    setBusy('refresh')
+    try {
+      setInfo(await window.api.getDiagnostics())
+    } catch {
+      setToast(translate(lang, 'settings.diagnostics.err'))
+    } finally {
+      setBusy(null)
+    }
+  }, [lang])
+
+  useEffect(() => {
+    void refresh()
+  }, [refresh])
+
+  useEffect(() => {
+    if (!toast) return
+    const id = setTimeout(() => setToast(null), 4000)
+    return () => clearTimeout(id)
+  }, [toast])
+
+  async function copy(): Promise<void> {
+    setBusy('copy')
+    try {
+      setInfo(await window.api.copyDiagnostics())
+      setToast(t('settings.diagnostics.copy.ok'))
+    } catch {
+      setToast(t('settings.diagnostics.err'))
+    } finally {
+      setBusy(null)
+    }
+  }
+
+  async function openLogs(): Promise<void> {
+    setBusy('logs')
+    try {
+      const r = await window.api.openLogsFolder()
+      setToast(
+        r.ok
+          ? t('settings.diagnostics.logs.ok')
+          : t('settings.diagnostics.logs.err')
+      )
+    } catch {
+      setToast(t('settings.diagnostics.logs.err'))
+    } finally {
+      setBusy(null)
+    }
+  }
+
+  const appLine = info
+    ? `v${info.app.version} · Electron ${info.runtime.electron}`
+    : t('settings.diagnostics.loading')
+  const dataLine = info
+    ? `${info.store.exercises}/${info.store.meals}/${info.store.challenges}/${info.store.history}`
+    : '—'
+  const gsiLine = info
+    ? `${info.gsi.running ? 'live' : 'off'} · ${info.gsi.baseUrl}`
+    : '—'
+
+  return (
+    <Card>
+      <Row>
+        <div className="flex-1 min-w-0">
+          <div className="text-[15px] font-semibold leading-tight">
+            {t('settings.diagnostics.app.label')}
+          </div>
+          <div className="text-[13px] text-text/65 mt-1 leading-snug">
+            {appLine}
+          </div>
+        </div>
+        <Button
+          type="button"
+          size="sm"
+          variant="plain"
+          onClick={refresh}
+          disabled={busy !== null}
+          title={t('settings.diagnostics.refresh')}
+          aria-label={t('settings.diagnostics.refresh')}
+        >
+          <RefreshCw size={16} />
+        </Button>
+      </Row>
+      <Row>
+        <div className="flex-1 min-w-0">
+          <div className="text-[15px] font-semibold leading-tight">
+            {t('settings.diagnostics.data.label')}
+          </div>
+          <div className="text-[13px] text-text/65 mt-1 leading-snug">
+            {dataLine}
+          </div>
+        </div>
+        <div className="text-[12px] text-text/50 font-semibold whitespace-nowrap">
+          {t('settings.diagnostics.data.legend')}
+        </div>
+      </Row>
+      <Row>
+        <div className="flex-1 min-w-0">
+          <div className="text-[15px] font-semibold leading-tight">
+            {t('settings.diagnostics.gsi.label')}
+          </div>
+          <div className="text-[13px] text-text/65 mt-1 leading-snug truncate">
+            {gsiLine}
+          </div>
+        </div>
+      </Row>
+      <Row last className="flex-wrap justify-end">
+        <div className="flex-1 min-w-[180px] text-[13px] text-text/65 leading-snug">
+          {t('settings.diagnostics.hint')}
+        </div>
+        <div className="flex items-center gap-2">
+          <Button
+            type="button"
+            size="sm"
+            variant="tinted"
+            onClick={openLogs}
+            disabled={busy !== null}
+          >
+            <FolderOpen size={16} />
+            {t('settings.diagnostics.logs.btn')}
+          </Button>
+          <Button
+            type="button"
+            size="sm"
+            variant="filled"
+            onClick={copy}
+            disabled={busy !== null}
+          >
+            <Copy size={16} />
+            {t('settings.diagnostics.copy.btn')}
+          </Button>
+        </div>
+      </Row>
+      {toast && (
+        <div className="px-4 py-2.5 text-[13px] text-text/75 bg-accent/8 truncate font-medium">
+          {toast}
+        </div>
+      )}
+    </Card>
+  )
+}
+
 function AboutCard(): JSX.Element {
   const { t } = useT()
   const [open, setOpen] = useState(false)
@@ -399,11 +725,10 @@ function QuietTimesRow({
 }): JSX.Element {
   const { t } = useT()
   // Local mirror of from/to so typing doesn't fire an IPC + disk write per
-  // keystroke. We commit on blur (or when validation passes during typing).
+  // keystroke. We commit on blur and only send values accepted by the shared
-  // The HH:MM regex catches the moment the user has typed a full time.
+  // HH:MM parser.
   const [from, setFrom] = useState(qh.from)
   const [to, setTo] = useState(qh.to)
-  const HHMM = /^\d{1,2}:\d{2}$/
 
   // Sync from props when an external state change happens (lang switch,
   // pause toggle), but only if user isn't mid-edit.
@@ -417,7 +742,7 @@ function QuietTimesRow({
   const commit = (next: { from?: string; to?: string }): void => {
     const f = next.from ?? from
     const tt = next.to ?? to
-    if (!HHMM.test(f) || !HHMM.test(tt)) return
+    if (parseHHMM(f) === null || parseHHMM(tt) === null) return
     if (f === qh.from && tt === qh.to) return
     onChange({ ...qh, from: f, to: tt })
   }

src/renderer/src/styles/globals.css

@@ -20,56 +20,59 @@
 @tailwind components;
 @tailwind utilities;
 
-/* ===== Design tokens — Apple HIG with Manrope/Fraunces ===== */
+/* ===== Design tokens: desktop workstation ===== */
 
 :root {
-  /* Brand & semantic colors (iOS system palette) */
+  --accent: 16 118 110;
-  --accent: 255 107 53; /* Apple Fitness Move orange */
+  --accent-2: 225 29 72;
-  --accent-2: 255 45 85; /* systemPink */
+  --success: 22 163 74;
-  --success: 52 199 89; /* systemGreen */
+  --warning: 217 119 6;
-  --warning: 255 159 10; /* systemOrange dark */
+  --destructive: 220 38 38;
-  --destructive: 255 59 48; /* systemRed */
+  --info: 37 99 235;
-  --info: 0 122 255; /* systemBlue */
 
   color-scheme: light dark;
 }
 
-/* Light — polished iOS groupedBackground with warm undertone */
 :root {
-  --bg: 245 245 249; /* slightly warmer than 242,242,247 */
+  --bg: 244 246 247;
   --surface: 255 255 255;
-  --surface-2: 240 240 245; /* subtle separation for inputs/sections */
+  --surface-2: 236 240 242;
-  --text: 17 17 19; /* not pure black — softer */
+  --text: 22 27 29;
-  --text-secondary: 60 60 67;
+  --text-secondary: 72 82 87;
-  --text-tertiary: 60 60 67;
+  --text-tertiary: 103 113 118;
-  --hairline: 60 60 67;
+  --hairline: 174 185 190;
   --vibrancy: 255 255 255;
+  --sidebar: 26 31 33;
+  --sidebar-text: 245 247 248;
+  --sidebar-muted: 156 170 176;
 
-  --accent-soft: 255 107 53;
+  --accent-soft: 16 118 110;
-  --bg-deep: 232 232 238;
+  --bg-deep: 226 231 233;
   --surface-elevated: 255 255 255;
-  --border: 60 60 67;
+  --border: 174 185 190;
-  --muted: 60 60 67;
+  --muted: 72 82 87;
-  --victory: 52 199 89;
+  --victory: 22 163 74;
-  --defeat: 255 59 48;
+  --defeat: 220 38 38;
-  --xp: 255 159 10;
+  --xp: 217 119 6;
 }
 
-/* Dark — true black with grey elevation */
 .dark {
-  --bg: 0 0 0;
+  --bg: 16 18 19;
-  --surface: 28 28 30;
+  --surface: 28 32 34;
-  --surface-2: 44 44 46;
+  --surface-2: 40 46 49;
-  --text: 255 255 255;
+  --text: 245 247 248;
-  --text-secondary: 235 235 245;
+  --text-secondary: 203 211 215;
-  --text-tertiary: 235 235 245;
+  --text-tertiary: 152 164 170;
-  --hairline: 84 84 88;
+  --hairline: 84 96 101;
-  --vibrancy: 28 28 30;
+  --vibrancy: 28 32 34;
+  --sidebar: 17 22 24;
+  --sidebar-text: 248 250 250;
+  --sidebar-muted: 146 161 168;
 
-  --bg-deep: 0 0 0;
+  --bg-deep: 12 14 15;
-  --surface-elevated: 44 44 46;
+  --surface-elevated: 36 42 45;
-  --border: 84 84 88;
+  --border: 84 96 101;
-  --muted: 235 235 245;
+  --muted: 203 211 215;
 }
 
 /* ===== Base ===== */
@@ -85,50 +88,31 @@ body,
 
 body {
   font-family:
-    'Plus Jakarta Sans',
+    -apple-system, 'Segoe UI Variable Text', 'Segoe UI', 'Plus Jakarta Sans',
-    -apple-system,
+    system-ui, sans-serif;
-    'SF Pro Text',
-    'Segoe UI Variable Text',
-    'Segoe UI',
-    system-ui,
-    sans-serif;
   background-color: rgb(var(--bg));
   color: rgb(var(--text));
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   font-size: 14px;
   line-height: 1.5;
-  letter-spacing: -0.005em;
+  letter-spacing: 0;
 }
 
-/* Display — Bricolage Grotesque for headings and brand. Variable opsz axis
-   gives bigger glyphs slightly more character. */
 .font-display {
   font-family:
-    'Bricolage Grotesque',
+    -apple-system, 'Segoe UI Variable Display', 'Segoe UI', 'Plus Jakarta Sans',
-    'Plus Jakarta Sans',
+    system-ui, sans-serif;
-    -apple-system,
-    'SF Pro Display',
-    system-ui,
-    sans-serif;
   font-optical-sizing: auto;
-  font-variation-settings: 'opsz' 24;
+  letter-spacing: 0;
-  letter-spacing: -0.02em;
 }
 
-/* Serif → repurposed for the "hero" big titles. Same Bricolage but with the
-   opsz axis pushed to 96 for distinctive display feel. */
 .font-serif {
   font-family:
-    'Bricolage Grotesque',
+    -apple-system, 'Segoe UI Variable Display', 'Segoe UI', 'Plus Jakarta Sans',
-    'Plus Jakarta Sans',
+    system-ui, sans-serif;
-    -apple-system,
-    'SF Pro Display',
-    system-ui,
-    sans-serif;
   font-optical-sizing: auto;
-  font-variation-settings: 'opsz' 96;
+  letter-spacing: 0;
-  letter-spacing: -0.035em;
 }
 
 .font-mono-num {
@@ -136,7 +120,14 @@ body {
     'JetBrains Mono', ui-monospace, 'SF Mono', 'Cascadia Code', Menlo, monospace;
   font-variant-numeric: tabular-nums;
   font-feature-settings: 'ss02', 'ss19', 'zero';
-  letter-spacing: -0.01em;
+  letter-spacing: 0;
+}
+
+.tracking-tight,
+.tracking-wider,
+.tracking-\[0\.06em\],
+.tracking-\[0\.18em\] {
+  letter-spacing: 0 !important;
 }
 
 /* Custom titlebar drag region */
@@ -149,36 +140,47 @@ body {
   app-region: no-drag;
 }
 
-/* iOS 0.5px-style hairlines */
+/* Crisp panel separators for dense desktop surfaces */
 .hairline-b {
-  box-shadow: inset 0 -0.5px 0 rgb(var(--hairline) / 0.18);
+  box-shadow: inset 0 -1px 0 rgb(var(--hairline) / 0.34);
 }
 .hairline-t {
-  box-shadow: inset 0 0.5px 0 rgb(var(--hairline) / 0.18);
+  box-shadow: inset 0 1px 0 rgb(var(--hairline) / 0.34);
-}
-.dark .hairline-b,
-.dark .hairline-t {
-  box-shadow: inset 0 -0.5px 0 rgb(var(--hairline) / 0.4);
 }
 
-/* macOS vibrancy */
 .vibrancy {
-  background-color: rgb(var(--vibrancy) / 0.72);
+  background-color: rgb(var(--vibrancy) / 0.96);
-  backdrop-filter: saturate(180%) blur(30px);
+  backdrop-filter: none;
-  -webkit-backdrop-filter: saturate(180%) blur(30px);
+  -webkit-backdrop-filter: none;
 }
 
-/* Soft iOS card shadow with subtle warmth */
 .shadow-card {
   box-shadow:
-    0 0.5px 0 rgb(0 0 0 / 0.03),
+    0 0 0 1px rgb(var(--hairline) / 0.24),
-    0 1px 2px rgb(15 23 42 / 0.04),
+    0 10px 28px -24px rgb(15 23 42 / 0.45);
-    0 6px 14px -4px rgb(15 23 42 / 0.05);
 }
 .dark .shadow-card {
   box-shadow:
-    0 0.5px 0 rgb(255 255 255 / 0.04) inset,
+    0 0 0 1px rgb(var(--hairline) / 0.38),
-    0 1px 2px rgb(0 0 0 / 0.4);
+    0 16px 40px -30px rgb(0 0 0 / 0.9);
+}
+
+.app-shell {
+  background: linear-gradient(
+    180deg,
+    rgb(var(--bg)) 0%,
+    rgb(var(--bg-deep)) 100%
+  );
+}
+
+.app-main-surface {
+  background:
+    linear-gradient(180deg, rgb(var(--surface) / 0.78), transparent 220px),
+    rgb(var(--bg));
+}
+
+.desktop-scroll {
+  scrollbar-gutter: stable;
 }
 
 /* Scrollbar */
@@ -208,12 +210,12 @@ body {
 
 .reminder-shell {
   position: relative;
-  border: 0.5px solid rgb(var(--hairline) / 0.25);
+  border: 1px solid rgb(var(--hairline) / 0.35);
-  border-radius: 22px;
+  border-radius: 12px;
   background: rgb(var(--surface));
   box-shadow:
-    0 1px 2px rgb(0 0 0 / 0.06),
+    0 1px 2px rgb(0 0 0 / 0.08),
-    0 20px 50px -16px rgb(0 0 0 / 0.4);
+    0 24px 70px -28px rgb(0 0 0 / 0.55);
   overflow: hidden;
   height: 100%;
 }

src/shared/ipc.ts

@@ -19,6 +19,10 @@ export const IPC = {
   getAccentColor: 'system:accentColor',
   getOsTheme: 'system:osTheme',
   getAppVersion: 'system:appVersion',
+  getDiagnostics: 'system:diagnostics',
+  openLogsFolder: 'system:openLogsFolder',
+  copyDiagnostics: 'system:copyDiagnostics',
+  reportRendererError: 'system:reportRendererError',
 
   pauseAll: 'app:pauseAll',
   resumeAll: 'app:resumeAll',
@@ -77,7 +81,7 @@ export const IPC = {
   evtMaximizeChanged: 'evt:maximizeChanged',
   evtMeetingChanged: 'evt:meetingChanged',
   /**
-   * Шлётся когда история мутирует (markDone / snooze / skip /
+   * Шлётся когда история мутирует (markDone / markMealDone / snooze / skip /
    * markChallengeDone / clearHistory / import). Renderer'у достаточно
    * перезапросить getHistory. Раньше Dashboard переключал history по
    * `exercises` ref'у — но markDone мутирует Exercise in place, ref не

src/shared/release-notes.ts

@@ -21,6 +21,252 @@ export type ReleaseNoteItem = {
 export type ReleaseNotes = Record<Language, ReleaseNoteItem[]>
 
 export const RELEASE_NOTES: Record<string, ReleaseNotes> = {
+  '0.7.0': {
+    ru: [
+      {
+        title: 'Новый desktop-дизайн',
+        detail:
+          'Приложение стало рабочей панелью: темный сайдбар, четкие панели, меньше декоративности и больше полезной плотности.',
+        tag: 'new'
+      },
+      {
+        title: 'Обзор стал операционным экраном',
+        detail:
+          'Главный экран теперь быстрее показывает ближайший шаг, статус, цели, питание, режим и игровые долги.',
+        tag: 'new'
+      },
+      {
+        title: 'Настройки и списки стали спокойнее',
+        detail:
+          'Упражнения, питание, игры, челленджи и настройки получили единый desktop-контейнер и компактные строки.',
+        tag: 'new'
+      },
+      {
+        title: 'Модалки и напоминания обновлены',
+        detail:
+          'Редакторы, переключатели, кнопки и окно напоминания приведены к новой desktop-системе.',
+        tag: 'new'
+      }
+    ],
+    en: [
+      {
+        title: 'New desktop design',
+        detail:
+          'The app now feels like a focused workstation: dark sidebar, crisp panels, less decoration and better density.',
+        tag: 'new'
+      },
+      {
+        title: 'Overview is more operational',
+        detail:
+          'The main screen surfaces the next action, status, goals, meals, mode and game debt faster.',
+        tag: 'new'
+      },
+      {
+        title: 'Settings and lists are calmer',
+        detail:
+          'Exercises, meals, games, challenges and settings now share a tighter desktop container and compact rows.',
+        tag: 'new'
+      },
+      {
+        title: 'Dialogs and reminders were refreshed',
+        detail:
+          'Editors, switches, buttons and the reminder window now follow the new desktop system.',
+        tag: 'new'
+      }
+    ]
+  },
+  '0.6.6': {
+    ru: [
+      {
+        title: 'Настройки стали панелью состояния',
+        detail:
+          'Сверху видно, работают ли напоминания, включены ли тихие часы, встречи и запуск вместе с Windows.',
+        tag: 'new'
+      },
+      {
+        title: 'Главный экран стал точнее по текстам',
+        detail:
+          'Дата больше не кричит заглавными буквами, а цели показывают понятные единицы: “осталось 30 раз”.',
+        tag: 'fix'
+      },
+      {
+        title: 'Сводные карточки читаются лучше',
+        detail:
+          'Длинные значения в карточках больше не обрезаются, а сетка спокойнее держит десктопные ширины.',
+        tag: 'fix'
+      },
+      {
+        title: 'Безопасный стенд для проверки интерфейса',
+        detail:
+          'Добавлен dev:renderer: можно открыть UI в браузере с демо-данными и не трогать реальные настройки.',
+        tag: 'new'
+      }
+    ],
+    en: [
+      {
+        title: 'Settings now show app status first',
+        detail:
+          'The top panel shows whether reminders, quiet hours, meeting pause and Windows autostart are active.',
+        tag: 'new'
+      },
+      {
+        title: 'Overview copy is clearer',
+        detail:
+          'The date no longer gets artificial capitalization, and goals show units like “30 reps left”.',
+        tag: 'fix'
+      },
+      {
+        title: 'Summary cards are easier to read',
+        detail:
+          'Long values no longer get clipped, and the card grid behaves better on desktop widths.',
+        tag: 'fix'
+      },
+      {
+        title: 'Safe renderer preview for UI checks',
+        detail:
+          'Added dev:renderer so the UI can be opened with demo data without touching real settings.',
+        tag: 'new'
+      }
+    ]
+  },
+  '0.6.5': {
+    ru: [
+      {
+        title: 'Главный экран стал обзором действий',
+        detail:
+          'Верхний заголовок теперь показывает состояние: что сделать сейчас, что ждёт, пауза или встреча.',
+        tag: 'new'
+      },
+      {
+        title: 'Исправлен запуск с Windows',
+        detail:
+          'Проверка автозапуска теперь использует тот же путь и аргументы, что и запись в Windows.',
+        tag: 'fix'
+      },
+      {
+        title: 'Discord больше не ставит перерывы на паузу',
+        detail:
+          'Авто-пауза встреч реагирует на Zoom, Teams, Webex и Slack-huddle, но не на обычный Discord.',
+        tag: 'fix'
+      }
+    ],
+    en: [
+      {
+        title: 'The main screen is now an action overview',
+        detail:
+          'The header shows the current state: what to do now, what is due, pause or meeting.',
+        tag: 'new'
+      },
+      {
+        title: 'Fixed Start with Windows',
+        detail:
+          'Autostart now reads Windows login items with the same path and arguments it writes.',
+        tag: 'fix'
+      },
+      {
+        title: 'Discord no longer pauses breaks',
+        detail:
+          'Meeting auto-pause still handles Zoom, Teams, Webex and Slack-huddle, but ignores Discord.',
+        tag: 'fix'
+      }
+    ]
+  },
+  '0.6.4': {
+    ru: [
+      {
+        title: 'Новый видимый бренд “Разомнись”',
+        detail:
+          'Название стало короче и понятнее для русской аудитории: действие видно сразу.',
+        tag: 'new'
+      },
+      {
+        title: 'Сводки на каждом экране',
+        detail:
+          'Упражнения, питание, игры, челленджи и настройки теперь быстрее сканируются сверху.',
+        tag: 'new'
+      },
+      {
+        title: 'Улучшена структура вторичных страниц',
+        detail:
+          'Важные статусы вынесены выше списков, чтобы сразу видеть активность и проблемные места.',
+        tag: 'new'
+      }
+    ],
+    en: [
+      {
+        title: 'New visible “Razomnis” brand',
+        detail:
+          'The name is shorter and more action-focused for the Russian audience.',
+        tag: 'new'
+      },
+      {
+        title: 'Overview cards on every screen',
+        detail:
+          'Exercises, meals, games, challenges and settings are easier to scan from the top.',
+        tag: 'new'
+      },
+      {
+        title: 'Secondary pages are more structured',
+        detail:
+          'Important statuses moved above long lists so active and risky areas are visible immediately.',
+        tag: 'new'
+      }
+    ]
+  },
+  '0.6.3': {
+    ru: [
+      {
+        title: 'Новый главный экран “Не Залипай”',
+        detail:
+          'Сегодня теперь показывает не только план, но и недельный ритм, уровень и игровые долги.',
+        tag: 'new'
+      },
+      {
+        title: 'Мини-челленджи недели',
+        detail:
+          '5 дней без нуля, 1000 повторов, “сегодня не ноль” и закрытые катки считаются автоматически.',
+        tag: 'new'
+      },
+      {
+        title: 'Игровой долг после каток',
+        detail:
+          'На Dashboard видно, сколько Dota-долгов закрыто сегодня и за неделю.',
+        tag: 'new'
+      },
+      {
+        title: 'Мягкая система уровней',
+        detail:
+          'XP считается из повторов, активных дней и закрытых игровых челленджей.',
+        tag: 'new'
+      }
+    ],
+    en: [
+      {
+        title: 'New “Ne Zalipay” Today screen',
+        detail:
+          'Today now shows the day plan, weekly rhythm, level and game debts.',
+        tag: 'new'
+      },
+      {
+        title: 'Weekly mini-challenges',
+        detail:
+          '5 non-zero days, 1000 reps, “today is not zero” and closed matches are tracked automatically.',
+        tag: 'new'
+      },
+      {
+        title: 'Game debt after matches',
+        detail:
+          'Dashboard shows how many Dota debts were closed today and this week.',
+        tag: 'new'
+      },
+      {
+        title: 'Soft level system',
+        detail:
+          'XP comes from reps, active days and completed game challenges.',
+        tag: 'new'
+      }
+    ]
+  },
   '0.5.8': {
     ru: [
       {
@@ -97,7 +343,7 @@ export const RELEASE_NOTES: Record<string, ReleaseNotes> = {
       {
         title: 'Видно когда мы молчим из-за ВКС',
         detail:
-          'Запущен Zoom/Teams — на Dashboard баннер «Не дёргаем — ты на встрече».',
+          'Запущен Zoom/Teams — на Dashboard появляется баннер активной встречи.',
         tag: 'new'
       },
       {
@@ -180,7 +426,7 @@ export const RELEASE_NOTES: Record<string, ReleaseNotes> = {
       {
         title: 'Авто-пауза на ВКС',
         detail:
-          'Не дёргает напоминаниями, если запущен Zoom/Teams/Discord/Webex/Slack-huddle.',
+          'Ставит напоминания на паузу, если запущен Zoom/Teams/Webex/Slack-huddle.',
         tag: 'new'
       },
       {
@@ -204,14 +450,12 @@ export const RELEASE_NOTES: Record<string, ReleaseNotes> = {
     en: [
       {
         title: 'Reminder categories',
-        detail:
+        detail: 'Beyond exercises — hydration, eye rest (20-20-20), posture.',
-          'Beyond exercises — hydration, eye rest (20-20-20), posture.',
         tag: 'new'
       },
       {
         title: 'Voice prompts',
-        detail:
+        detail: 'Speaks the exercise name and count. Toggle in Settings.',
-          'Speaks the exercise name and count. Toggle in Settings.',
         tag: 'new'
       },
       {
@@ -229,7 +473,7 @@ export const RELEASE_NOTES: Record<string, ReleaseNotes> = {
       {
         title: 'Meeting auto-pause',
         detail:
-          'No reminders while Zoom/Teams/Discord/Webex/Slack-huddle is running.',
+          'Pauses reminders while Zoom/Teams/Webex/Slack-huddle is running.',
         tag: 'new'
       },
       {
@@ -255,7 +499,8 @@ export const RELEASE_NOTES: Record<string, ReleaseNotes> = {
     ru: [
       {
         title: 'Sandbox для окон',
-        detail: 'Окна изолированы на уровне OS — даже RCE в рендере не достанет main.',
+        detail:
+          'Окна изолированы на уровне OS — даже RCE в рендере не достанет main.',
         tag: 'security'
       },
       {
@@ -282,7 +527,8 @@ export const RELEASE_NOTES: Record<string, ReleaseNotes> = {
     en: [
       {
         title: 'Window sandbox',
-        detail: 'OS-level isolation — even RCE in the renderer cannot reach main.',
+        detail:
+          'OS-level isolation — even RCE in the renderer cannot reach main.',
         tag: 'security'
       },
       {
@@ -311,24 +557,28 @@ export const RELEASE_NOTES: Record<string, ReleaseNotes> = {
     ru: [
       {
         title: 'Фоновое скачивание апдейта',
-        detail: 'Можно уйти на Dashboard и заниматься — апдейт качается в фоне.',
+        detail:
+          'Можно уйти на Dashboard и заниматься — апдейт качается в фоне.',
         tag: 'new'
       },
       {
         title: 'Моментальный рестарт',
-        detail: 'Кнопка «Рестарт» — ~1-2 сек до открытия новой версии, без диалогов NSIS.',
+        detail:
+          'Кнопка «Рестарт» — ~1-2 сек до открытия новой версии, без диалогов NSIS.',
         tag: 'new'
       }
     ],
     en: [
       {
         title: 'Background update download',
-        detail: 'You can go to Dashboard and work — the update keeps downloading.',
+        detail:
+          'You can go to Dashboard and work — the update keeps downloading.',
         tag: 'new'
       },
       {
         title: 'Instant restart',
-        detail: 'Restart button — ~1-2 sec to the new version, no NSIS dialogs.',
+        detail:
+          'Restart button — ~1-2 sec to the new version, no NSIS dialogs.',
         tag: 'new'
       }
     ]
@@ -352,7 +602,9 @@ export function unseenVersions(
     // явный «What's new» из Settings.
     return all.filter((v) => v === current)
   }
-  return all.filter((v) => compareSemver(v, lastSeen) > 0 && compareSemver(v, current) <= 0)
+  return all.filter(
+    (v) => compareSemver(v, lastSeen) > 0 && compareSemver(v, current) <= 0
+  )
 }
 
 function parseSemver(v: string): [number, number, number] {

src/shared/types.ts

@@ -105,7 +105,7 @@ export type Settings = {
   voicePromptsEnabled: boolean
   /**
    * Авто-пауза напоминаний во время ВКС-звонков. Сканирует список процессов
-   * (Zoom/Teams/Discord/Webex/Slack-huddle/etc) раз в 30 сек, если хоть один
+   * (Zoom/Teams/Webex/Slack-huddle/etc) раз в 30 сек, если хоть один
    * запущен — fires не происходят. Чисто Windows (через tasklist).
    */
   meetingAutoPause: boolean
@@ -147,10 +147,11 @@ export type PersistedState = AppState & {
 export type HistoryAction = 'done' | 'skip' | 'snooze'
 
 /**
- * Источник записи: обычное напоминание (от scheduler'а) или матч (челлендж).
+ * Источник записи: обычное напоминание (от scheduler'а), приём пищи или
+ * матч (челлендж).
  * Используется для UI («подтянулся в матче» vs «по таймеру») и аналитики.
  */
-export type HistorySource = 'reminder' | 'match'
+export type HistorySource = 'reminder' | 'meal' | 'match'
 
 export type HistoryEntry = {
   /** ms epoch */
@@ -299,7 +300,7 @@ export const DEFAULT_SETTINGS: Settings = {
 const HHMM_RE = /^(\d{1,2}):(\d{2})$/
 
 /** Parse `HH:MM` into minutes-since-midnight, or `null` if malformed. */
-function parseHHMM(s: string): number | null {
+export function parseHHMM(s: string): number | null {
   const m = HHMM_RE.exec(s)
   if (!m) return null
   const h = Number(m[1])
@@ -454,3 +455,45 @@ export type UpdaterStatus =
     }
   | { kind: 'downloaded'; version: string }
   | { kind: 'error'; message: string }
+
+export type DiagnosticsInfo = {
+  generatedAt: number
+  app: {
+    version: string
+    isPackaged: boolean
+    platform: string
+    arch: string
+  }
+  runtime: {
+    electron: string
+    chrome: string
+    node: string
+  }
+  paths: {
+    userData: string
+    store: string
+    logs: string
+  }
+  store: {
+    bytes: number | null
+    exercises: number
+    meals: number
+    challenges: number
+    history: number
+  }
+  updater: UpdaterStatus
+  games: GameStatus[]
+  gsi: {
+    running: boolean
+    port: number
+    baseUrl: string
+  }
+  meetingActive: boolean
+}
+
+export type RendererErrorReport = {
+  message: string
+  stack?: string
+  componentStack?: string
+  source?: string
+}

tailwind.config.mjs

@@ -5,7 +5,7 @@ export default {
   theme: {
     extend: {
       colors: {
-        // iOS semantic palette
+        // Desktop semantic palette
         accent: 'rgb(var(--accent) / <alpha-value>)',
         'accent-soft': 'rgb(var(--accent-soft) / <alpha-value>)',
         'accent-2': 'rgb(var(--accent-2) / <alpha-value>)',
@@ -20,6 +20,9 @@ export default {
         surface: 'rgb(var(--surface) / <alpha-value>)',
         'surface-2': 'rgb(var(--surface-2) / <alpha-value>)',
         'surface-elevated': 'rgb(var(--surface-elevated) / <alpha-value>)',
+        sidebar: 'rgb(var(--sidebar) / <alpha-value>)',
+        'sidebar-text': 'rgb(var(--sidebar-text) / <alpha-value>)',
+        'sidebar-muted': 'rgb(var(--sidebar-muted) / <alpha-value>)',
 
         // Text & lines
         text: 'rgb(var(--text) / <alpha-value>)',
@@ -68,15 +71,14 @@ export default {
         ]
       },
       borderRadius: {
-        // iOS-specific radii
+        xl: '8px',
-        xl: '14px',
+        '2xl': '10px',
-        '2xl': '18px',
+        '3xl': '12px'
-        '3xl': '22px'
       },
       boxShadow: {
-        ios: '0 0.5px 0 rgb(0 0 0 / 0.04), 0 1px 2px rgb(0 0 0 / 0.05), 0 4px 12px rgb(0 0 0 / 0.04)',
+        ios: '0 1px 2px rgb(15 23 42 / 0.06), 0 10px 28px -24px rgb(15 23 42 / 0.35)',
         sheet:
-          '0 1px 2px rgb(0 0 0 / 0.06), 0 20px 50px -16px rgb(0 0 0 / 0.4)'
+          '0 1px 2px rgb(15 23 42 / 0.08), 0 24px 60px -28px rgb(15 23 42 / 0.45)'
       }
     }
   },

vite.renderer.config.mjs

@@ -0,0 +1,19 @@
+import { resolve } from 'node:path'
+import react from '@vitejs/plugin-react'
+import { defineConfig } from 'vite'
+
+export default defineConfig({
+  root: resolve('src/renderer'),
+  resolve: {
+    alias: {
+      '@renderer': resolve('src/renderer/src'),
+      '@shared': resolve('src/shared')
+    }
+  },
+  plugins: [react()],
+  server: {
+    host: '127.0.0.1',
+    port: 5173,
+    strictPort: true
+  }
+})