@dzhechkov/harness-core 0.4.2 → 0.4.3

package/src/usage.ts

@@ -128,6 +128,13 @@ export interface WeeklyResetAnchor {
   readonly weekday: number; // local Date#getDay(): Sun=0, Mon=1, ...
   readonly hour: number;
   readonly minute: number;
+  /** Explicit UTC offset in minutes (e.g. `+03:00` → 180). When present, the boundary is an
+   * ABSOLUTE instant, immune to the server's timezone. When absent (legacy `Wed 08:59`), the
+   * boundary is computed in server-local time — PROVEN wrong when the machine's tz differs from
+   * the account's reset tz (idea c8513be9: the same wall-clock instant produced window starts a
+   * WEEK apart under UTC vs Europe/Moscow, so the counter held the old week for hours after the
+   * real reset while printing the "correct" clock time). */
+  readonly offsetMinutes?: number;
 }
 
 /** Optional, plan-dependent calibration limits from `.dz/config.json`. Absent ⇒ pct is `null`. */
@@ -231,17 +238,31 @@ function hasOwn(obj: object, key: string): boolean {
 }
 
 function canonicalWeeklyResetAnchor(anchor: WeeklyResetAnchor): string {
-  return `${DAY_TO_WEEKDAY[anchor.weekday] ?? 'Wed'} ${String(anchor.hour).padStart(2, '0')}:${String(anchor.minute).padStart(2, '0')}`;
+  const base = `${DAY_TO_WEEKDAY[anchor.weekday] ?? 'Wed'} ${String(anchor.hour).padStart(2, '0')}:${String(anchor.minute).padStart(2, '0')}`;
+  // The offset MUST survive canonicalization: this function silently dropped it on first
+  // implementation, degrading a pinned absolute instant back to the server-tz form the offset
+  // exists to escape (idea c8513be9 — caught live: the pin landed, the warning kept firing).
+  if (anchor.offsetMinutes === undefined) return base;
+  const sign = anchor.offsetMinutes < 0 ? '-' : '+';
+  const abs = Math.abs(anchor.offsetMinutes);
+  return `${base} ${sign}${String(Math.floor(abs / 60)).padStart(2, '0')}:${String(abs % 60).padStart(2, '0')}`;
 }
 
 export function parseWeeklyResetAnchor(anchor: string): WeeklyResetAnchor | null {
-  const m = /^\s*(sun|mon|tue|wed|thu|fri|sat)\s+(\d{1,2}):(\d{2})\s*$/i.exec(anchor);
+  const m = /^\s*(sun|mon|tue|wed|thu|fri|sat)\s+(\d{1,2}):(\d{2})(?:\s+([+-])(\d{2}):(\d{2}))?\s*$/i.exec(anchor);
   if (!m) return null;
   const weekday = WEEKDAY_TO_DAY[m[1]!.toLowerCase()];
   const hour = Number(m[2]);
   const minute = Number(m[3]);
   if (weekday === undefined || !Number.isInteger(hour) || !Number.isInteger(minute)) return null;
   if (hour < 0 || hour > 23 || minute < 0 || minute > 59) return null;
+  if (m[4] !== undefined) {
+    const offH = Number(m[5]);
+    const offM = Number(m[6]);
+    if (!Number.isInteger(offH) || !Number.isInteger(offM) || offH > 14 || offM > 59) return null;
+    const sign = m[4] === '-' ? -1 : 1;
+    return { weekday, hour, minute, offsetMinutes: sign * (offH * 60 + offM) };
+  }
   return { weekday, hour, minute };
 }
 
@@ -250,6 +271,25 @@ export function weeklyWindowFor(nowMs: number, anchor: string): UsageWindow | nu
   const parsed = parseWeeklyResetAnchor(anchor);
   if (!parsed) return null;
 
+  if (parsed.offsetMinutes !== undefined) {
+    // ABSOLUTE-instant math (idea c8513be9): shift into the anchor's fixed offset, do the weekday
+    // arithmetic with UTC getters, shift back. No local-Date call ⇒ the boundary cannot move with
+    // the server's timezone — the property the legacy branch below demonstrably lacks.
+    const offMs = parsed.offsetMinutes * 60_000;
+    const shifted = new Date(nowMs + offMs);
+    const boundaryShifted = Date.UTC(
+      shifted.getUTCFullYear(),
+      shifted.getUTCMonth(),
+      shifted.getUTCDate() + (parsed.weekday - shifted.getUTCDay()),
+      parsed.hour,
+      parsed.minute,
+      0,
+      0,
+    );
+    let startedAtMs = boundaryShifted - offMs;
+    if (startedAtMs > nowMs) startedAtMs -= 7 * 24 * 60 * 60_000;
+    return { startedAtMs, resetsAtMs: startedAtMs + 7 * 24 * 60 * 60_000 };
+  }
   const now = new Date(nowMs);
   const candidate = new Date(
     now.getFullYear(),