exe-watcher 0.2.2 → 0.2.3

package/dist/cli.js

@@ -48,12 +48,23 @@ async function fetchAndCachePricing() {
   if (!response.ok) throw new Error(`HTTP ${response.status}`);
   const data = await response.json();
   const pricing = /* @__PURE__ */ new Map();
+  const preferredStripped = /* @__PURE__ */ new Map();
+  const fallbackStripped = /* @__PURE__ */ new Map();
   for (const [name, entry] of Object.entries(data)) {
     const costs = parseLiteLLMEntry(entry);
     if (!costs) continue;
     pricing.set(name, costs);
     const stripped = name.replace(/^[^/]+\//, "");
-    if (stripped !== name && !pricing.has(stripped)) pricing.set(stripped, costs);
+    if (stripped === name) continue;
+    const isDirectProvider = DIRECT_PROVIDER_PREFIXES.some((prefix) => name.toLowerCase().startsWith(prefix));
+    const target = isDirectProvider ? preferredStripped : fallbackStripped;
+    if (!target.has(stripped)) target.set(stripped, costs);
+  }
+  for (const [name, costs] of preferredStripped) {
+    if (!pricing.has(name)) pricing.set(name, costs);
+  }
+  for (const [name, costs] of fallbackStripped) {
+    if (!pricing.has(name)) pricing.set(name, costs);
   }
   await mkdir5(getCacheDir(), { recursive: true });
   const finalPath = getCachePath();
@@ -114,18 +125,17 @@ function getCanonicalName(model) {
 }
 function getModelCosts(model) {
   const canonical = resolveAlias(getCanonicalName(model));
-  if (Object.hasOwn(FALLBACK_PRICING, canonical)) return FALLBACK_PRICING[canonical];
-  if (pricingCache?.has(canonical)) return pricingCache.get(canonical);
-  for (const [key, costs] of pricingCache ?? /* @__PURE__ */ new Map()) {
-    if (canonical.startsWith(key)) return costs;
-  }
-  for (const [key, costs] of Object.entries(FALLBACK_PRICING)) {
-    if (canonical.startsWith(key)) return costs;
-  }
-  return null;
+  const exactFetched = pricingCache?.get(canonical) ?? null;
+  const exactFallback = Object.hasOwn(FALLBACK_PRICING, canonical) ? FALLBACK_PRICING[canonical] : null;
+  const exactMatch = mergeModelCosts(exactFetched, exactFallback);
+  if (exactMatch) return exactMatch;
+  const prefixFetched = findPrefixMatch(pricingCache ?? /* @__PURE__ */ new Map(), canonical);
+  const prefixFallback = findPrefixMatch(new Map(Object.entries(FALLBACK_PRICING)), canonical);
+  return mergeModelCosts(prefixFetched, prefixFallback);
 }
 function calculateCost(model, inputTokens, outputTokens, cacheCreationTokens, cacheReadTokens, webSearchRequests, speed = "standard") {
-  const costs = getModelCosts(model);
+  const baseCosts = getModelCosts(model);
+  const costs = applyContextTier(baseCosts, inputTokens);
   if (!costs) return 0;
   const multiplier = speed === "fast" ? costs.fastMultiplier : 1;
   return multiplier * (inputTokens * costs.inputCostPerToken + outputTokens * costs.outputCostPerToken + cacheCreationTokens * costs.cacheWriteCostPerToken + cacheReadTokens * costs.cacheReadCostPerToken + webSearchRequests * costs.webSearchCostPerRequest);
@@ -151,10 +161,17 @@ function getShortModelName(model) {
     "gpt-4.1-mini": "GPT-4.1 Mini",
     "gpt-4.1": "GPT-4.1",
     "gpt-5.5": "GPT-5.5",
+    "gpt-5.5-pro": "GPT-5.5 Pro",
+    "gpt-5.4-pro": "GPT-5.4 Pro",
+    "gpt-5.4-nano": "GPT-5.4 Nano",
     "gpt-5.4-mini": "GPT-5.4 Mini",
     "gpt-5.4": "GPT-5.4",
     "gpt-5.3-codex-spark": "GPT-5.3 Codex Spark",
     "gpt-5.3-codex": "GPT-5.3 Codex",
+    "gpt-5.2": "GPT-5.2",
+    "gpt-5.1": "GPT-5.1",
+    "gpt-5-codex": "GPT-5-Codex",
+    "gpt-5-nano": "GPT-5 Nano",
     "gpt-5-mini": "GPT-5 Mini",
     "gpt-5": "GPT-5",
     "gemini-2.5-pro": "Gemini 2.5 Pro",
@@ -163,12 +180,41 @@ function getShortModelName(model) {
     "MiniMax-M2.7-highspeed": "MiniMax M2.7 Highspeed",
     "MiniMax-M2.7": "MiniMax M2.7"
   };
-  for (const [key, name] of Object.entries(shortNames2)) {
+  if (Object.hasOwn(shortNames2, canonical)) return shortNames2[canonical];
+  for (const [key, name] of Object.entries(shortNames2).sort((a, b) => b[0].length - a[0].length)) {
     if (canonical.startsWith(key)) return name;
   }
   return canonical;
 }
-var LITELLM_URL, CACHE_TTL_MS2, WEB_SEARCH_COST, FALLBACK_PRICING, pricingCache, BUILTIN_ALIASES, userAliases;
+function mergeModelCosts(primary, fallback) {
+  if (!primary && !fallback) return null;
+  if (!primary) return fallback ?? null;
+  if (!fallback) return primary;
+  return {
+    ...fallback,
+    ...primary,
+    contextTiers: primary.contextTiers ?? fallback.contextTiers
+  };
+}
+function findPrefixMatch(entries, canonical) {
+  for (const [key, costs] of entries) {
+    if (canonical.startsWith(key)) return costs;
+  }
+  return null;
+}
+function applyContextTier(costs, inputTokens) {
+  if (!costs || !costs.contextTiers || costs.contextTiers.length === 0) return costs;
+  const tier = costs.contextTiers.filter((candidate) => inputTokens > candidate.minPromptTokens).sort((a, b) => b.minPromptTokens - a.minPromptTokens)[0];
+  if (!tier) return costs;
+  return {
+    ...costs,
+    inputCostPerToken: tier.inputCostPerToken ?? costs.inputCostPerToken,
+    outputCostPerToken: tier.outputCostPerToken ?? costs.outputCostPerToken,
+    cacheWriteCostPerToken: tier.cacheWriteCostPerToken ?? costs.cacheWriteCostPerToken,
+    cacheReadCostPerToken: tier.cacheReadCostPerToken ?? costs.cacheReadCostPerToken
+  };
+}
+var LITELLM_URL, CACHE_TTL_MS2, WEB_SEARCH_COST, LONG_CONTEXT_1M_THRESHOLD_TOKENS, GEMINI_LONG_CONTEXT_THRESHOLD_TOKENS, DIRECT_PROVIDER_PREFIXES, FALLBACK_PRICING, pricingCache, BUILTIN_ALIASES, userAliases;
 var init_models = __esm({
   "src/models.ts"() {
     "use strict";
@@ -176,6 +222,9 @@ var init_models = __esm({
     LITELLM_URL = "https://raw.githubusercontent.com/BerriAI/litellm/main/model_prices_and_context_window.json";
     CACHE_TTL_MS2 = 24 * 60 * 60 * 1e3;
     WEB_SEARCH_COST = 0.01;
+    LONG_CONTEXT_1M_THRESHOLD_TOKENS = 272e3;
+    GEMINI_LONG_CONTEXT_THRESHOLD_TOKENS = 2e5;
+    DIRECT_PROVIDER_PREFIXES = ["openai/", "anthropic/", "google/", "vertex_ai/", "minimax/"];
     FALLBACK_PRICING = {
       "claude-opus-4-7": { inputCostPerToken: 5e-6, outputCostPerToken: 25e-6, cacheWriteCostPerToken: 625e-8, cacheReadCostPerToken: 5e-7, webSearchCostPerRequest: WEB_SEARCH_COST, fastMultiplier: 6 },
       "claude-opus-4-6": { inputCostPerToken: 5e-6, outputCostPerToken: 25e-6, cacheWriteCostPerToken: 625e-8, cacheReadCostPerToken: 5e-7, webSearchCostPerRequest: WEB_SEARCH_COST, fastMultiplier: 6 },
@@ -191,14 +240,60 @@ var init_models = __esm({
       "claude-3-5-haiku": { inputCostPerToken: 8e-7, outputCostPerToken: 4e-6, cacheWriteCostPerToken: 1e-6, cacheReadCostPerToken: 8e-8, webSearchCostPerRequest: WEB_SEARCH_COST, fastMultiplier: 1 },
       "gpt-4o": { inputCostPerToken: 25e-7, outputCostPerToken: 1e-5, cacheWriteCostPerToken: 25e-7, cacheReadCostPerToken: 125e-8, webSearchCostPerRequest: WEB_SEARCH_COST, fastMultiplier: 1 },
       "gpt-4o-mini": { inputCostPerToken: 15e-8, outputCostPerToken: 6e-7, cacheWriteCostPerToken: 15e-8, cacheReadCostPerToken: 75e-9, webSearchCostPerRequest: WEB_SEARCH_COST, fastMultiplier: 1 },
-      "gemini-2.5-pro": { inputCostPerToken: 125e-8, outputCostPerToken: 1e-5, cacheWriteCostPerToken: 125e-8, cacheReadCostPerToken: 315e-9, webSearchCostPerRequest: WEB_SEARCH_COST, fastMultiplier: 1 },
+      "gemini-2.5-pro": {
+        inputCostPerToken: 125e-8,
+        outputCostPerToken: 1e-5,
+        cacheWriteCostPerToken: 125e-8,
+        cacheReadCostPerToken: 125e-9,
+        webSearchCostPerRequest: WEB_SEARCH_COST,
+        fastMultiplier: 1,
+        contextTiers: [{
+          minPromptTokens: GEMINI_LONG_CONTEXT_THRESHOLD_TOKENS,
+          inputCostPerToken: 25e-7,
+          outputCostPerToken: 15e-6,
+          cacheReadCostPerToken: 25e-8
+        }]
+      },
       "gpt-5.5": { inputCostPerToken: 5e-6, outputCostPerToken: 3e-5, cacheWriteCostPerToken: 5e-6, cacheReadCostPerToken: 5e-7, webSearchCostPerRequest: WEB_SEARCH_COST, fastMultiplier: 1 },
-      "gpt-5.4": { inputCostPerToken: 25e-7, outputCostPerToken: 15e-6, cacheWriteCostPerToken: 25e-7, cacheReadCostPerToken: 25e-8, webSearchCostPerRequest: WEB_SEARCH_COST, fastMultiplier: 1 },
+      "gpt-5.5-pro": { inputCostPerToken: 3e-5, outputCostPerToken: 18e-5, cacheWriteCostPerToken: 0, cacheReadCostPerToken: 0, webSearchCostPerRequest: WEB_SEARCH_COST, fastMultiplier: 1 },
+      "gpt-5.4": {
+        inputCostPerToken: 25e-7,
+        outputCostPerToken: 15e-6,
+        cacheWriteCostPerToken: 25e-7,
+        cacheReadCostPerToken: 25e-8,
+        webSearchCostPerRequest: WEB_SEARCH_COST,
+        fastMultiplier: 1,
+        contextTiers: [{
+          minPromptTokens: LONG_CONTEXT_1M_THRESHOLD_TOKENS,
+          inputCostPerToken: 5e-6,
+          outputCostPerToken: 225e-7,
+          cacheWriteCostPerToken: 5e-6,
+          cacheReadCostPerToken: 5e-7
+        }]
+      },
+      "gpt-5.4-pro": {
+        inputCostPerToken: 3e-5,
+        outputCostPerToken: 18e-5,
+        cacheWriteCostPerToken: 0,
+        cacheReadCostPerToken: 0,
+        webSearchCostPerRequest: WEB_SEARCH_COST,
+        fastMultiplier: 1,
+        contextTiers: [{
+          minPromptTokens: LONG_CONTEXT_1M_THRESHOLD_TOKENS,
+          inputCostPerToken: 6e-5,
+          outputCostPerToken: 27e-5
+        }]
+      },
       "gpt-5.4-mini": { inputCostPerToken: 75e-8, outputCostPerToken: 45e-7, cacheWriteCostPerToken: 75e-8, cacheReadCostPerToken: 75e-9, webSearchCostPerRequest: WEB_SEARCH_COST, fastMultiplier: 1 },
+      "gpt-5.4-nano": { inputCostPerToken: 2e-7, outputCostPerToken: 125e-8, cacheWriteCostPerToken: 2e-7, cacheReadCostPerToken: 2e-8, webSearchCostPerRequest: WEB_SEARCH_COST, fastMultiplier: 1 },
       "gpt-5.3-codex": { inputCostPerToken: 175e-8, outputCostPerToken: 14e-6, cacheWriteCostPerToken: 175e-8, cacheReadCostPerToken: 175e-9, webSearchCostPerRequest: WEB_SEARCH_COST, fastMultiplier: 1 },
       "gpt-5.3-codex-spark": { inputCostPerToken: 175e-8, outputCostPerToken: 14e-6, cacheWriteCostPerToken: 175e-8, cacheReadCostPerToken: 175e-9, webSearchCostPerRequest: WEB_SEARCH_COST, fastMultiplier: 1 },
-      "gpt-5": { inputCostPerToken: 25e-7, outputCostPerToken: 1e-5, cacheWriteCostPerToken: 25e-7, cacheReadCostPerToken: 125e-8, webSearchCostPerRequest: WEB_SEARCH_COST, fastMultiplier: 1 },
-      "gpt-5-mini": { inputCostPerToken: 4e-7, outputCostPerToken: 16e-7, cacheWriteCostPerToken: 4e-7, cacheReadCostPerToken: 2e-7, webSearchCostPerRequest: WEB_SEARCH_COST, fastMultiplier: 1 },
+      "gpt-5.2": { inputCostPerToken: 175e-8, outputCostPerToken: 14e-6, cacheWriteCostPerToken: 175e-8, cacheReadCostPerToken: 175e-9, webSearchCostPerRequest: WEB_SEARCH_COST, fastMultiplier: 1 },
+      "gpt-5.1": { inputCostPerToken: 125e-8, outputCostPerToken: 1e-5, cacheWriteCostPerToken: 125e-8, cacheReadCostPerToken: 125e-9, webSearchCostPerRequest: WEB_SEARCH_COST, fastMultiplier: 1 },
+      "gpt-5": { inputCostPerToken: 125e-8, outputCostPerToken: 1e-5, cacheWriteCostPerToken: 125e-8, cacheReadCostPerToken: 125e-9, webSearchCostPerRequest: WEB_SEARCH_COST, fastMultiplier: 1 },
+      "gpt-5-codex": { inputCostPerToken: 125e-8, outputCostPerToken: 1e-5, cacheWriteCostPerToken: 125e-8, cacheReadCostPerToken: 125e-9, webSearchCostPerRequest: WEB_SEARCH_COST, fastMultiplier: 1 },
+      "gpt-5-mini": { inputCostPerToken: 25e-8, outputCostPerToken: 2e-6, cacheWriteCostPerToken: 25e-8, cacheReadCostPerToken: 25e-9, webSearchCostPerRequest: WEB_SEARCH_COST, fastMultiplier: 1 },
+      "gpt-5-nano": { inputCostPerToken: 5e-8, outputCostPerToken: 4e-7, cacheWriteCostPerToken: 5e-8, cacheReadCostPerToken: 5e-9, webSearchCostPerRequest: WEB_SEARCH_COST, fastMultiplier: 1 },
       "gpt-4.1": { inputCostPerToken: 2e-6, outputCostPerToken: 8e-6, cacheWriteCostPerToken: 2e-6, cacheReadCostPerToken: 5e-7, webSearchCostPerRequest: WEB_SEARCH_COST, fastMultiplier: 1 },
       "gpt-4.1-mini": { inputCostPerToken: 4e-7, outputCostPerToken: 16e-7, cacheWriteCostPerToken: 4e-7, cacheReadCostPerToken: 1e-7, webSearchCostPerRequest: WEB_SEARCH_COST, fastMultiplier: 1 },
       "gpt-4.1-nano": { inputCostPerToken: 1e-7, outputCostPerToken: 4e-7, cacheWriteCostPerToken: 1e-7, cacheReadCostPerToken: 25e-9, webSearchCostPerRequest: WEB_SEARCH_COST, fastMultiplier: 1 },
@@ -206,9 +301,9 @@ var init_models = __esm({
       "o4-mini": { inputCostPerToken: 11e-7, outputCostPerToken: 44e-7, cacheWriteCostPerToken: 11e-7, cacheReadCostPerToken: 275e-9, webSearchCostPerRequest: WEB_SEARCH_COST, fastMultiplier: 1 },
       "codex-mini-latest": { inputCostPerToken: 15e-7, outputCostPerToken: 6e-6, cacheWriteCostPerToken: 15e-7, cacheReadCostPerToken: 375e-9, webSearchCostPerRequest: WEB_SEARCH_COST, fastMultiplier: 1 },
       "codex-mini": { inputCostPerToken: 15e-7, outputCostPerToken: 6e-6, cacheWriteCostPerToken: 15e-7, cacheReadCostPerToken: 375e-9, webSearchCostPerRequest: WEB_SEARCH_COST, fastMultiplier: 1 },
-      "gpt-5.1-codex": { inputCostPerToken: 125e-8, outputCostPerToken: 1e-5, cacheWriteCostPerToken: 125e-8, cacheReadCostPerToken: 625e-9, webSearchCostPerRequest: WEB_SEARCH_COST, fastMultiplier: 1 },
-      "gpt-5.1-codex-mini": { inputCostPerToken: 25e-8, outputCostPerToken: 2e-6, cacheWriteCostPerToken: 25e-8, cacheReadCostPerToken: 125e-9, webSearchCostPerRequest: WEB_SEARCH_COST, fastMultiplier: 1 },
-      "gpt-5.2-codex": { inputCostPerToken: 175e-8, outputCostPerToken: 14e-6, cacheWriteCostPerToken: 175e-8, cacheReadCostPerToken: 875e-9, webSearchCostPerRequest: WEB_SEARCH_COST, fastMultiplier: 1 },
+      "gpt-5.1-codex": { inputCostPerToken: 125e-8, outputCostPerToken: 1e-5, cacheWriteCostPerToken: 125e-8, cacheReadCostPerToken: 125e-9, webSearchCostPerRequest: WEB_SEARCH_COST, fastMultiplier: 1 },
+      "gpt-5.1-codex-mini": { inputCostPerToken: 25e-8, outputCostPerToken: 2e-6, cacheWriteCostPerToken: 25e-8, cacheReadCostPerToken: 25e-9, webSearchCostPerRequest: WEB_SEARCH_COST, fastMultiplier: 1 },
+      "gpt-5.2-codex": { inputCostPerToken: 175e-8, outputCostPerToken: 14e-6, cacheWriteCostPerToken: 175e-8, cacheReadCostPerToken: 175e-9, webSearchCostPerRequest: WEB_SEARCH_COST, fastMultiplier: 1 },
       "MiniMax-M2.7-highspeed": { inputCostPerToken: 6e-7, outputCostPerToken: 24e-7, cacheWriteCostPerToken: 375e-9, cacheReadCostPerToken: 6e-8, webSearchCostPerRequest: WEB_SEARCH_COST, fastMultiplier: 1 },
       "MiniMax-M2.7": { inputCostPerToken: 3e-7, outputCostPerToken: 12e-7, cacheWriteCostPerToken: 375e-9, cacheReadCostPerToken: 6e-8, webSearchCostPerRequest: WEB_SEARCH_COST, fastMultiplier: 1 }
     };
@@ -870,7 +965,7 @@ __export(cursor_agent_exports, {
   createCursorAgentProvider: () => createCursorAgentProvider,
   cursor_agent: () => cursor_agent
 });
-import { createHash } from "crypto";
+import { createHash as createHash2 } from "crypto";
 import { existsSync as existsSync2 } from "fs";
 import { readdir as readdir7, readFile as readFile6, stat as stat9 } from "fs/promises";
 import { join as join14, basename as basename6 } from "path";
@@ -934,7 +1029,7 @@ function resolveModel3(raw) {
 function toConversationId(transcriptPath) {
   const filename = basename6(transcriptPath, ".txt");
   if (filename.length === 36 && UUID_LIKE.test(filename)) return filename;
-  return createHash("sha1").update(transcriptPath).digest("hex").slice(0, 16);
+  return createHash2("sha1").update(transcriptPath).digest("hex").slice(0, 16);
 }
 function extractUserQuery(userBlock) {
   const chunks = [];
@@ -1548,6 +1643,9 @@ function formatCost(costUSD) {
 }
 
 // src/day-aggregator.ts
+function formatDate(date) {
+  return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, "0")}-${String(date.getDate()).padStart(2, "0")}`;
+}
 function emptyEntry(date) {
   return {
     date,
@@ -1565,9 +1663,23 @@ function emptyEntry(date) {
     providers: {}
   };
 }
+function emptyProviderBreakdown() {
+  return {
+    calls: 0,
+    cost: 0,
+    sessions: 0,
+    inputTokens: 0,
+    outputTokens: 0,
+    cacheReadTokens: 0,
+    cacheWriteTokens: 0,
+    editTurns: 0,
+    oneShotTurns: 0,
+    models: {},
+    categories: {}
+  };
+}
 function dateKey(iso) {
-  const d = new Date(iso);
-  return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, "0")}-${String(d.getDate()).padStart(2, "0")}`;
+  return formatDate(new Date(iso));
 }
 function aggregateProjectsIntoDays(projects) {
   const byDate = /* @__PURE__ */ new Map();
@@ -1579,10 +1691,20 @@ function aggregateProjectsIntoDays(projects) {
     }
     return d;
   };
+  const ensureProvider = (date, provider) => {
+    const day = ensure(date);
+    let breakdown = day.providers[provider];
+    if (!breakdown) {
+      breakdown = emptyProviderBreakdown();
+      day.providers[provider] = breakdown;
+    }
+    return breakdown;
+  };
   for (const project of projects) {
     for (const session of project.sessions) {
       const sessionDate = dateKey(session.firstTimestamp);
       ensure(sessionDate).sessions += 1;
+      const providersSeenInSession = /* @__PURE__ */ new Set();
       for (const turn of session.turns) {
         if (turn.assistantCalls.length === 0) continue;
         const turnDate = dateKey(turn.assistantCalls[0].timestamp);
@@ -1598,7 +1720,11 @@ function aggregateProjectsIntoDays(projects) {
         cat.editTurns += editTurns;
         cat.oneShotTurns += oneShotTurns;
         turnDay.categories[turn.category] = cat;
+        const callsByProvider = /* @__PURE__ */ new Map();
         for (const call of turn.assistantCalls) {
+          const existingProviderCalls = callsByProvider.get(call.provider) ?? [];
+          existingProviderCalls.push(call);
+          callsByProvider.set(call.provider, existingProviderCalls);
           const callDate = dateKey(call.timestamp);
           const callDay = ensure(callDate);
           callDay.cost += call.costUSD;
@@ -1622,39 +1748,90 @@ function aggregateProjectsIntoDays(projects) {
           model.cacheReadTokens += call.usage.cacheReadInputTokens;
           model.cacheWriteTokens += call.usage.cacheCreationInputTokens;
           callDay.models[call.model] = model;
-          const provider = callDay.providers[call.provider] ?? { calls: 0, cost: 0 };
-          provider.calls += 1;
-          provider.cost += call.costUSD;
-          callDay.providers[call.provider] = provider;
+        }
+        for (const [provider, calls] of callsByProvider) {
+          providersSeenInSession.add(provider);
+          const providerTurnDay = ensureProvider(turnDate, provider);
+          const providerTurnCost = calls.reduce((sum, call) => sum + call.costUSD, 0);
+          providerTurnDay.editTurns += editTurns;
+          providerTurnDay.oneShotTurns += oneShotTurns;
+          const providerCategory = providerTurnDay.categories[turn.category] ?? { turns: 0, cost: 0, editTurns: 0, oneShotTurns: 0 };
+          providerCategory.turns += 1;
+          providerCategory.cost += providerTurnCost;
+          providerCategory.editTurns += editTurns;
+          providerCategory.oneShotTurns += oneShotTurns;
+          providerTurnDay.categories[turn.category] = providerCategory;
+          for (const call of calls) {
+            const callDate = dateKey(call.timestamp);
+            const providerCallDay = ensureProvider(callDate, provider);
+            providerCallDay.cost += call.costUSD;
+            providerCallDay.calls += 1;
+            providerCallDay.inputTokens += call.usage.inputTokens;
+            providerCallDay.outputTokens += call.usage.outputTokens;
+            providerCallDay.cacheReadTokens += call.usage.cacheReadInputTokens;
+            providerCallDay.cacheWriteTokens += call.usage.cacheCreationInputTokens;
+            const model = providerCallDay.models[call.model] ?? {
+              calls: 0,
+              cost: 0,
+              inputTokens: 0,
+              outputTokens: 0,
+              cacheReadTokens: 0,
+              cacheWriteTokens: 0
+            };
+            model.calls += 1;
+            model.cost += call.costUSD;
+            model.inputTokens += call.usage.inputTokens;
+            model.outputTokens += call.usage.outputTokens;
+            model.cacheReadTokens += call.usage.cacheReadInputTokens;
+            model.cacheWriteTokens += call.usage.cacheCreationInputTokens;
+            providerCallDay.models[call.model] = model;
+          }
         }
       }
+      for (const provider of providersSeenInSession) {
+        ensureProvider(sessionDate, provider).sessions += 1;
+      }
     }
   }
   return [...byDate.values()].sort((a, b) => a.date.localeCompare(b.date));
 }
 function filterDaysToProvider(days, provider) {
   return days.map((d) => {
-    const p = d.providers[provider];
-    if (!p) return null;
+    const p = d.providers[provider] ?? emptyProviderBreakdown();
     return {
       ...d,
       cost: p.cost,
       calls: p.calls,
-      // sessions count is not per-provider in cache — approximate at 0
-      sessions: 0,
-      inputTokens: 0,
-      outputTokens: 0,
-      cacheReadTokens: 0,
-      cacheWriteTokens: 0,
-      editTurns: 0,
-      oneShotTurns: 0,
-      models: {},
-      categories: {},
-      providers: { [provider]: p }
+      sessions: p.sessions,
+      inputTokens: p.inputTokens,
+      outputTokens: p.outputTokens,
+      cacheReadTokens: p.cacheReadTokens,
+      cacheWriteTokens: p.cacheWriteTokens,
+      editTurns: p.editTurns,
+      oneShotTurns: p.oneShotTurns,
+      models: { ...p.models },
+      categories: { ...p.categories },
+      providers: d.providers[provider] ? { [provider]: p } : {}
     };
-  }).filter((d) => d !== null);
+  });
+}
+function fillMissingDays(start, end, days) {
+  const byDate = new Map(days.map((day) => [day.date, day]));
+  const filled = [];
+  const cursor2 = new Date(start.getFullYear(), start.getMonth(), start.getDate());
+  const endDate = new Date(end.getFullYear(), end.getMonth(), end.getDate());
+  while (cursor2.getTime() <= endDate.getTime()) {
+    const key = formatDate(cursor2);
+    filled.push(byDate.get(key) ?? emptyEntry(key));
+    cursor2.setDate(cursor2.getDate() + 1);
+  }
+  return filled;
 }
 function buildPeriodDataFromDays(days, label) {
+  if (days.length === 0) {
+    process.stderr.write(`[exe-watcher] WARNING: buildPeriodDataFromDays called with 0 days for label '${label}'
+`);
+  }
   let cost = 0, calls = 0, sessions = 0;
   let inputTokens = 0, outputTokens = 0, cacheReadTokens = 0, cacheWriteTokens = 0;
   const catTotals = {};
@@ -2201,6 +2378,7 @@ var modelDisplayNames = {
   "gpt-4o-mini": "GPT-4o Mini",
   "gpt-4o": "GPT-4o"
 };
+var modelDisplayEntries = Object.entries(modelDisplayNames).sort((a, b) => b[0].length - a[0].length);
 var toolNameMap = {
   exec_command: "Bash",
   read_file: "Read",
@@ -2392,7 +2570,7 @@ function createCodexProvider(codexDir) {
     name: "codex",
     displayName: "Codex",
     modelDisplayName(model) {
-      for (const [key, name] of Object.entries(modelDisplayNames)) {
+      for (const [key, name] of modelDisplayEntries) {
         if (model.startsWith(key)) return name;
       }
       return model;
@@ -2444,7 +2622,7 @@ var toolNameMap2 = {
   fetch_webpage: "WebFetch",
   github_repo: "GitHub"
 };
-var modelDisplayEntries = Object.entries(modelDisplayNames2).sort((a, b) => b[0].length - a[0].length);
+var modelDisplayEntries2 = Object.entries(modelDisplayNames2).sort((a, b) => b[0].length - a[0].length);
 function getCopilotSessionStateDir(override) {
   return override ?? join9(homedir6(), ".copilot", "session-state");
 }
@@ -2540,7 +2718,7 @@ function createCopilotProvider(sessionStateDir) {
     name: "copilot",
     displayName: "Copilot",
     modelDisplayName(model) {
-      for (const [key, name] of modelDisplayEntries) {
+      for (const [key, name] of modelDisplayEntries2) {
         if (model === key || model.startsWith(key + "-")) return name;
       }
       return model;
@@ -2585,7 +2763,7 @@ var toolNameMap3 = {
   todo: "TodoWrite",
   patch: "Patch"
 };
-var modelDisplayEntries2 = Object.entries(modelDisplayNames3).sort((a, b) => b[0].length - a[0].length);
+var modelDisplayEntries3 = Object.entries(modelDisplayNames3).sort((a, b) => b[0].length - a[0].length);
 function getPiSessionsDir(override) {
   return override ?? join10(homedir7(), ".pi", "agent", "sessions");
 }
@@ -2707,7 +2885,7 @@ function createPiProvider(sessionsDir) {
     name: "pi",
     displayName: "Pi",
     modelDisplayName(model) {
-      for (const [key, name] of modelDisplayEntries2) {
+      for (const [key, name] of modelDisplayEntries3) {
         if (model.startsWith(key)) return name;
       }
       return model;
@@ -2730,7 +2908,7 @@ function createOmpProvider(sessionsDir) {
     name: "omp",
     displayName: "OMP",
     modelDisplayName(model) {
-      for (const [key, name] of modelDisplayEntries2) {
+      for (const [key, name] of modelDisplayEntries3) {
         if (model.startsWith(key)) return name;
       }
       return model;
@@ -3315,9 +3493,68 @@ async function parseProviderSources(providerName, sources, seenKeys, dateRange)
 var CACHE_TTL_MS3 = 6e4;
 var MAX_CACHE_ENTRIES = 10;
 var sessionCache = /* @__PURE__ */ new Map();
-function cacheKey(dateRange, providerFilter) {
+var inFlightSourceContexts = /* @__PURE__ */ new Map();
+function sourceContextCacheKey(providerFilter) {
+  return JSON.stringify({
+    provider: providerFilter ?? "all",
+    claudeConfigDir: process.env["CLAUDE_CONFIG_DIR"] ?? "",
+    codexHome: process.env["CODEX_HOME"] ?? "",
+    xdgDataHome: process.env["XDG_DATA_HOME"] ?? "",
+    home: process.env["HOME"] ?? ""
+  });
+}
+function cacheKey(dateRange, providerFilter, sourceFingerprint = "static") {
   const s = dateRange ? `${dateRange.start.getTime()}:${dateRange.end.getTime()}` : "none";
-  return `${s}:${providerFilter ?? "all"}`;
+  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";
+  }
+}
+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("|");
+}
+async function getSourceContext(providerFilter) {
+  const key = sourceContextCacheKey(providerFilter);
+  const cached = inFlightSourceContexts.get(key);
+  if (cached) {
+    return cached;
+  }
+  const promise = (async () => {
+    const sources = await discoverAllSessions(providerFilter);
+    const fingerprint = await buildCacheFingerprint(sources);
+    return { sources, fingerprint };
+  })();
+  inFlightSourceContexts.set(key, promise);
+  try {
+    return await promise;
+  } catch (err) {
+    throw err;
+  } finally {
+    if (inFlightSourceContexts.get(key) === promise) {
+      inFlightSourceContexts.delete(key);
+    }
+  }
 }
 function cachePut(key, data) {
   const now = Date.now();
@@ -3351,12 +3588,13 @@ function filterProjectsByName(projects, include, exclude) {
   return result;
 }
 async function parseAllSessions(dateRange, providerFilter) {
-  const key = cacheKey(dateRange, providerFilter);
+  const sourceContext = await getSourceContext(providerFilter);
+  const allSources = sourceContext.sources;
+  const key = cacheKey(dateRange, providerFilter, sourceContext.fingerprint);
   const cached = sessionCache.get(key);
   if (cached && Date.now() - cached.ts < CACHE_TTL_MS3) return cached.data;
   const seenMsgIds = /* @__PURE__ */ new Set();
   const seenKeys = /* @__PURE__ */ new Set();
-  const allSources = await discoverAllSessions(providerFilter);
   const claudeSources = allSources.filter((s) => s.provider === "claude");
   const nonClaudeSources = allSources.filter((s) => s.provider !== "claude");
   const claudeDirs = claudeSources.map((s) => ({ path: s.path, name: s.project }));
@@ -3543,7 +3781,7 @@ function buildHistory(daily) {
   const trimmed = sorted.slice(-HISTORY_DAYS_LIMIT);
   return { daily: trimmed };
 }
-function buildMenubarPayload(current, providers, optimize, dailyHistory, agentStats, projectSpend, exeOsDetected, statsFileAge) {
+function buildMenubarPayload(current, providers, optimize, dailyHistory, agentStats, projectSpend, exeOsDetected, statsFileAge, diagnostics) {
   return {
     generated: (/* @__PURE__ */ new Date()).toISOString(),
     current: {
@@ -3561,6 +3799,7 @@ function buildMenubarPayload(current, providers, optimize, dailyHistory, agentSt
     },
     optimize: buildOptimize(optimize),
     history: buildHistory(dailyHistory),
+    diagnostics: diagnostics ?? { daysCount: 0, parseTimeMs: 0, warnings: [] },
     agentStats: agentStats ?? null,
     exeOsDetected: exeOsDetected ?? false,
     statsFileAge: statsFileAge ?? null,
@@ -3570,43 +3809,62 @@ function buildMenubarPayload(current, providers, optimize, dailyHistory, agentSt
 
 // src/daily-cache.ts
 init_cache_dir();
-import { randomBytes as randomBytes5 } from "crypto";
+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 = 3;
+var DAILY_CACHE_VERSION = 4;
+var DEFAULT_DAILY_CACHE_SCOPE = "global";
 var DAILY_CACHE_FILENAME = "daily-cache.json";
-function getCachePath3() {
-  return join16(getCacheDir(), DAILY_CACHE_FILENAME);
+function getCachePath3(scopeKey) {
+  if (scopeKey === DEFAULT_DAILY_CACHE_SCOPE) {
+    return join16(getCacheDir(), DAILY_CACHE_FILENAME);
+  }
+  return join16(getCacheDir(), `daily-cache-${scopeKey}.json`);
 }
-function emptyCache() {
-  return { version: DAILY_CACHE_VERSION, lastComputedDate: null, days: [] };
+function emptyCache(scopeKey) {
+  return { version: DAILY_CACHE_VERSION, scopeKey, lastComputedDate: null, days: [] };
+}
+function normalizeScopeTerms(values) {
+  return [...new Set((values ?? []).map((value) => value.trim().toLowerCase()).filter(Boolean))].sort();
+}
+function buildDailyCacheScopeKey(include, exclude) {
+  const normalizedInclude = normalizeScopeTerms(include);
+  const normalizedExclude = normalizeScopeTerms(exclude);
+  if (normalizedInclude.length === 0 && normalizedExclude.length === 0) {
+    return DEFAULT_DAILY_CACHE_SCOPE;
+  }
+  const raw = JSON.stringify({ include: normalizedInclude, exclude: normalizedExclude });
+  return `scope-${createHash3("sha1").update(raw).digest("hex").slice(0, 12)}`;
 }
 function isValidCache(parsed) {
   if (!parsed || typeof parsed !== "object") return false;
   const c = parsed;
   if (c.version !== DAILY_CACHE_VERSION) return false;
+  if (typeof c.scopeKey !== "string" || c.scopeKey.length === 0) return false;
   if (!Array.isArray(c.days)) return false;
   return true;
 }
-async function loadDailyCache() {
-  const path = getCachePath3();
-  if (!existsSync3(path)) return emptyCache();
+async function loadDailyCache(scopeKey = DEFAULT_DAILY_CACHE_SCOPE) {
+  const path = getCachePath3(scopeKey);
+  if (!existsSync3(path)) return emptyCache(scopeKey);
   try {
     const raw = await readFile7(path, "utf-8");
     const parsed = JSON.parse(raw);
-    if (!isValidCache(parsed)) return emptyCache();
+    if (!isValidCache(parsed)) return emptyCache(scopeKey);
+    if (parsed.scopeKey !== scopeKey) return emptyCache(scopeKey);
     return parsed;
   } catch {
-    return emptyCache();
+    return emptyCache(scopeKey);
   }
 }
 async function saveDailyCache(cache) {
   const dir = getCacheDir();
   if (!existsSync3(dir)) await mkdir7(dir, { recursive: true });
-  const finalPath = getCachePath3();
+  const scopeKey = cache.scopeKey || DEFAULT_DAILY_CACHE_SCOPE;
+  const finalPath = getCachePath3(scopeKey);
   const tempPath = `${finalPath}.${randomBytes5(8).toString("hex")}.tmp`;
-  const payload = JSON.stringify(cache);
+  const payload = JSON.stringify({ ...cache, scopeKey });
   const handle = await open5(tempPath, "w", 384);
   try {
     await handle.writeFile(payload, { encoding: "utf-8" });
@@ -3624,14 +3882,20 @@ async function saveDailyCache(cache) {
     throw err;
   }
 }
-function addNewDays(cache, incoming, newestDate) {
+function addNewDays(cache, incoming, newestDate, options = {}) {
   const byDate = new Map(cache.days.map((d) => [d.date, d]));
   for (const day of incoming) {
     byDate.set(day.date, day);
   }
   const merged = Array.from(byDate.values()).sort((a, b) => a.date.localeCompare(b.date));
-  const nextLast = cache.lastComputedDate && cache.lastComputedDate > newestDate ? cache.lastComputedDate : newestDate;
-  return { version: DAILY_CACHE_VERSION, lastComputedDate: nextLast, days: merged };
+  const candidateLast = options.coveredThrough ?? newestDate;
+  const nextLast = cache.lastComputedDate && cache.lastComputedDate > candidateLast ? cache.lastComputedDate : candidateLast;
+  return {
+    version: DAILY_CACHE_VERSION,
+    scopeKey: cache.scopeKey || DEFAULT_DAILY_CACHE_SCOPE,
+    lastComputedDate: nextLast,
+    days: merged
+  };
 }
 function getDaysInRange(cache, start, end) {
   return cache.days.filter((d) => d.date >= start && d.date <= end);
@@ -3858,6 +4122,9 @@ async function scanSessions(dateRange) {
   });
   return { toolCalls: allCalls, projectCwds: allCwds, apiCalls: allApiCalls, userMessages: allUserMessages };
 }
+function prewarmOptimizeScan(dateRange) {
+  return scanSessions(dateRange);
+}
 function readJsonFile(path) {
   const raw = readSessionFileSync(path);
   if (raw === null) return null;
@@ -4368,7 +4635,7 @@ function cacheKey2(projects, dateRange) {
   const fingerprint = projects.length + ":" + projects.reduce((s, p) => s + p.totalApiCalls, 0);
   return `${dr}:${fingerprint}`;
 }
-async function scanAndDetect(projects, dateRange) {
+async function scanAndDetect(projects, dateRange, preScanned) {
   if (projects.length === 0) {
     return { findings: [], costRate: 0, healthScore: 100, healthGrade: "A" };
   }
@@ -4376,7 +4643,7 @@ async function scanAndDetect(projects, dateRange) {
   const cached = resultCache.get(key);
   if (cached && Date.now() - cached.ts < RESULT_CACHE_TTL_MS) return cached.data;
   const costRate = computeInputCostRate(projects);
-  const { toolCalls, projectCwds, apiCalls, userMessages } = await scanSessions(dateRange);
+  const { toolCalls, projectCwds, apiCalls, userMessages } = preScanned ? await preScanned : await scanSessions(dateRange);
   const findings = [];
   const syncDetectors = [
     () => detectCacheBloat(apiCalls, projects, dateRange),
@@ -4487,13 +4754,13 @@ function renderOptimize(findings, costRate, periodLabel, periodCost, sessionCoun
   lines.push("");
   return lines.join("\n");
 }
-async function runOptimize(projects, periodLabel, dateRange) {
+async function runOptimize(projects, periodLabel, dateRange, preScanned) {
   if (projects.length === 0) {
     console.log(chalk2.dim("\n  No usage data found for this period.\n"));
     return;
   }
   process.stderr.write(chalk2.dim("  Analyzing your sessions...\n"));
-  const { findings, costRate, healthScore, healthGrade } = await scanAndDetect(projects, dateRange);
+  const { findings, costRate, healthScore, healthGrade } = await scanAndDetect(projects, dateRange, preScanned);
   const sessions = projects.flatMap((p) => p.sessions);
   const periodCost = projects.reduce((s, p) => s + p.totalCostUSD, 0);
   const callCount = projects.reduce((s, p) => s + p.totalApiCalls, 0);
@@ -6504,7 +6771,7 @@ function getDateRange2(period) {
       return { range: { start, end: yesterdayEnd }, label: `Yesterday (${toDateString(start)})` };
     }
     case "week": {
-      const start = new Date(now.getFullYear(), now.getMonth(), now.getDate() - 7);
+      const start = new Date(now.getFullYear(), now.getMonth(), now.getDate() - 6);
       return { range: { start, end }, label: "Last 7 Days" };
     }
     case "month": {
@@ -6512,7 +6779,7 @@ function getDateRange2(period) {
       return { range: { start, end }, label: `${now.toLocaleString("default", { month: "long" })} ${now.getFullYear()}` };
     }
     case "30days": {
-      const start = new Date(now.getFullYear(), now.getMonth(), now.getDate() - 30);
+      const start = new Date(now.getFullYear(), now.getMonth(), now.getDate() - 29);
       return { range: { start, end }, label: "Last 30 Days" };
     }
     case "all": {
@@ -6520,7 +6787,7 @@ function getDateRange2(period) {
       return { range: { start, end }, label: "Last 6 months" };
     }
     default: {
-      const start = new Date(now.getFullYear(), now.getMonth(), now.getDate() - 7);
+      const start = new Date(now.getFullYear(), now.getMonth(), now.getDate() - 6);
       return { range: { start, end }, label: "Last 7 Days" };
     }
   }
@@ -6770,8 +7037,9 @@ program.command("status").description("Compact status output (today + week + mon
     const yesterdayEnd = new Date(todayStart.getTime() - 1);
     const yesterdayStr = toDateString(new Date(todayStart.getTime() - MS_PER_DAY3));
     const isAllProviders = pf === "all";
+    const dailyCacheScope = buildDailyCacheScopeKey(opts.project, opts.exclude);
     const cache = await withDailyCacheLock(async () => {
-      let c = await loadDailyCache();
+      let c = await loadDailyCache(dailyCacheScope);
       const hadYesterday = c.days.some((d) => d.date >= yesterdayStr);
       if (hadYesterday) {
         const freshDays = c.days.filter((d) => d.date < yesterdayStr);
@@ -6786,32 +7054,53 @@ program.command("status").description("Compact status output (today + week + mon
       if (gapStart.getTime() <= yesterdayEnd.getTime()) {
         const gapRange = { start: gapStart, end: yesterdayEnd };
         const gapProjects = filterProjectsByName(await parseAllSessions(gapRange, "all"), opts.project, opts.exclude);
-        const gapDays = aggregateProjectsIntoDays(gapProjects);
-        c = addNewDays(c, gapDays, yesterdayStr);
+        const gapDays = fillMissingDays(gapRange.start, gapRange.end, aggregateProjectsIntoDays(gapProjects));
+        c = addNewDays(c, gapDays, yesterdayStr, { coveredThrough: yesterdayStr });
         await saveDailyCache(c);
       }
       return c;
     });
     let currentData;
-    let scanProjects;
-    let scanRange;
+    const scanRange = periodInfo.range;
     const todayRange = { start: todayStart, end: periodInfo.range.end };
-    const todayProjects = fp(await parseAllSessions(todayRange, "all"));
+    const warnings = [];
+    const parseStart = Date.now();
+    let todayProjects;
+    let allTodayProjects;
+    try {
+      allTodayProjects = await parseAllSessions(todayRange, "all");
+      todayProjects = fp(allTodayProjects);
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      const warn2 = `parseAllSessions failed: ${msg}`;
+      warnings.push(warn2);
+      process.stderr.write(`[exe-watcher] WARNING: ${warn2}
+`);
+      allTodayProjects = [];
+      todayProjects = [];
+    }
+    if (todayProjects.length === 0) {
+      const warn2 = `parseAllSessions returned 0 projects for range ${toDateString(todayRange.start)}..${toDateString(todayRange.end)}`;
+      warnings.push(warn2);
+      process.stderr.write(`[exe-watcher] WARNING: ${warn2}
+`);
+    }
+    const parseTimeMs = Date.now() - parseStart;
     const todayDays = aggregateProjectsIntoDays(todayProjects);
+    let daysCount = 0;
     {
       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;
       if (isAllProviders) {
         currentData = buildPeriodDataFromDays(allDays, periodInfo.label);
       } else {
         const providerDays = filterDaysToProvider(allDays, pf);
         currentData = buildPeriodDataFromDays(providerDays, periodInfo.label);
       }
-      scanProjects = todayProjects;
-      scanRange = periodInfo.range;
     }
     const allProviders = await getAllProviders();
     const displayNameByName = new Map(allProviders.map((p) => [p.name, p.displayName]));
@@ -6822,6 +7111,12 @@ program.command("status").description("Compact status output (today + week + mon
         ...getDaysInRange(cache, rangeStartStr, yesterdayStr),
         ...todayDays.filter((d) => d.date > yesterdayStr)
       ];
+      if (allDaysForProviders.length === 0) {
+        const warn2 = "allDaysForProviders is empty \u2014 all providers will show $0";
+        warnings.push(warn2);
+        process.stderr.write(`[exe-watcher] WARNING: ${warn2}
+`);
+      }
       const providerTotals = {};
       for (const d of allDaysForProviders) {
         for (const [name, p] of Object.entries(d.providers)) {
@@ -6845,7 +7140,7 @@ program.command("status").description("Compact status output (today + week + mon
     const fullHistory = [...allCacheDays, ...todayDays.filter((d) => d.date > yesterdayStr)];
     const dailyHistory = fullHistory.map((d) => {
       if (isAllProviders) {
-        const topModels = Object.entries(d.models).filter(([name]) => name !== "<synthetic>").sort(([, a], [, b]) => b.cost - a.cost).slice(0, 5).map(([name, m]) => ({
+        const topModels2 = Object.entries(d.models).filter(([name]) => name !== "<synthetic>").sort(([, a], [, b]) => b.cost - a.cost).slice(0, 5).map(([name, m]) => ({
           name,
           cost: m.cost,
           calls: m.calls,
@@ -6860,22 +7155,42 @@ program.command("status").description("Compact status output (today + week + mon
           outputTokens: d.outputTokens,
           cacheReadTokens: d.cacheReadTokens,
           cacheWriteTokens: d.cacheWriteTokens,
-          topModels
+          topModels: topModels2
         };
       }
-      const prov = d.providers[pf] ?? { calls: 0, cost: 0 };
+      const prov = d.providers[pf];
+      const topModels = Object.entries(prov?.models ?? {}).filter(([name]) => name !== "<synthetic>").sort(([, a], [, b]) => b.cost - a.cost).slice(0, 5).map(([name, m]) => ({
+        name,
+        cost: m.cost,
+        calls: m.calls,
+        inputTokens: m.inputTokens,
+        outputTokens: m.outputTokens
+      }));
       return {
         date: d.date,
-        cost: prov.cost,
-        calls: prov.calls,
-        inputTokens: 0,
-        outputTokens: 0,
-        cacheReadTokens: 0,
-        cacheWriteTokens: 0,
-        topModels: []
+        cost: prov?.cost ?? 0,
+        calls: prov?.calls ?? 0,
+        inputTokens: prov?.inputTokens ?? 0,
+        outputTokens: prov?.outputTokens ?? 0,
+        cacheReadTokens: prov?.cacheReadTokens ?? 0,
+        cacheWriteTokens: prov?.cacheWriteTokens ?? 0,
+        topModels
       };
     });
-    const optimize = opts.optimize === false ? null : await scanAndDetect(scanProjects, scanRange);
+    let optimize = null;
+    if (opts.optimize !== false) {
+      try {
+        const optimizeProjects = isAllProviders && opts.period === "today" ? todayProjects : fp(await parseAllSessions(scanRange, isAllProviders ? "all" : pf));
+        optimize = await scanAndDetect(optimizeProjects, scanRange);
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        const warn2 = `optimize parse failed: ${msg}`;
+        warnings.push(warn2);
+        process.stderr.write(`[exe-watcher] WARNING: ${warn2}
+`);
+        optimize = await scanAndDetect(todayProjects, scanRange);
+      }
+    }
     const exeOsDir = join21(homedir14(), ".exe-os");
     const exeOsDetected = existsSync6(exeOsDir);
     let agentStats = null;
@@ -6899,13 +7214,13 @@ program.command("status").description("Compact status output (today + week + mon
     if (agentStats) {
       agentStats = estimateAgentCosts(agentStats);
     }
-    const [proj24h, proj7d, proj30d] = await Promise.all([
-      parseAllSessions(getDateRange2("today").range, "all"),
+    const [proj7d, proj30d] = await Promise.all([
       parseAllSessions(getDateRange2("week").range, "all"),
       parseAllSessions(getDateRange2("30days").range, "all")
     ]);
-    const projectSpend = buildProjectSpend(proj24h, proj7d, proj30d);
-    console.log(JSON.stringify(buildMenubarPayload(currentData, providers, optimize, dailyHistory, agentStats, projectSpend, exeOsDetected, statsFileAge)));
+    const projectSpend = buildProjectSpend(allTodayProjects, proj7d, proj30d);
+    const diagnostics = { daysCount, parseTimeMs, warnings };
+    console.log(JSON.stringify(buildMenubarPayload(currentData, providers, optimize, dailyHistory, agentStats, projectSpend, exeOsDetected, statsFileAge, diagnostics)));
     return;
   }
   if (opts.format === "json") {
@@ -7203,8 +7518,9 @@ program.command("plan [action] [id]").description("Show or configure a subscript
 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) => {
   await loadPricing();
   const { range, label } = getDateRange2(opts.period);
+  const scanPromise = prewarmOptimizeScan(range);
   const projects = await parseAllSessions(range, opts.provider);
-  await runOptimize(projects, label, range);
+  await runOptimize(projects, label, range, scanPromise);
 });
 program.command("compare").description("Compare two AI models side-by-side").option("-p, --period <period>", "Analysis period: today, week, 30days, month, all", "all").option("--provider <provider>", "Filter by provider: all, claude, codex, cursor", "all").action(async (opts) => {
   await loadPricing();