exe-watcher 0.2.12 → 0.2.14

package/dist/cli.js

@@ -1660,7 +1660,8 @@ function emptyEntry(date) {
     oneShotTurns: 0,
     models: {},
     categories: {},
-    providers: {}
+    providers: {},
+    projects: {}
   };
 }
 function emptyProviderBreakdown() {
@@ -1700,10 +1701,20 @@ function aggregateProjectsIntoDays(projects) {
     }
     return breakdown;
   };
+  const ensureProject = (date, projectName) => {
+    const day = ensure(date);
+    let project = day.projects[projectName];
+    if (!project) {
+      project = { cost: 0, sessions: 0 };
+      day.projects[projectName] = project;
+    }
+    return project;
+  };
   for (const project of projects) {
     for (const session of project.sessions) {
       const sessionDate = dateKey(session.firstTimestamp);
       ensure(sessionDate).sessions += 1;
+      ensureProject(sessionDate, project.project).sessions += 1;
       const providersSeenInSession = /* @__PURE__ */ new Set();
       for (const turn of session.turns) {
         if (turn.assistantCalls.length === 0) continue;
@@ -1748,6 +1759,7 @@ function aggregateProjectsIntoDays(projects) {
           model.cacheReadTokens += call.usage.cacheReadInputTokens;
           model.cacheWriteTokens += call.usage.cacheCreationInputTokens;
           callDay.models[call.model] = model;
+          ensureProject(callDate, project.project).cost += call.costUSD;
         }
         for (const [provider, calls] of callsByProvider) {
           providersSeenInSession.add(provider);
@@ -3670,31 +3682,35 @@ function estimateAgentCosts(stats) {
     }))
   };
 }
-function buildProjectSpend(projects24h, projects7d, projects30d) {
-  const aggregate = (projects) => {
+function buildProjectSpendFromDays(selectedDays, days24h, days7d, days30d) {
+  const aggregate = (days) => {
     const byName = {};
-    for (const p of projects) {
-      const name = cleanProjectName(p.project);
-      if (!byName[name]) byName[name] = { cost: 0, sessions: 0 };
-      byName[name].cost += p.totalCostUSD;
-      byName[name].sessions += p.sessions.length;
+    for (const day of days) {
+      for (const [projectName, totals] of Object.entries(day.projects)) {
+        const name = cleanProjectName(projectName);
+        if (!byName[name]) byName[name] = { cost: 0, sessions: 0 };
+        byName[name].cost += totals.cost;
+        byName[name].sessions += totals.sessions;
+      }
     }
     return byName;
   };
-  const d24 = aggregate(projects24h);
-  const d7 = aggregate(projects7d);
-  const d30 = aggregate(projects30d);
-  const allNames = /* @__PURE__ */ new Set([...Object.keys(d24), ...Object.keys(d7), ...Object.keys(d30)]);
+  const selected = aggregate(selectedDays);
+  const d24 = aggregate(days24h);
+  const d7 = aggregate(days7d);
+  const d30 = aggregate(days30d);
+  const allNames = /* @__PURE__ */ new Set([...Object.keys(selected), ...Object.keys(d24), ...Object.keys(d7), ...Object.keys(d30)]);
   return Array.from(allNames).map((name) => ({
     name,
     cost24h: d24[name]?.cost ?? 0,
     cost7d: d7[name]?.cost ?? 0,
     cost30d: d30[name]?.cost ?? 0,
-    sessions: d30[name]?.sessions ?? d7[name]?.sessions ?? d24[name]?.sessions ?? 0
-  })).filter((d) => d.cost30d > 0 || d.cost7d > 0 || d.cost24h > 0).sort((a, b) => b.cost30d - a.cost30d);
+    selectedPeriodCost: selected[name]?.cost ?? 0,
+    sessions: selected[name]?.sessions ?? d30[name]?.sessions ?? d7[name]?.sessions ?? d24[name]?.sessions ?? 0
+  })).filter((d) => d.selectedPeriodCost > 0).sort((a, b) => b.selectedPeriodCost - a.selectedPeriodCost);
 }
 function cleanProjectName(dirName) {
-  const base = dirName.replace(/--worktrees-.*$/, "");
+  const base = dirName.replace(/--worktrees-.*$/, "").replace(/-\.worktrees-.*/, "").replace(/\/\.worktrees\/.*/, "");
   const parts = base.split("-");
   const usersIdx = parts.indexOf("Users");
   if (usersIdx >= 0 && usersIdx + 2 < parts.length) {
@@ -3795,7 +3811,7 @@ import { createHash as createHash3, randomBytes as randomBytes5 } from "crypto";
 import { existsSync as existsSync3 } from "fs";
 import { mkdir as mkdir7, open as open5, readFile as readFile7, rename as rename6, unlink as unlink3 } from "fs/promises";
 import { join as join16 } from "path";
-var DAILY_CACHE_VERSION = 4;
+var DAILY_CACHE_VERSION = 5;
 var DEFAULT_DAILY_CACHE_SCOPE = "global";
 var DAILY_CACHE_FILENAME = "daily-cache.json";
 function getCachePath3(scopeKey) {
@@ -7134,17 +7150,18 @@ program.command("status").description("Compact status output (today + week + mon
     const parseTimeMs = Date.now() - parseStart;
     const todayDays = aggregateProjectsIntoDays(todayProjects);
     let daysCount = 0;
+    let selectedPeriodDays = [];
     {
       const rangeStartStr = toDateString(periodInfo.range.start);
       const rangeEndStr = toDateString(periodInfo.range.end);
       const historicalDays = getDaysInRange(cache, rangeStartStr, yesterdayStr);
       const todayOnly = todayDays.filter((d) => d.date > yesterdayStr && d.date <= rangeEndStr);
-      const allDays = [...historicalDays, ...todayOnly].sort((a, b) => a.date.localeCompare(b.date));
-      daysCount = allDays.length;
+      selectedPeriodDays = [...historicalDays, ...todayOnly].sort((a, b) => a.date.localeCompare(b.date));
+      daysCount = selectedPeriodDays.length;
       if (isAllProviders) {
-        currentData = buildPeriodDataFromDays(allDays, periodInfo.label);
+        currentData = buildPeriodDataFromDays(selectedPeriodDays, periodInfo.label);
       } else {
-        const providerDays = filterDaysToProvider(allDays, pf);
+        const providerDays = filterDaysToProvider(selectedPeriodDays, pf);
         currentData = buildPeriodDataFromDays(providerDays, periodInfo.label);
       }
     }
@@ -7257,19 +7274,21 @@ program.command("status").description("Compact status output (today + week + mon
     }
     let projectSpend = null;
     try {
-      const [proj7d, proj30d] = await Promise.all([
-        Promise.race([
-          parseAllSessions(getDateRange2("week").range, "all"),
-          new Promise((r) => setTimeout(() => r([]), 500))
-        ]),
-        Promise.race([
-          parseAllSessions(getDateRange2("30days").range, "all"),
-          new Promise((r) => setTimeout(() => r([]), 500))
-        ])
-      ]);
-      projectSpend = buildProjectSpend(allTodayProjects, proj7d, proj30d);
+      const weekStartStr = toDateString(getDateRange2("week").range.start);
+      const thirtyDayStartStr = toDateString(getDateRange2("30days").range.start);
+      const todayOnlyDays = todayDays.filter((d) => d.date > yesterdayStr);
+      const days7d = [
+        ...getDaysInRange(cache, weekStartStr, yesterdayStr),
+        ...todayOnlyDays
+      ].sort((a, b) => a.date.localeCompare(b.date));
+      const days30d = [
+        ...getDaysInRange(cache, thirtyDayStartStr, yesterdayStr),
+        ...todayOnlyDays
+      ].sort((a, b) => a.date.localeCompare(b.date));
+      projectSpend = buildProjectSpendFromDays(selectedPeriodDays, todayOnlyDays, days7d, days30d);
     } catch {
-      projectSpend = buildProjectSpend(allTodayProjects, [], []);
+      const todayOnlyDays = todayDays.filter((d) => d.date > yesterdayStr);
+      projectSpend = buildProjectSpendFromDays(selectedPeriodDays, todayOnlyDays, [], []);
     }
     const diagnostics = { daysCount, parseTimeMs, warnings };
     const payload = buildMenubarPayload(currentData, providers, optimize, dailyHistory, agentStats, projectSpend, exeOsDetected, statsFileAge, diagnostics);
@@ -7569,7 +7588,7 @@ program.command("plan [action] [id]").description("Show or configure a subscript
   console.log(`  Config saved to ${getConfigFilePath()}
 `);
 });
-program.command("optimize").description("Find token waste and get exact fixes").option("-p, --period <period>", "Analysis period: today, week, 30days, month, all", "30days").option("--provider <provider>", "Filter by provider: all, claude, codex, cursor", "all").action(async (opts) => {
+program.command("optimize").description("Find token waste and get exact fixes").option("-p, --period <period>", "Analysis period: today, week, 30days, month, all", "week").option("--provider <provider>", "Filter by provider: all, claude, codex, cursor", "all").action(async (opts) => {
   await loadPricing();
   const { range, label } = getDateRange2(opts.period);
   const scanPromise = prewarmOptimizeScan(range);