exe-watcher 0.2.9 → 0.2.11

package/dist/cli.js

@@ -6760,6 +6760,7 @@ function nextLocalMidnight(dateString) {
 }
 function computeProgressiveBackfillStart({
   lastComputedDate,
+  oldestCachedDate,
   todayStart,
   yesterdayEnd,
   backfillDays,
@@ -6767,14 +6768,23 @@ function computeProgressiveBackfillStart({
   progressiveChunkDays = DEFAULT_PROGRESSIVE_CHUNK_DAYS
 }) {
   const fullBackfillStart = new Date(todayStart.getTime() - backfillDays * MS_PER_DAY3);
+  const neededStart = new Date(todayStart.getTime() - (coldStartHistoryDays - 1) * MS_PER_DAY3);
   if (!lastComputedDate) {
     const priorHistoryDays = Math.max(coldStartHistoryDays - 1, 0);
     return new Date(todayStart.getTime() - priorHistoryDays * MS_PER_DAY3);
   }
   const gapStart = nextLocalMidnight(lastComputedDate);
-  if (gapStart < fullBackfillStart) return fullBackfillStart;
-  if (yesterdayEnd.getTime() - gapStart.getTime() > progressiveChunkDays * MS_PER_DAY3) {
-    return new Date(yesterdayEnd.getTime() - progressiveChunkDays * MS_PER_DAY3);
+  if (gapStart.getTime() <= yesterdayEnd.getTime()) {
+    if (gapStart < fullBackfillStart) return fullBackfillStart;
+    if (yesterdayEnd.getTime() - gapStart.getTime() > progressiveChunkDays * MS_PER_DAY3) {
+      return new Date(yesterdayEnd.getTime() - progressiveChunkDays * MS_PER_DAY3);
+    }
+    return gapStart;
+  }
+  if (oldestCachedDate && neededStart.getTime() < new Date(oldestCachedDate).getTime()) {
+    const backTarget = new Date(oldestCachedDate);
+    const chunkStart = new Date(backTarget.getTime() - progressiveChunkDays * MS_PER_DAY3);
+    return chunkStart < neededStart ? neededStart : chunkStart;
   }
   return gapStart;
 }
@@ -7078,18 +7088,22 @@ program.command("status").description("Compact status output (today + week + mon
         const latestFresh = freshDays.length > 0 ? freshDays[freshDays.length - 1].date : null;
         c = { ...c, days: freshDays, lastComputedDate: latestFresh };
       }
+      const oldestCachedDate = c.days.length > 0 ? c.days[0].date : null;
       const effectiveGapStart = computeProgressiveBackfillStart({
         lastComputedDate: c.lastComputedDate,
+        oldestCachedDate,
         todayStart,
         yesterdayEnd,
         backfillDays: BACKFILL_DAYS,
         coldStartHistoryDays: selectedPeriodHistoryDays
       });
-      if (effectiveGapStart.getTime() <= yesterdayEnd.getTime()) {
-        const gapRange = { start: effectiveGapStart, end: yesterdayEnd };
+      const gapEnd = oldestCachedDate && effectiveGapStart.getTime() < new Date(oldestCachedDate).getTime() ? new Date(new Date(oldestCachedDate).getTime() - MS_PER_DAY4) : yesterdayEnd;
+      if (effectiveGapStart.getTime() <= gapEnd.getTime()) {
+        const gapRange = { start: effectiveGapStart, end: gapEnd };
         const gapProjects = filterProjectsByName(await parseAllSessions(gapRange, "all"), opts.project, opts.exclude);
         const gapDays = fillMissingDays(gapRange.start, gapRange.end, aggregateProjectsIntoDays(gapProjects));
-        c = addNewDays(c, gapDays, yesterdayStr, { coveredThrough: yesterdayStr });
+        const coveredThrough = gapEnd.getTime() >= yesterdayEnd.getTime() ? yesterdayStr : void 0;
+        c = addNewDays(c, gapDays, yesterdayStr, coveredThrough ? { coveredThrough } : void 0);
         await saveDailyCache(c);
       }
       return c;