exe-watcher 0.2.6 → 0.2.8

package/dist/cli.js

@@ -6730,11 +6730,43 @@ function parseDateRangeFlags(from, to) {
   return { start, end };
 }
 
+// src/progressive-backfill.ts
+var MS_PER_DAY3 = 24 * 60 * 60 * 1e3;
+var DEFAULT_COLD_START_HISTORY_DAYS = 7;
+var DEFAULT_PROGRESSIVE_CHUNK_DAYS = 30;
+function nextLocalMidnight(dateString) {
+  return new Date(
+    parseInt(dateString.slice(0, 4), 10),
+    parseInt(dateString.slice(5, 7), 10) - 1,
+    parseInt(dateString.slice(8, 10), 10) + 1
+  );
+}
+function computeProgressiveBackfillStart({
+  lastComputedDate,
+  todayStart,
+  yesterdayEnd,
+  backfillDays,
+  coldStartHistoryDays = DEFAULT_COLD_START_HISTORY_DAYS,
+  progressiveChunkDays = DEFAULT_PROGRESSIVE_CHUNK_DAYS
+}) {
+  const fullBackfillStart = new Date(todayStart.getTime() - backfillDays * 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);
+  }
+  return gapStart;
+}
+
 // src/cli.ts
 import { createRequire as createRequire2 } from "module";
 var require2 = createRequire2(import.meta.url);
 var { version } = require2("../package.json");
-var MS_PER_DAY3 = 24 * 60 * 60 * 1e3;
+var MS_PER_DAY4 = 24 * 60 * 60 * 1e3;
 var BACKFILL_DAYS = 365;
 function toDateString(date) {
   return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, "0")}-${String(date.getDate()).padStart(2, "0")}`;
@@ -7017,7 +7049,7 @@ program.command("status").description("Compact status output (today + week + mon
     const now = /* @__PURE__ */ new Date();
     const todayStart = new Date(now.getFullYear(), now.getMonth(), now.getDate());
     const yesterdayEnd = new Date(todayStart.getTime() - 1);
-    const yesterdayStr = toDateString(new Date(todayStart.getTime() - MS_PER_DAY3));
+    const yesterdayStr = toDateString(new Date(todayStart.getTime() - MS_PER_DAY4));
     const isAllProviders = pf === "all";
     const dailyCacheScope = buildDailyCacheScopeKey(opts.project, opts.exclude);
     const cache = await withDailyCacheLock(async () => {
@@ -7028,16 +7060,13 @@ 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 PROGRESSIVE_CHUNK_DAYS = 30;
-      const isColdStart = !c.lastComputedDate;
-      const gapStart = c.lastComputedDate ? new Date(
-        parseInt(c.lastComputedDate.slice(0, 4)),
-        parseInt(c.lastComputedDate.slice(5, 7)) - 1,
-        parseInt(c.lastComputedDate.slice(8, 10)) + 1
-      ) : new Date(todayStart.getTime() - BACKFILL_DAYS * MS_PER_DAY3);
-      const fullBackfillStart = new Date(todayStart.getTime() - BACKFILL_DAYS * MS_PER_DAY3);
-      const effectiveGapStart = isColdStart ? todayStart : gapStart < fullBackfillStart ? fullBackfillStart : yesterdayEnd.getTime() - gapStart.getTime() > PROGRESSIVE_CHUNK_DAYS * MS_PER_DAY3 ? new Date(yesterdayEnd.getTime() - PROGRESSIVE_CHUNK_DAYS * MS_PER_DAY3) : gapStart;
-      if (!isColdStart && effectiveGapStart.getTime() <= yesterdayEnd.getTime()) {
+      const effectiveGapStart = computeProgressiveBackfillStart({
+        lastComputedDate: c.lastComputedDate,
+        todayStart,
+        yesterdayEnd,
+        backfillDays: BACKFILL_DAYS
+      });
+      if (effectiveGapStart.getTime() <= yesterdayEnd.getTime()) {
         const gapRange = { start: effectiveGapStart, end: yesterdayEnd };
         const gapProjects = filterProjectsByName(await parseAllSessions(gapRange, "all"), opts.project, opts.exclude);
         const gapDays = fillMissingDays(gapRange.start, gapRange.end, aggregateProjectsIntoDays(gapProjects));
@@ -7112,16 +7141,11 @@ program.command("status").description("Compact status output (today + week + mon
       for (const [name, cost] of Object.entries(providerTotals)) {
         providers.push({ name: displayNameByName.get(name) ?? name, cost });
       }
-      for (const p of allProviders) {
-        if (providers.some((pc) => pc.name === p.displayName)) continue;
-        const sources = await p.discoverSessions();
-        if (sources.length > 0) providers.push({ name: p.displayName, cost: 0 });
-      }
     } else {
       const display = displayNameByName.get(pf) ?? pf;
       providers.push({ name: display, cost: currentData.cost });
     }
-    const historyStartStr = toDateString(new Date(todayStart.getTime() - BACKFILL_DAYS * MS_PER_DAY3));
+    const historyStartStr = toDateString(new Date(todayStart.getTime() - BACKFILL_DAYS * MS_PER_DAY4));
     const allCacheDays = getDaysInRange(cache, historyStartStr, yesterdayStr);
     const fullHistory = [...allCacheDays, ...todayDays.filter((d) => d.date > yesterdayStr)];
     const dailyHistory = fullHistory.map((d) => {
@@ -7205,11 +7229,11 @@ program.command("status").description("Compact status output (today + week + mon
       const [proj7d, proj30d] = await Promise.all([
         Promise.race([
           parseAllSessions(getDateRange2("week").range, "all"),
-          new Promise((r) => setTimeout(() => r([]), 3e3))
+          new Promise((r) => setTimeout(() => r([]), 500))
         ]),
         Promise.race([
           parseAllSessions(getDateRange2("30days").range, "all"),
-          new Promise((r) => setTimeout(() => r([]), 3e3))
+          new Promise((r) => setTimeout(() => r([]), 500))
         ])
       ]);
       projectSpend = buildProjectSpend(allTodayProjects, proj7d, proj30d);
@@ -7217,7 +7241,9 @@ program.command("status").description("Compact status output (today + week + mon
       projectSpend = buildProjectSpend(allTodayProjects, [], []);
     }
     const diagnostics = { daysCount, parseTimeMs, warnings };
-    console.log(JSON.stringify(buildMenubarPayload(currentData, providers, optimize, dailyHistory, agentStats, projectSpend, exeOsDetected, statsFileAge, diagnostics)));
+    const payload = buildMenubarPayload(currentData, providers, optimize, dailyHistory, agentStats, projectSpend, exeOsDetected, statsFileAge, diagnostics);
+    const json = JSON.stringify(payload);
+    console.log(json);
     return;
   }
   if (opts.format === "json") {