chore(release): v0.6.2

CHANGELOG.md

@@ -6,6 +6,34 @@
 
 ## [Unreleased]
 
+## [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-проход: проверил все элементы, нашёл и починил несколько
@@ -446,7 +474,8 @@
 иконки), системный трей, автозапуск с 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.6.2...HEAD
+[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

@@ -2,8 +2,8 @@
 
 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.6.1-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-238%20passing-green)]()
 [![platform](https://img.shields.io/badge/platform-Windows%2010%2F11-blue)]()
 
 ## Что внутри
@@ -45,6 +45,7 @@ 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 build           # сборка без NSIS
@@ -56,8 +57,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 +72,20 @@ 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/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)
 ──────────────────────────────────────────
-                                   227 ✓
+                                   238 ✓
 ```
 
 Покрытие: 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,6 +1,6 @@
 {
   "name": "laude",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "description": "Exercise reminder — Windows desktop app",
   "main": "out/main/index.js",
   "author": "AnRil",
@@ -18,6 +18,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 +29,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 +43,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 +57,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/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()
 })
 
@@ -96,14 +107,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/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/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()
   }
@@ -189,13 +227,16 @@ export default function ReminderApp(): JSX.Element {
         }
         // 2) Functional update: rapid-click race-safe.
         setMode((m) =>
-          m.kind === 'match'
+          {
-            ? {
+            if (m.kind !== 'match') return m
+            const nextMode: Mode = {
                 kind: 'match',
                 summary: m.summary,
                 done: new Set([...m.done, id])
               }
-            : m
+            modeRef.current = nextMode
+            return nextMode
+          }
         )
       }}
       onClose={close}

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/i18n/dict.ts

@@ -85,6 +85,42 @@ export const ru: Dict = {
   'dashboard.meeting.title': 'Не дёргаем — ты на встрече',
   'dashboard.meeting.hint':
     'Запущен Zoom / Teams / Discord / 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.reps': '{n} раз',
   'dashboard.empty.title': 'Программа пуста',
   'dashboard.empty.hint': 'Добавь первое упражнение, чтобы начать',
 
@@ -188,6 +224,7 @@ export const ru: Dict = {
   'settings.section.language': 'Язык',
   'settings.section.updates': 'Обновления',
   'settings.section.data': 'Данные',
+  'settings.section.diagnostics': 'Диагностика',
   'settings.data.export.label': 'Экспортировать всё',
   'settings.data.export.hint':
     'Сохрани резервную копию упражнений, истории, челленджей и настроек в JSON-файл.',
@@ -202,6 +239,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': 'Текущая установленная версия приложения.',
@@ -268,9 +319,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': 'Авто-проверка раз в час',
@@ -446,6 +499,42 @@ export const en: Dict = {
   'dashboard.meeting.hint':
     'Zoom / Teams / Discord / Webex / Slack-huddle is running. Reminders resume when you close it.',
   'dashboard.paused.hint': 'Resume to continue countdown',
+  'dashboard.plan.title': 'Day plan',
+  'dashboard.plan.subtitle': 'Next action and daily goals',
+  '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.reps': '{n} reps',
   'dashboard.empty.title': 'Program is empty',
   'dashboard.empty.hint': 'Add your first exercise to start',
 
@@ -549,6 +638,7 @@ export const en: Dict = {
   'settings.section.language': 'Language',
   '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.',
@@ -563,6 +653,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.',
@@ -629,9 +733,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/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,9 @@ import './styles/globals.css'
 import App from './App'
 import ReminderApp from './ReminderApp'
 import { ThemeProvider } from './providers/ThemeProvider'
+import { installRendererErrorReporting } from './lib/reporting'
+
+installRendererErrorReporting()
 
 const params = new URLSearchParams(window.location.search)
 const which = params.get('window') ?? 'main'

src/renderer/src/pages/Dashboard.tsx

@@ -7,7 +7,11 @@ import {
   Flame,
   Activity,
   TrendingUp,
-  Video
+  Video,
+  CalendarCheck,
+  Target,
+  RotateCcw,
+  Check
 } from 'lucide-react'
 import { useAppStore } from '../store/appStore'
 import { ExerciseCard } from '../components/ExerciseCard'
@@ -16,9 +20,20 @@ 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,
@@ -38,7 +53,9 @@ 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 settings = state?.settings
+  const [planActionKey, setPlanActionKey] = useState<string | null>(null)
 
   // Игры: запрашиваем реальный статус (integrationActive + launchOption
   // applied), а не просто `state.gamesEnabled`. Без этого badge показывал
@@ -51,13 +68,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 +125,11 @@ export default function Dashboard(): JSX.Element {
     }
   }, [exercises, ticks])
 
+  const plan = useMemo(() => {
+    void ticks
+    return computeTodayPlan({ exercises, meals, history })
+  }, [exercises, meals, history, ticks])
+
   const paused = !settings?.globalEnabled
 
   function openCreate(): void {
@@ -137,6 +158,17 @@ 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',
@@ -211,7 +243,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,13 +275,6 @@ 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 }}
@@ -289,6 +318,22 @@ export default function Dashboard(): JSX.Element {
           </motion.div>
         )}
 
+        <TodayPlanPanel
+          plan={plan}
+          paused={paused}
+          lang={lang}
+          t={t}
+          actionBusy={planActionKey !== null}
+          onItemDone={(item) => void handlePlanItemDone(item)}
+        />
+
+        {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 md:grid-cols-2 xl:grid-cols-2 gap-4">
           <AnimatePresence>
             {exercises.map((ex) => (
@@ -348,6 +393,340 @@ export default function Dashboard(): JSX.Element {
   )
 }
 
+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-8 bg-surface rounded-3xl p-5 shadow-card dark:ring-0.5 dark:ring-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-10 h-10 rounded-2xl 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-[22px] 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-3 rounded-full 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-[20px] 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-9 h-9 rounded-xl 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-11 h-11 rounded-2xl 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/62 shrink-0 max-w-[42%] truncate">
+        {planItemTiming(item, paused, lang, t)}
+      </div>
+    </div>
+  )
+}
+
+function ProgressBar({
+  pct,
+  tone
+}: {
+  pct: number
+  tone: 'accent' | 'success'
+}): JSX.Element {
+  return (
+    <div className="mt-3 h-2 rounded-full bg-hairline/35 overflow-hidden">
+      <div
+        className={[
+          'h-full rounded-full transition-all duration-300',
+          tone === 'accent' ? 'bg-accent' : 'bg-success'
+        ].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', {
+      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,

src/renderer/src/pages/Settings.tsx

@@ -1,6 +1,8 @@
-import { useEffect, useState } from 'react'
+import { useCallback, useEffect, useState } from 'react'
+import { Copy, FolderOpen, RefreshCw } from 'lucide-react'
 import { useAppStore } from '../store/appStore'
 import { Switch } from '../components/ui/Switch'
+import { Button } from '../components/ui/Button'
 import { Card, Row, SectionHeader } from '../components/ui/Card'
 import { UpdaterCard } from '../components/UpdaterCard'
 import { WhatsNewModal } from '../components/WhatsNewModal'
@@ -8,14 +10,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 } 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)
@@ -192,6 +196,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 +210,153 @@ export default function SettingsPage(): JSX.Element {
   )
 }
 
+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 +555,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 +572,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/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/types.ts

@@ -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
+}