exe-watcher 0.2.3 → 0.2.5

package/dist/cli.js

@@ -2479,6 +2479,10 @@ function createParser(source, seenKeys) {
           sessionModel = entry.payload?.model;
           continue;
         }
+        if (entry.type === "turn_context" && entry.payload?.model) {
+          sessionModel = entry.payload.model;
+          continue;
+        }
         if (entry.type === "response_item" && entry.payload?.type === "function_call") {
           const rawName = entry.payload.name ?? "";
           pendingTools.push(toolNameMap[rawName] ?? rawName);
@@ -3391,17 +3395,13 @@ async function scanProjectDirs(dirs, seenMsgIds, dateRange) {
       }
     }
   }
-  const projects = [];
-  for (const [dirName, sessions] of projectMap) {
-    projects.push({
-      project: dirName,
-      projectPath: unsanitizePath(dirName),
-      sessions,
-      totalCostUSD: sessions.reduce((s, sess) => s + sess.totalCostUSD, 0),
-      totalApiCalls: sessions.reduce((s, sess) => s + sess.apiCalls, 0)
-    });
-  }
-  return projects;
+  return Array.from(projectMap.entries()).map(([dirName, sessions]) => ({
+    project: dirName,
+    projectPath: unsanitizePath(dirName),
+    sessions,
+    totalCostUSD: sessions.reduce((s, sess) => s + sess.totalCostUSD, 0),
+    totalApiCalls: sessions.reduce((s, sess) => s + sess.apiCalls, 0)
+  }));
 }
 function providerCallToTurn(call) {
   const tools = call.tools;
@@ -3507,32 +3507,14 @@ function cacheKey(dateRange, providerFilter, sourceFingerprint = "static") {
   const s = dateRange ? `${dateRange.start.getTime()}:${dateRange.end.getTime()}` : "none";
   return `${s}:${providerFilter ?? "all"}:${sourceFingerprint}`;
 }
-async function buildSourceFingerprint(path) {
-  try {
-    const fp = await stat10(path);
-    if (!fp.isDirectory()) return `f:${Math.round(fp.mtimeMs)}:${fp.size}`;
-    const entries = await readdir8(path);
-    const children = await Promise.all(entries.map(async (entry) => stat10(join15(path, entry)).catch(() => null)));
-    let childCount = 0;
-    let childSizeBytes = 0;
-    let newestChildMtimeMs = 0;
-    for (const child of children) {
-      if (!child) continue;
-      childCount += 1;
-      childSizeBytes += child.size;
-      newestChildMtimeMs = Math.max(newestChildMtimeMs, child.mtimeMs);
-    }
-    return `d:${Math.round(fp.mtimeMs)}:${fp.size}:${childCount}:${Math.round(newestChildMtimeMs)}:${childSizeBytes}`;
-  } catch {
-    return "missing";
+function buildCacheFingerprint(sources) {
+  let hash = sources.length;
+  for (const s of sources) {
+    for (let i = 0; i < s.path.length; i++) {
+      hash = (hash << 5) + hash + s.path.charCodeAt(i) | 0;
+    }
   }
-}
-async function buildCacheFingerprint(sources) {
-  const parts = await Promise.all(sources.map(async (source) => {
-    const fingerprint = await buildSourceFingerprint(source.path);
-    return `${source.provider}:${source.project}:${source.path}:${fingerprint}`;
-  }));
-  return parts.sort().join("|");
+  return `${sources.length}:${hash >>> 0}`;
 }
 async function getSourceContext(providerFilter) {
   const key = sourceContextCacheKey(providerFilter);
@@ -3542,7 +3524,7 @@ async function getSourceContext(providerFilter) {
   }
   const promise = (async () => {
     const sources = await discoverAllSessions(providerFilter);
-    const fingerprint = await buildCacheFingerprint(sources);
+    const fingerprint = buildCacheFingerprint(sources);
     return { sources, fingerprint };
   })();
   inFlightSourceContexts.set(key, promise);
@@ -7046,13 +7028,17 @@ 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);
-      if (gapStart.getTime() <= yesterdayEnd.getTime()) {
-        const gapRange = { start: gapStart, end: yesterdayEnd };
+      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 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));
         c = addNewDays(c, gapDays, yesterdayStr, { coveredThrough: yesterdayStr });
@@ -7214,11 +7200,22 @@ program.command("status").description("Compact status output (today + week + mon
     if (agentStats) {
       agentStats = estimateAgentCosts(agentStats);
     }
-    const [proj7d, proj30d] = await Promise.all([
-      parseAllSessions(getDateRange2("week").range, "all"),
-      parseAllSessions(getDateRange2("30days").range, "all")
-    ]);
-    const projectSpend = buildProjectSpend(allTodayProjects, proj7d, proj30d);
+    let projectSpend = null;
+    try {
+      const [proj7d, proj30d] = await Promise.all([
+        Promise.race([
+          parseAllSessions(getDateRange2("week").range, "all"),
+          new Promise((r) => setTimeout(() => r([]), 3e3))
+        ]),
+        Promise.race([
+          parseAllSessions(getDateRange2("30days").range, "all"),
+          new Promise((r) => setTimeout(() => r([]), 3e3))
+        ])
+      ]);
+      projectSpend = buildProjectSpend(allTodayProjects, proj7d, proj30d);
+    } catch {
+      projectSpend = buildProjectSpend(allTodayProjects, [], []);
+    }
     const diagnostics = { daysCount, parseTimeMs, warnings };
     console.log(JSON.stringify(buildMenubarPayload(currentData, providers, optimize, dailyHistory, agentStats, projectSpend, exeOsDetected, statsFileAge, diagnostics)));
     return;