Merge pull request #3531 from Skords-01/claude/brave-cerf-18ffqe

Skords-01 · web-flow · commit 8208fdb29941 · 2026-06-12T10:57:36.000+03:00
diff --git a/apps/web/src/modules/fizruk/components/dashboard/HeroCard.tsx b/apps/web/src/modules/fizruk/components/dashboard/HeroCard.tsx
@@ -447,8 +447,7 @@ function EmptyState({
       <p className="mt-2 text-sm text-teal-700 dark:text-white/75">
         {state.hasTemplates
           ? "Нічого не заплановано — запусти готовий шаблон або відкрий програми."
-          :  
-            "У тебе ще немає шаблонів. Створи свій перший або обери програму."}
+          : "У тебе ще немає шаблонів. Створи свій перший або обери програму."}
       </p>
       <div className="mt-6 flex flex-col gap-3">
         {/*
diff --git a/apps/web/src/modules/fizruk/lib/sqliteReader.ts b/apps/web/src/modules/fizruk/lib/sqliteReader.ts
@@ -429,6 +429,7 @@ export async function refreshFizrukSqliteState(
     dailyLog,
     monthlyPlan,
     workoutTemplates,
+    // eslint-disable-next-line no-restricted-syntax -- cache-freshness stamp: UTC wall-clock instant, not a Kyiv day boundary
     refreshedAt: new Date().toISOString(),
   };
   return cache;
@@ -453,6 +454,7 @@ export function __setFizrukSqliteCacheForTests(
 ): void {
   cache = {
     ...EMPTY_CACHE,
+    // eslint-disable-next-line no-restricted-syntax -- cache-freshness stamp: UTC wall-clock instant, not a Kyiv day boundary
     refreshedAt: new Date().toISOString(),
     ...partial,
   };
diff --git a/apps/web/src/modules/fizruk/pages/Progress.tsx b/apps/web/src/modules/fizruk/pages/Progress.tsx
@@ -14,18 +14,11 @@ import { MiniLineChart } from "../components/MiniLineChart";
 import { WellbeingChart } from "../components/WellbeingChart";
 import { WeeklyVolumeChart } from "../components/WeeklyVolumeChart";
 import { epley1rm, weeklyVolumeSeriesNow } from "@sergeant/fizruk-domain";
+import { kyivMondayStartMs } from "@sergeant/shared";
 import { statusColors } from "@shared/charts";
 import { Card } from "@shared/components/ui/Card";
 import { SectionHeading } from "@shared/components/ui/SectionHeading";
 import { Stat } from "@shared/components/ui/Stat";
-import { getKyivWeekStart } from "@shared/lib/time/kyivTime";
-
-function weekStartMs(d: number | string | Date) {
-  // Domain-correct (Kyiv) week boundary so weekly-volume bars don't
-  // shift when the user roams (consolidated page-audit § Theme 1 — 07 F1).
-  const ts = typeof d === "number" ? d : new Date(d).getTime();
-  return getKyivWeekStart(ts).getTime();
-}
 
 // F36: minimum bar width (%) so the smallest muscle-volume bar stays
 // visible and tap-able even when its value is a tiny fraction of the max.
@@ -96,7 +89,9 @@ export function Progress({ onNavigate }: ProgressProps) {
     for (const w of workouts || []) {
       const t = w.startedAt ? Date.parse(w.startedAt) : NaN;
       if (!Number.isFinite(t) || t < cutoff) continue;
-      const wk = weekStartMs(t);
+      // Domain-correct (Kyiv) week boundary so weekly-volume bars don't
+      // shift when the user roams (consolidated page-audit § Theme 1 — 07 F1).
+      const wk = kyivMondayStartMs(t);
       if (!weeks.has(wk)) weeks.set(wk, {});
       const bucket = weeks.get(wk);
       if (!bucket) continue;
diff --git a/apps/web/src/shared/lib/time/kyivTime.ts b/apps/web/src/shared/lib/time/kyivTime.ts
@@ -19,6 +19,8 @@
  * @see docs/audits/2026-05-13-consolidated-page-audit.md § Theme 1
  */
 
+import { kyivMondayStartMs } from "@sergeant/shared";
+
 const KYIV_TZ = "Europe/Kyiv";
 
 /**
@@ -177,22 +179,14 @@ export function parseKyivDate(key: string): Date | null {
  * Monday-anchored week start (00:00 Kyiv local) for the week containing
  * `input`. Matches ISO-8601 week convention used by `date.getDay()`
  * with the Monday-first remapping `(getDay() + 6) % 7`.
+ *
+ * Delegates to the monorepo-wide `kyivMondayStartMs` so packages
+ * (`fizruk-domain` weekly buckets) and web pages share one DST-safe
+ * implementation — the previous local `dayStart − N×24h` step-back drifted
+ * one hour on weeks containing a DST transition.
  */
 export function getKyivWeekStart(input?: Date | number): Date {
-  const { year, month, day, weekday } = getKyivDateParts(input);
-  // `weekday` is 0=Sun..6=Sat; offset to Monday-anchored
-  const mondayOffset = (weekday + 6) % 7;
-  const dayKey = `${year}-${String(month).padStart(2, "0")}-${String(day).padStart(2, "0")}`;
-  const dayStart = parseKyivDate(dayKey);
-  if (!dayStart) {
-    // Should never happen — `getKyivDateParts` returned a valid date,
-    // so `parseKyivDate` must accept it. Fall back to host-local midnight
-    // to avoid throwing, but this is a hard logic error if it ever fires.
-    const d = coerce(input);
-    d.setHours(0, 0, 0, 0);
-    return d;
-  }
-  return new Date(dayStart.getTime() - mondayOffset * 24 * 60 * 60 * 1000);
+  return new Date(kyivMondayStartMs(coerce(input)));
 }
 
 /**
diff --git a/packages/fizruk-domain/src/domain/dashboard/dashboardKpis.test.ts b/packages/fizruk-domain/src/domain/dashboard/dashboardKpis.test.ts
@@ -128,6 +128,36 @@ describe("computeWeeklyTotals", () => {
       volumeKg: 250,
     });
   });
+
+  // Domain invariant: week boundaries are Europe/Kyiv, not the host tz.
+  // Mon 2026-06-08 00:00 Kyiv (EEST, UTC+3) = 2026-06-07T21:00:00Z.
+  it("anchors the week boundary to Europe/Kyiv regardless of host tz", () => {
+    const now = new Date("2026-06-10T12:00:00Z"); // Wed of that week
+    const workouts = [
+      strengthWorkout("2026-06-07T20:30:00Z", [[100, 1]]), // Sun 23:30 Kyiv → out
+      strengthWorkout("2026-06-07T21:30:00Z", [[60, 5]]), // Mon 00:30 Kyiv → in
+    ];
+    expect(computeWeeklyTotals(workouts, now)).toEqual({
+      count: 1,
+      volumeKg: 300,
+    });
+  });
+
+  // DST week: Kyiv springs forward Sun 2026-03-29 03:00 EET → 04:00 EEST,
+  // so this week is 167 hours long. A naive `weekStart + 7×24h` end bound
+  // would leak the first hour of next Monday into the current week.
+  it("keeps the 167-hour spring-forward DST week tight at both ends", () => {
+    const now = new Date("2026-03-25T12:00:00Z"); // Wed of DST week
+    const workouts = [
+      strengthWorkout("2026-03-22T22:30:00Z", [[60, 5]]), // Mon 00:30 Kyiv (EET) → in
+      strengthWorkout("2026-03-29T20:30:00Z", [[100, 1]]), // Sun 23:30 Kyiv (EEST) → in
+      strengthWorkout("2026-03-29T21:30:00Z", [[999, 1]]), // Mon 00:30 Kyiv next week → out
+    ];
+    expect(computeWeeklyTotals(workouts, now)).toEqual({
+      count: 2,
+      volumeKg: 60 * 5 + 100,
+    });
+  });
 });
 
 describe("computeWeightChangeKg", () => {
diff --git a/packages/fizruk-domain/src/domain/dashboard/dashboardKpis.ts b/packages/fizruk-domain/src/domain/dashboard/dashboardKpis.ts
@@ -17,6 +17,8 @@
  *    window (default 30 days).
  */
 
+import { kyivMondayStartMs } from "@sergeant/shared";
+
 import type {
   DashboardKpis,
   DashboardMeasurementInput,
@@ -42,14 +44,6 @@ function localYmdKey(ms: number): string {
   return `${y}-${m}-${day}`;
 }
 
-function mondayStartMs(ms: number): number {
-  const d = new Date(ms);
-  d.setHours(0, 0, 0, 0);
-  const dow = (d.getDay() + 6) % 7; // 0 = Mon
-  d.setDate(d.getDate() - dow);
-  return d.getTime();
-}
-
 function isCompletedWorkout(
   w: DashboardWorkoutInput,
 ): w is DashboardWorkoutInput & {
@@ -134,6 +128,7 @@ export function computeStreakDays(
 
 /**
  * Current Mon-first-week counts (completed workouts + volume).
+ * Week boundaries are anchored to Europe/Kyiv (domain invariant).
  */
 export function computeWeeklyTotals(
   workouts: readonly DashboardWorkoutInput[] | null | undefined,
@@ -142,8 +137,13 @@ export function computeWeeklyTotals(
   const list = Array.isArray(workouts) ? workouts : [];
   if (list.length === 0) return { count: 0, volumeKg: 0 };
 
-  const weekStart = mondayStartMs(now.getTime());
-  const weekEnd = weekStart + 7 * MS_PER_DAY;
+  const weekStart = kyivMondayStartMs(now.getTime());
+  // Не `weekStart + 7×24h`: DST-тиждень триває 167/169 год. Середина
+  // наступного понеділка (±1h DST-люфт не виводить за межі дня) → його
+  // київський старт.
+  const weekEnd = kyivMondayStartMs(
+    weekStart + 7 * MS_PER_DAY + MS_PER_DAY / 2,
+  );
 
   let count = 0;
   let volumeKg = 0;
diff --git a/packages/fizruk-domain/src/domain/workouts/exerciseDetail.test.ts b/packages/fizruk-domain/src/domain/workouts/exerciseDetail.test.ts
@@ -175,7 +175,46 @@ describe("computeExerciseBest", () => {
 });
 
 describe("computeExerciseWeeklyTrend", () => {
-  it("buckets sessions by local Monday and caps at 12 weeks", () => {
+  // Domain invariant: week buckets are Europe/Kyiv-anchored.
+  // Mon 2026-06-08 00:00 Kyiv (EEST, UTC+3) = 2026-06-07T21:00:00Z.
+  it("splits Sun 23:30 vs Mon 00:30 (Kyiv) into separate week buckets", () => {
+    const history = [
+      {
+        // Mon 2026-06-08 00:30 Kyiv → bucket 2026-06-08
+        workout: w("w_mon", "2026-06-07T21:30:00Z", []),
+        item: strength("i_mon", "squat", [{ weightKg: 60, reps: 5 }]),
+      },
+      {
+        // Sun 2026-06-07 23:30 Kyiv → bucket 2026-06-01
+        workout: w("w_sun", "2026-06-07T20:30:00Z", []),
+        item: strength("i_sun", "squat", [{ weightKg: 100, reps: 1 }]),
+      },
+    ];
+    const { rmPoints } = computeExerciseWeeklyTrend(history);
+    expect(rmPoints.map((p) => p.weekKey)).toEqual([
+      "2026-06-01",
+      "2026-06-08",
+    ]);
+    // The label must show the Kyiv Monday's day-of-month even for users
+    // west of Kyiv (Kyiv Mon 00:00 is still Sunday in UTC and westwards).
+    expect(rmPoints[0]!.dateLabel).toMatch(/^1\s/);
+    expect(rmPoints[1]!.dateLabel).toMatch(/^8\s/);
+  });
+
+  // DST week: Kyiv springs forward Sun 2026-03-29 03:00 EET → 04:00 EEST.
+  it("keeps the spring-forward DST Sunday inside its Kyiv week bucket", () => {
+    const history = [
+      {
+        // Sun 2026-03-29 23:30 Kyiv (EEST) → bucket Mon 2026-03-23
+        workout: w("w_dst", "2026-03-29T20:30:00Z", []),
+        item: strength("i_dst", "squat", [{ weightKg: 80, reps: 3 }]),
+      },
+    ];
+    const { rmPoints } = computeExerciseWeeklyTrend(history);
+    expect(rmPoints.map((p) => p.weekKey)).toEqual(["2026-03-23"]);
+  });
+
+  it("buckets sessions by Kyiv Monday and caps at 12 weeks", () => {
     const history = [
       {
         // Wed 2026-04-08 groups with Mon 2026-04-06
diff --git a/packages/fizruk-domain/src/domain/workouts/exerciseDetail.ts b/packages/fizruk-domain/src/domain/workouts/exerciseDetail.ts
@@ -9,11 +9,15 @@
  *   - cardio (distance) trend buckets (pace / distance),
  *   - load-calculator zones (strength / hypertrophy / endurance).
  *
- * Kept DOM-free: no `window` / `localStorage` / `Intl.DateTimeFormat`
- * consumers here. Date labels are formatted via `Date#toLocaleDateString`
- * which is safe in Node and React Native runtimes.
+ * Kept DOM-free: no `window` / `localStorage` consumers here. Date labels
+ * are formatted via `Date#toLocaleDateString` (with an explicit
+ * `Europe/Kyiv` timeZone — domain invariant) which is safe in Node and
+ * React Native runtimes; week buckets come from the shared Kyiv-anchored
+ * helpers in `@sergeant/shared`.
  */
 
+import { kyivMondayStartMs, toLocalISODate } from "@sergeant/shared";
+
 import {
   epley1rm,
   suggestNextSet as suggestNextSetJs,
@@ -51,9 +55,16 @@ function toNum(v: unknown): number {
 
 function formatUkDateShort(d: Date): string {
   try {
-    return d.toLocaleDateString("uk-UA", { day: "numeric", month: "short" });
+    // Explicit Kyiv timezone: week starts are Kyiv Monday 00:00, which is
+    // still Sunday evening in UTC and westwards — rendering in the runtime
+    // timezone would shift the label a day back for those users.
+    return d.toLocaleDateString("uk-UA", {
+      day: "numeric",
+      month: "short",
+      timeZone: "Europe/Kyiv",
+    });
   } catch {
-    // Fallback for minimal ICU runtimes — YYYY-MM-DD prefix.
+    // Fallback for minimal ICU runtimes — host-local DD.MM (best effort).
     const pad = (n: number) => String(n).padStart(2, "0");
     return `${pad(d.getDate())}.${pad(d.getMonth() + 1)}`;
   }
@@ -228,25 +239,7 @@ export function computeExerciseBest(
 }
 
 /**
- * Start-of-Monday local-time timestamp for the given date (ms). Uses
- * the local tz, matching the web page's `getDay() - ((+6)%7)` trick.
- */
-function mondayStartLocalMs(d: Date): number {
-  const x = new Date(d);
-  const offset = (x.getDay() + 6) % 7;
-  x.setHours(0, 0, 0, 0);
-  x.setDate(x.getDate() - offset);
-  return x.getTime();
-}
-
-function weekKeyFromMondayMs(ms: number): string {
-  const d = new Date(ms);
-  const pad = (n: number) => String(n).padStart(2, "0");
-  return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}`;
-}
-
-/**
- * Group the strength history into Monday-starting weekly buckets and
+ * Group the strength history into Monday-starting (Europe/Kyiv) weekly buckets and
  * return up to the **last 12** buckets as two aligned series:
  *  - `rmPoints.value` = round(max Epley-1RM in the week, kg);
  *  - `volPoints.value` = round(sum of `weightKg × reps`, kg).
@@ -266,8 +259,8 @@ export function computeExerciseWeeklyTrend(
     if (!iso) continue;
     const t = Date.parse(iso);
     if (!Number.isFinite(t)) continue;
-    const weekStart = mondayStartLocalMs(new Date(t));
-    const key = weekKeyFromMondayMs(weekStart);
+    const weekStart = kyivMondayStartMs(t);
+    const key = toLocalISODate(weekStart);
     const sets = Array.isArray(item.sets) ? item.sets : [];
     let maxRm = 0;
     let vol = 0;
diff --git a/packages/fizruk-domain/src/lib/workoutStats.test.ts b/packages/fizruk-domain/src/lib/workoutStats.test.ts
@@ -1,6 +1,7 @@
-import { describe, expect, it } from "vitest";
+import { afterEach, describe, expect, it, vi } from "vitest";
 import {
   completedWorkoutsCount,
+  countCompletedInCurrentWeek,
   formatCompactKg,
   getExercisePR,
   personalRecordsExerciseCount,
@@ -61,10 +62,79 @@ describe("personalRecordsExerciseCount", () => {
 });
 
 describe("weeklyVolumeSeriesNow", () => {
+  afterEach(() => {
+    vi.useRealTimers();
+  });
+
   it("returns 7 volume slots", () => {
     const { volumeKg } = weeklyVolumeSeriesNow([]);
     expect(volumeKg).toHaveLength(7);
   });
+
+  function done(startedAt: string, weightKg: number, reps: number) {
+    return {
+      startedAt,
+      endedAt: startedAt,
+      items: [{ type: "strength", sets: [{ weightKg, reps }] }],
+    };
+  }
+
+  // Domain invariant: week boundaries are Europe/Kyiv, not the host tz.
+  // Mon 2026-06-08 00:00 Kyiv (EEST, UTC+3) = 2026-06-07T21:00:00Z.
+  it("anchors the Mon..Sun week to Europe/Kyiv regardless of host tz", () => {
+    vi.useFakeTimers();
+    vi.setSystemTime(new Date("2026-06-10T12:00:00Z")); // Wed of that week
+
+    const { weekStartMs, volumeKg } = weeklyVolumeSeriesNow([
+      done("2026-06-07T20:30:00Z", 100, 1), // Sun 23:30 Kyiv → previous week
+      done("2026-06-07T21:30:00Z", 60, 5), // Mon 00:30 Kyiv → idx 0
+      done("2026-06-10T10:00:00Z", 40, 10), // Wed 13:00 Kyiv → idx 2
+    ]);
+
+    expect(weekStartMs).toBe(Date.parse("2026-06-07T21:00:00Z"));
+    expect(volumeKg).toEqual([300, 0, 400, 0, 0, 0, 0]);
+  });
+
+  // DST week: Kyiv springs forward Sun 2026-03-29 03:00 EET → 04:00 EEST,
+  // so the week Mon 2026-03-23 .. Sun 2026-03-29 is 167 hours long.
+  it("buckets days correctly across the spring-forward DST week", () => {
+    vi.useFakeTimers();
+    vi.setSystemTime(new Date("2026-03-26T12:00:00Z")); // Thu of DST week
+
+    const { weekStartMs, volumeKg } = weeklyVolumeSeriesNow([
+      done("2026-03-22T22:30:00Z", 60, 5), // Mon 00:30 Kyiv (EET) → idx 0
+      done("2026-03-29T20:30:00Z", 100, 1), // Sun 23:30 Kyiv (EEST) → idx 6
+      done("2026-03-29T21:30:00Z", 999, 1), // Mon 00:30 Kyiv next week → out
+    ]);
+
+    // Mon 2026-03-23 00:00 Kyiv (EET, UTC+2) = 2026-03-22T22:00:00Z.
+    expect(weekStartMs).toBe(Date.parse("2026-03-22T22:00:00Z"));
+    expect(volumeKg).toEqual([300, 0, 0, 0, 0, 0, 100]);
+  });
+});
+
+describe("countCompletedInCurrentWeek", () => {
+  afterEach(() => {
+    vi.useRealTimers();
+  });
+
+  it("uses the Kyiv week boundary, not the host-local one", () => {
+    vi.useFakeTimers();
+    vi.setSystemTime(new Date("2026-06-10T12:00:00Z"));
+
+    const mk = (startedAt: string) => ({
+      startedAt,
+      endedAt: startedAt,
+      items: [],
+    });
+    expect(
+      countCompletedInCurrentWeek([
+        mk("2026-06-07T20:30:00Z"), // Sun 23:30 Kyiv → previous week
+        mk("2026-06-07T21:30:00Z"), // Mon 00:30 Kyiv → this week
+        mk("2026-06-12T10:00:00Z"), // Fri → this week
+      ]),
+    ).toBe(2);
+  });
 });
 
 describe("formatCompactKg", () => {
diff --git a/packages/fizruk-domain/src/lib/workoutStats.ts b/packages/fizruk-domain/src/lib/workoutStats.ts
diff --git a/packages/shared/src/utils/date.test.ts b/packages/shared/src/utils/date.test.ts
diff --git a/packages/shared/src/utils/date.ts b/packages/shared/src/utils/date.ts
