codex-devtools 0.2.0 → 0.2.1

package/dist-electron/main/chunks/{CodexServiceContext-BYe2UXME.cjs → CodexServiceContext-DaxLI918.cjs}

@@ -369,16 +369,32 @@ function diffTokenUsage(previous, current) {
     reasoning_output_tokens: current.reasoning_output_tokens - previous.reasoning_output_tokens,
     total_tokens: current.total_tokens - previous.total_tokens
   };
-  const hasNegative = delta.input_tokens < 0 || delta.cached_input_tokens < 0 || delta.output_tokens < 0 || delta.reasoning_output_tokens < 0 || delta.total_tokens < 0;
-  if (hasNegative) {
-    return null;
-  }
-  const isDuplicate = delta.input_tokens === 0 && delta.cached_input_tokens === 0 && delta.output_tokens === 0 && delta.reasoning_output_tokens === 0 && delta.total_tokens === 0;
-  return isDuplicate ? null : delta;
+  const normalized = {
+    input_tokens: Math.max(delta.input_tokens, 0),
+    cached_input_tokens: Math.max(delta.cached_input_tokens, 0),
+    output_tokens: Math.max(delta.output_tokens, 0),
+    reasoning_output_tokens: Math.max(delta.reasoning_output_tokens, 0),
+    total_tokens: Math.max(delta.total_tokens, 0)
+  };
+  const hasAnyPositive = normalized.input_tokens > 0 || normalized.cached_input_tokens > 0 || normalized.output_tokens > 0 || normalized.reasoning_output_tokens > 0 || normalized.total_tokens > 0;
+  return hasAnyPositive ? normalized : null;
 }
 function isSameTokenUsage(left, right) {
   return left.input_tokens === right.input_tokens && left.cached_input_tokens === right.cached_input_tokens && left.output_tokens === right.output_tokens && left.reasoning_output_tokens === right.reasoning_output_tokens && left.total_tokens === right.total_tokens;
 }
+function resolveTokenUsage(previousTotalUsage, currentTotalUsage, fallbackUsage) {
+  if (!previousTotalUsage) {
+    return fallbackUsage;
+  }
+  const delta = diffTokenUsage(previousTotalUsage, currentTotalUsage);
+  if (delta) {
+    return delta;
+  }
+  if (isSameTokenUsage(previousTotalUsage, currentTotalUsage)) {
+    return null;
+  }
+  return fallbackUsage;
+}
 const AGENTS_HEADING_PATTERN = /^#?\s*AGENTS\.md instructions\b/i;
 const AGENTS_INSTRUCTIONS_BLOCK_PATTERN = /<INSTRUCTIONS>[\s\S]*<\/INSTRUCTIONS>/i;
 const ENVIRONMENT_CONTEXT_WRAPPER_PATTERN = /^<environment_context>[\s\S]*<\/environment_context>$/i;
@@ -1022,6 +1038,7 @@ class CodexChunkBuilder {
     let pendingUser = null;
     let lastSeenModelUsage = null;
     let lastSeenCollaborationMode = "";
+    let previousTotalUsage = null;
     const flushAIChunk = () => {
       if (!currentAI) {
         return;
@@ -1276,30 +1293,33 @@ class CodexChunkBuilder {
         addReasoningSection(ai, "event", [entry.payload.text]);
         continue;
       }
-      if (isEventMsgEntry(entry) && isTokenCountPayload(entry.payload)) {
-        this.accumulateMetricsFromTokenEvent(ai.metrics, entry);
-        this.assignTokenUsageToPendingTool(ai, entry);
+      if (isEventMsgEntry(entry) && isTokenCountPayload(entry.payload) && entry.payload.info) {
+        const currentTotalUsage = entry.payload.info.total_token_usage;
+        const usage = resolveTokenUsage(
+          previousTotalUsage,
+          currentTotalUsage,
+          entry.payload.info.last_token_usage
+        );
+        previousTotalUsage = currentTotalUsage;
+        if (!usage) {
+          continue;
+        }
+        this.accumulateMetricsFromTokenUsage(ai.metrics, usage);
+        this.assignTokenUsageToPendingTool(ai, usage);
       }
     }
     flushPendingEventUser();
     flushAIChunk();
     return chunks;
   }
-  accumulateMetricsFromTokenEvent(target, entry) {
-    if (!isTokenCountPayload(entry.payload) || !entry.payload.info) {
-      return;
-    }
-    const usage = entry.payload.info.last_token_usage;
+  accumulateMetricsFromTokenUsage(target, usage) {
     target.inputTokens = (target.inputTokens ?? 0) + usage.input_tokens;
     target.cachedTokens = (target.cachedTokens ?? 0) + usage.cached_input_tokens;
     target.outputTokens = (target.outputTokens ?? 0) + usage.output_tokens;
     target.reasoningTokens = (target.reasoningTokens ?? 0) + usage.reasoning_output_tokens;
     target.totalTokens = (target.totalTokens ?? 0) + usage.total_tokens;
   }
-  assignTokenUsageToPendingTool(ai, entry) {
-    if (!isTokenCountPayload(entry.payload) || !entry.payload.info) {
-      return;
-    }
+  assignTokenUsageToPendingTool(ai, usage) {
     if (ai.pendingUsageToolIndex === null) {
       return;
     }
@@ -1308,13 +1328,14 @@ class CodexChunkBuilder {
       ai.pendingUsageToolIndex = null;
       return;
     }
-    const usage = entry.payload.info.last_token_usage;
     if (tool.tokenUsage) {
       tool.tokenUsage.inputTokens += usage.input_tokens;
+      tool.tokenUsage.cachedInputTokens += usage.cached_input_tokens;
       tool.tokenUsage.outputTokens += usage.output_tokens;
     } else {
       tool.tokenUsage = {
         inputTokens: usage.input_tokens,
+        cachedInputTokens: usage.cached_input_tokens,
         outputTokens: usage.output_tokens
       };
     }
@@ -1478,21 +1499,11 @@ function buildSessionStatsRecord(parsed, revision, nowIso) {
     }
     const timestamp = parseTimestamp(entry.timestamp);
     const currentTotal = entry.payload.info.total_token_usage;
-    let usage;
-    if (previousTotalUsage) {
-      const delta = diffTokenUsage(previousTotalUsage, currentTotal);
-      if (delta) {
-        usage = delta;
-      } else if (isSameTokenUsage(previousTotalUsage, currentTotal)) {
-        previousTotalUsage = currentTotal;
-        continue;
-      } else {
-        usage = entry.payload.info.last_token_usage;
-      }
-    } else {
-      usage = currentTotal;
-    }
+    const usage = resolveTokenUsage(previousTotalUsage, currentTotal, entry.payload.info.last_token_usage);
     previousTotalUsage = currentTotal;
+    if (!usage) {
+      continue;
+    }
     const usageTotals = tokenUsageToTotals(usage);
     addTokenTotals(tokens, usageTotals);
     const modelTotals = ensureModelBucket(modelBuckets, currentModel, currentReasoningEffort);
@@ -1518,7 +1529,7 @@ function buildSessionStatsRecord(parsed, revision, nowIso) {
   }
   const lastActivity = parsed.entries[parsed.entries.length - 1]?.timestamp ?? parsed.session.startTime;
   return {
-    tokenComputationVersion: 2,
+    tokenComputationVersion: 4,
     sessionId: parsed.session.id,
     filePath: parsed.session.filePath,
     revision,
@@ -2030,21 +2041,11 @@ class CodexSessionParser {
         eventMessages.push(entry);
         if (isTokenCountPayload(entry.payload) && entry.payload.info) {
           const currentTotal = entry.payload.info.total_token_usage;
-          let usage;
-          if (previousTotalUsage) {
-            const delta = diffTokenUsage(previousTotalUsage, currentTotal);
-            if (delta) {
-              usage = delta;
-            } else if (isSameTokenUsage(previousTotalUsage, currentTotal)) {
-              previousTotalUsage = currentTotal;
-              continue;
-            } else {
-              usage = entry.payload.info.last_token_usage;
-            }
-          } else {
-            usage = currentTotal;
-          }
+          const usage = resolveTokenUsage(previousTotalUsage, currentTotal, entry.payload.info.last_token_usage);
           previousTotalUsage = currentTotal;
+          if (!usage) {
+            continue;
+          }
           metrics.inputTokens += usage.input_tokens;
           metrics.cachedTokens += usage.cached_input_tokens;
           metrics.outputTokens += usage.output_tokens;
@@ -2383,12 +2384,12 @@ class StatsSnapshotStore {
     }
   }
 }
-const DETAIL_CACHE_PREFIX = "detail-v2";
-const CHUNKS_CACHE_PREFIX = "chunks-v2";
+const DETAIL_CACHE_PREFIX = "detail-v3";
+const CHUNKS_CACHE_PREFIX = "chunks-v4";
 const SESSIONS_CACHE_PREFIX = "sessions";
-const STATS_CACHE_PREFIX = "stats-v1";
+const STATS_CACHE_PREFIX = "stats-v3";
 const UNKNOWN_REVISION = "unknown-revision";
-const TOKEN_COMPUTATION_VERSION = 2;
+const TOKEN_COMPUTATION_VERSION = 4;
 function hasCompactionSignals(entries) {
   return entries.some(
     (entry) => isCompactedEntry(entry) || isCompactionEntry(entry) || isEventMsgEntry(entry) && isContextCompactedPayload(entry.payload)

package/dist-electron/main/index.cjs

@@ -2,7 +2,7 @@
 const electron = require("electron");
 const fs = require("node:fs");
 const path = require("node:path");
-const CodexServiceContext = require("./chunks/CodexServiceContext-BYe2UXME.cjs");
+const CodexServiceContext = require("./chunks/CodexServiceContext-DaxLI918.cjs");
 require("node:events");
 require("node:os");
 require("node:crypto");

package/dist-electron/main/standalone.cjs

@@ -5,7 +5,7 @@ const fastifyStatic = require("@fastify/static");
 const Fastify = require("fastify");
 const path = require("node:path");
 const node_url = require("node:url");
-const CodexServiceContext = require("./chunks/CodexServiceContext-BYe2UXME.cjs");
+const CodexServiceContext = require("./chunks/CodexServiceContext-DaxLI918.cjs");
 const fs = require("node:fs");
 require("node:events");
 require("node:os");

package/out/renderer/assets/{index-C-iGxog-.js → index-5ydAmpDO.js}

@@ -9423,27 +9423,124 @@ const DashboardView = () => {
     ] })
   ] });
 };
-function formatDuration$1(durationMs) {
-  if (!Number.isFinite(durationMs) || durationMs <= 0) {
-    return "0m";
-  }
-  const totalMinutes = Math.round(durationMs / 6e4);
-  const hours = Math.floor(totalMinutes / 60);
-  const minutes = totalMinutes % 60;
-  if (hours <= 0) {
-    return `${minutes}m`;
-  }
-  if (minutes === 0) {
-    return `${hours}h`;
-  }
-  return `${hours}h ${minutes}m`;
-}
+const CONTRIBUTION_WEEKDAY_LABELS = ["", "Mon", "", "Wed", "", "Fri", ""];
+const CALENDAR_METRIC_OPTIONS = [
+  { value: "totalTokens", label: "Total tokens", tooltipLabel: "total tokens" },
+  { value: "inputTokens", label: "Input tokens", tooltipLabel: "input tokens" },
+  { value: "outputTokens", label: "Output tokens", tooltipLabel: "output tokens" },
+  { value: "eventCount", label: "Events", tooltipLabel: "events" },
+  { value: "sessionCount", label: "Sessions", tooltipLabel: "sessions" }
+];
 function normalizeScope(scope) {
   if (scope.type === "project" && scope.cwd.trim().length > 0) {
     return { type: "project", cwd: scope.cwd.trim() };
   }
   return { type: "all" };
 }
+function parseDateKey(value) {
+  return /* @__PURE__ */ new Date(`${value}T00:00:00`);
+}
+function formatDateKey(date) {
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, "0");
+  const day = String(date.getDate()).padStart(2, "0");
+  return `${year}-${month}-${day}`;
+}
+function getContributionLevel(outputTokens, maxOutputTokens) {
+  if (!Number.isFinite(outputTokens) || outputTokens <= 0 || maxOutputTokens <= 0) {
+    return 0;
+  }
+  const normalized = Math.log(outputTokens + 1) / Math.log(maxOutputTokens + 1);
+  if (normalized < 0.25) {
+    return 1;
+  }
+  if (normalized < 0.5) {
+    return 2;
+  }
+  if (normalized < 0.75) {
+    return 3;
+  }
+  return 4;
+}
+function getDailyMetricValue(point, metric) {
+  if (!point) {
+    return 0;
+  }
+  switch (metric) {
+    case "totalTokens":
+      return point.totalTokens;
+    case "inputTokens":
+      return point.inputTokens;
+    case "outputTokens":
+      return point.outputTokens;
+    case "eventCount":
+      return point.eventCount;
+    case "sessionCount":
+      return point.sessionCount;
+    default:
+      return 0;
+  }
+}
+function buildDailyContributionGrid(daily, metric) {
+  if (daily.length === 0) {
+    return {
+      weeks: [],
+      months: []
+    };
+  }
+  const sorted = [...daily].sort((left, right) => left.date.localeCompare(right.date));
+  const valuesByDate = new Map(sorted.map((point) => [point.date, point]));
+  const maxMetricValue = Math.max(...sorted.map((point) => getDailyMetricValue(point, metric)), 0);
+  const firstDate = parseDateKey(sorted[0].date);
+  const lastDate = parseDateKey(sorted[sorted.length - 1].date);
+  const paddedStart = new Date(firstDate);
+  paddedStart.setDate(paddedStart.getDate() - paddedStart.getDay());
+  const paddedEnd = new Date(lastDate);
+  paddedEnd.setDate(paddedEnd.getDate() + (6 - paddedEnd.getDay()));
+  const weeks = [];
+  const cursor = new Date(paddedStart);
+  while (cursor <= paddedEnd) {
+    const week = [];
+    for (let offset = 0; offset < 7; offset += 1) {
+      const date = formatDateKey(cursor);
+      const point = valuesByDate.get(date);
+      const inRange = cursor >= firstDate && cursor <= lastDate;
+      const metricValue = getDailyMetricValue(point, metric);
+      week.push({
+        date,
+        metricValue,
+        level: getContributionLevel(metricValue, maxMetricValue),
+        inRange
+      });
+      cursor.setDate(cursor.getDate() + 1);
+    }
+    weeks.push(week);
+  }
+  const months = [];
+  let previousMonthKey = "";
+  weeks.forEach((week, weekIndex) => {
+    const monthStartCell = week.find((cell) => cell.inRange && cell.date.endsWith("-01"));
+    const anchor = monthStartCell != null ? monthStartCell : week.find((cell) => cell.inRange);
+    if (!anchor) {
+      return;
+    }
+    const monthDate = parseDateKey(anchor.date);
+    const monthKey = `${monthDate.getFullYear()}-${String(monthDate.getMonth() + 1).padStart(2, "0")}`;
+    if (monthKey === previousMonthKey) {
+      return;
+    }
+    months.push({
+      key: monthKey,
+      label: monthDate.toLocaleString(void 0, { month: "short" }),
+      weekIndex
+    });
+    previousMonthKey = monthKey;
+  });
+  return {
+    weeks,
+    months
+  };
+}
 const StatsView = () => {
   const {
     projects,
@@ -9462,6 +9559,8 @@ const StatsView = () => {
     fetchStats: state.fetchStats,
     setStatsScope: state.setStatsScope
   }));
+  const [calendarMetric, setCalendarMetric] = reactExports.useState("outputTokens");
+  const [contributionTooltip, setContributionTooltip] = reactExports.useState(null);
   reactExports.useEffect(() => {
     if (!statsData && !statsLoading) {
       void fetchStats(statsScope);
@@ -9470,7 +9569,7 @@ const StatsView = () => {
   const dailyMaxOutput = reactExports.useMemo(
     () => {
       var _a;
-      return Math.max(...(_a = statsData == null ? void 0 : statsData.daily.map((point) => point.outputTokens)) != null ? _a : [1]);
+      return Math.max(...(_a = statsData == null ? void 0 : statsData.daily.map((point) => point.outputTokens)) != null ? _a : [0]);
     },
     [statsData]
   );
@@ -9481,6 +9580,30 @@ const StatsView = () => {
     },
     [statsData]
   );
+  const dailyContributionGrid = reactExports.useMemo(
+    () => {
+      var _a;
+      return buildDailyContributionGrid((_a = statsData == null ? void 0 : statsData.daily) != null ? _a : [], calendarMetric);
+    },
+    [statsData, calendarMetric]
+  );
+  const selectedCalendarMetricOption = reactExports.useMemo(
+    () => {
+      var _a;
+      return (_a = CALENDAR_METRIC_OPTIONS.find((option) => option.value === calendarMetric)) != null ? _a : CALENDAR_METRIC_OPTIONS[2];
+    },
+    [calendarMetric]
+  );
+  reactExports.useEffect(() => {
+    setContributionTooltip(null);
+  }, [calendarMetric, statsData]);
+  const uncachedInputTokens = reactExports.useMemo(
+    () => {
+      var _a, _b;
+      return Math.max(((_a = statsData == null ? void 0 : statsData.totals.inputTokens) != null ? _a : 0) - ((_b = statsData == null ? void 0 : statsData.totals.cachedTokens) != null ? _b : 0), 0);
+    },
+    [statsData]
+  );
   return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "stats-shell", children: [
     /* @__PURE__ */ jsxRuntimeExports.jsxs("header", { className: "stats-header", children: [
       /* @__PURE__ */ jsxRuntimeExports.jsx("h2", { children: "Stats" }),
@@ -9550,20 +9673,20 @@ const StatsView = () => {
           /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "stat-label", children: "Total tokens" }),
           /* @__PURE__ */ jsxRuntimeExports.jsx("strong", { className: "stat-value", children: statsData.totals.totalTokens.toLocaleString() })
         ] }),
+        /* @__PURE__ */ jsxRuntimeExports.jsxs(
+          "article",
+          {
+            className: "stat-card",
+            title: `Cached: ${statsData.totals.cachedTokens.toLocaleString()} | Uncached: ${uncachedInputTokens.toLocaleString()}`,
+            children: [
+              /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "stat-label", children: "In" }),
+              /* @__PURE__ */ jsxRuntimeExports.jsx("strong", { className: "stat-value", children: statsData.totals.inputTokens.toLocaleString() })
+            ]
+          }
+        ),
         /* @__PURE__ */ jsxRuntimeExports.jsxs("article", { className: "stat-card", children: [
-          /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "stat-label", children: "Generated tokens" }),
+          /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "stat-label", children: "Out" }),
           /* @__PURE__ */ jsxRuntimeExports.jsx("strong", { className: "stat-value", children: statsData.totals.outputTokens.toLocaleString() })
-        ] }),
-        /* @__PURE__ */ jsxRuntimeExports.jsxs("article", { className: "stat-card", children: [
-          /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "stat-label", children: "Active time" }),
-          /* @__PURE__ */ jsxRuntimeExports.jsx("strong", { className: "stat-value", children: formatDuration$1(statsData.totals.durationMs) })
-        ] }),
-        /* @__PURE__ */ jsxRuntimeExports.jsxs("article", { className: "stat-card", children: [
-          /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "stat-label", children: "Sessions" }),
-          /* @__PURE__ */ jsxRuntimeExports.jsxs("strong", { className: "stat-value", children: [
-            statsData.totals.sessions.toLocaleString(),
-            statsData.totals.archivedSessions > 0 ? ` (${statsData.totals.archivedSessions.toLocaleString()} archived)` : ""
-          ] })
         ] })
       ] }),
       /* @__PURE__ */ jsxRuntimeExports.jsxs("section", { className: "stats-section", children: [
@@ -9572,7 +9695,8 @@ const StatsView = () => {
           /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "stats-section-subtle", children: "Output tokens" })
         ] }),
         statsData.daily.length === 0 ? /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "empty-copy", children: "No daily token data yet." }) : /* @__PURE__ */ jsxRuntimeExports.jsx("ul", { className: "stats-day-list", children: statsData.daily.map((point) => {
-          const widthPercent = dailyMaxOutput > 0 ? Math.max(6, point.outputTokens / dailyMaxOutput * 100) : 6;
+          const rawWidthPercent = dailyMaxOutput > 0 ? point.outputTokens / dailyMaxOutput * 100 : 0;
+          const widthPercent = Number.isFinite(rawWidthPercent) ? Math.max(0, Math.min(100, rawWidthPercent)) : 0;
           return /* @__PURE__ */ jsxRuntimeExports.jsxs("li", { className: "stats-day-row", children: [
             /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "stats-day-label", children: point.date }),
             /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "stats-day-bar-wrap", children: /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "stats-day-bar", style: { width: `${widthPercent}%` } }) }),
@@ -9580,6 +9704,117 @@ const StatsView = () => {
           ] }, point.date);
         }) })
       ] }),
+      /* @__PURE__ */ jsxRuntimeExports.jsxs("section", { className: "stats-section", children: [
+        /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "stats-section-header", children: [
+          /* @__PURE__ */ jsxRuntimeExports.jsx("h3", { children: "Output calendar" }),
+          /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "stats-section-header-actions", children: [
+            /* @__PURE__ */ jsxRuntimeExports.jsx("label", { className: "sidebar-label", htmlFor: "stats-calendar-metric", children: "Type" }),
+            /* @__PURE__ */ jsxRuntimeExports.jsx(
+              "select",
+              {
+                id: "stats-calendar-metric",
+                className: "app-select stats-contrib-select",
+                value: calendarMetric,
+                onChange: (event) => {
+                  setCalendarMetric(event.target.value);
+                },
+                children: CALENDAR_METRIC_OPTIONS.map((option) => /* @__PURE__ */ jsxRuntimeExports.jsx("option", { value: option.value, children: option.label }, option.value))
+              }
+            )
+          ] })
+        ] }),
+        dailyContributionGrid.weeks.length === 0 ? /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "empty-copy", children: "No daily token data yet." }) : /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "stats-contrib-frame", children: [
+          /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "stats-contrib-weekdays", children: CONTRIBUTION_WEEKDAY_LABELS.map((label, index) => /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: label }, `contrib-weekday-${index}`)) }),
+          /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "stats-contrib-scroll", children: [
+            /* @__PURE__ */ jsxRuntimeExports.jsx(
+              "div",
+              {
+                className: "stats-contrib-months",
+                style: { gridTemplateColumns: `repeat(${dailyContributionGrid.weeks.length}, 12px)` },
+                children: dailyContributionGrid.months.map((month) => /* @__PURE__ */ jsxRuntimeExports.jsx(
+                  "span",
+                  {
+                    className: "stats-contrib-month",
+                    style: { gridColumn: String(month.weekIndex + 1) },
+                    children: month.label
+                  },
+                  month.key
+                ))
+              }
+            ),
+            /* @__PURE__ */ jsxRuntimeExports.jsx(
+              "div",
+              {
+                className: "stats-contrib-weeks",
+                role: "img",
+                "aria-label": "Daily output tokens calendar heatmap",
+                children: dailyContributionGrid.weeks.map((week, weekIndex) => /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "stats-contrib-week", children: week.map((cell) => {
+                  const tooltipText = `${cell.date} • ${cell.metricValue.toLocaleString()} ${selectedCalendarMetricOption.tooltipLabel}`;
+                  return /* @__PURE__ */ jsxRuntimeExports.jsx(
+                    "div",
+                    {
+                      className: `stats-contrib-cell level-${cell.level}${!cell.inRange ? " is-padding" : ""}${cell.inRange && cell.level === 0 ? " is-empty" : ""}`,
+                      title: cell.inRange ? tooltipText : void 0,
+                      "aria-label": cell.inRange ? tooltipText : void 0,
+                      tabIndex: cell.inRange ? 0 : -1,
+                      onMouseEnter: (event) => {
+                        if (!cell.inRange) {
+                          return;
+                        }
+                        setContributionTooltip({
+                          text: tooltipText,
+                          x: event.clientX,
+                          y: event.clientY
+                        });
+                      },
+                      onMouseMove: (event) => {
+                        if (!cell.inRange) {
+                          return;
+                        }
+                        setContributionTooltip({
+                          text: tooltipText,
+                          x: event.clientX,
+                          y: event.clientY
+                        });
+                      },
+                      onMouseLeave: () => {
+                        setContributionTooltip(null);
+                      },
+                      onFocus: (event) => {
+                        if (!cell.inRange) {
+                          return;
+                        }
+                        const rect = event.currentTarget.getBoundingClientRect();
+                        setContributionTooltip({
+                          text: tooltipText,
+                          x: rect.left + rect.width / 2,
+                          y: rect.bottom + 4
+                        });
+                      },
+                      onBlur: () => {
+                        setContributionTooltip(null);
+                      }
+                    },
+                    cell.date
+                  );
+                }) }, `week-${weekIndex}`))
+              }
+            )
+          ] })
+        ] }),
+        contributionTooltip ? /* @__PURE__ */ jsxRuntimeExports.jsx(
+          "div",
+          {
+            className: "stats-contrib-tooltip",
+            role: "tooltip",
+            style: {
+              left: `${contributionTooltip.x + 12}px`,
+              top: `${contributionTooltip.y + 12}px`
+            },
+            children: contributionTooltip.text
+          }
+        ) : null
+      ] }),
       /* @__PURE__ */ jsxRuntimeExports.jsxs("section", { className: "stats-grid-2", children: [
         /* @__PURE__ */ jsxRuntimeExports.jsxs("article", { className: "stats-section", children: [
           /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "stats-section-header", children: [
@@ -11149,12 +11384,15 @@ function parseCommandPreview(execution) {
   return null;
 }
 const ExecutionTrace = ({ execution }) => {
-  var _a, _b, _c;
+  var _a, _b, _c, _d, _e;
   const [expanded, setExpanded] = reactExports.useState(false);
   const output = (_b = (_a = execution.functionOutput) == null ? void 0 : _a.output) != null ? _b : "";
   const commandPreview = reactExports.useMemo(() => parseCommandPreview(execution), [execution]);
   const isTerminalCommand = reactExports.useMemo(() => isTerminalCommandExecution(execution), [execution]);
-  const tokenUsageLabel = execution.tokenUsage ? `${execution.tokenUsage.inputTokens.toLocaleString()} in • ${execution.tokenUsage.outputTokens.toLocaleString()} out` : null;
+  const tokenUsageLabel = execution.tokenUsage ? `${execution.tokenUsage.inputTokens.toLocaleString()} in (${((_c = execution.tokenUsage.cachedInputTokens) != null ? _c : 0).toLocaleString()} cached + ${Math.max(
+    execution.tokenUsage.inputTokens - ((_d = execution.tokenUsage.cachedInputTokens) != null ? _d : 0),
+    0
+  ).toLocaleString()} uncached) • ${execution.tokenUsage.outputTokens.toLocaleString()} out` : null;
   const formattedArguments = reactExports.useMemo(
     () => prettyPrintJson(execution.functionCall.arguments),
     [execution.functionCall.arguments]
@@ -11163,7 +11401,7 @@ const ExecutionTrace = ({ execution }) => {
   return /* @__PURE__ */ jsxRuntimeExports.jsxs(
     "section",
     {
-      className: `trace-card ${((_c = execution.functionOutput) == null ? void 0 : _c.isError) ? "error" : ""} ${isTerminalCommand ? "terminal" : ""}`,
+      className: `trace-card ${((_e = execution.functionOutput) == null ? void 0 : _e.isError) ? "error" : ""} ${isTerminalCommand ? "terminal" : ""}`,
       children: [
         /* @__PURE__ */ jsxRuntimeExports.jsxs(
           "button",
@@ -11211,7 +11449,9 @@ const ExecutionTraceGroup = ({
 }) => {
   const [expanded, setExpanded] = reactExports.useState(false);
   const tokenTotals = reactExports.useMemo(() => {
+    var _a;
     let inputTokens = 0;
+    let cachedInputTokens = 0;
     let outputTokens = 0;
     let hasTokenUsage = false;
     for (const execution of executions) {
@@ -11220,15 +11460,19 @@ const ExecutionTraceGroup = ({
       }
       hasTokenUsage = true;
       inputTokens += execution.tokenUsage.inputTokens;
+      cachedInputTokens += (_a = execution.tokenUsage.cachedInputTokens) != null ? _a : 0;
       outputTokens += execution.tokenUsage.outputTokens;
     }
-    return { hasTokenUsage, inputTokens, outputTokens };
+    return { hasTokenUsage, inputTokens, cachedInputTokens, outputTokens };
   }, [executions]);
   if (executions.length === 0) {
     return null;
   }
   const countLabel = `${executions.length} command${executions.length === 1 ? "" : "s"}`;
-  const tokenUsageLabel = tokenTotals.hasTokenUsage ? `${tokenTotals.inputTokens.toLocaleString()} in • ${tokenTotals.outputTokens.toLocaleString()} out` : null;
+  const tokenUsageLabel = tokenTotals.hasTokenUsage ? `${tokenTotals.inputTokens.toLocaleString()} in (${tokenTotals.cachedInputTokens.toLocaleString()} cached + ${Math.max(
+    tokenTotals.inputTokens - tokenTotals.cachedInputTokens,
+    0
+  ).toLocaleString()} uncached) • ${tokenTotals.outputTokens.toLocaleString()} out` : null;
   return /* @__PURE__ */ jsxRuntimeExports.jsxs("section", { className: "trace-group-card", children: [
     /* @__PURE__ */ jsxRuntimeExports.jsxs(
       "button",

package/out/renderer/assets/{index-D3FYKy1U.css → index-Cgat1ue6.css}

@@ -1021,6 +1021,25 @@ select {
   letter-spacing: 0.06em;
 }
 
+.stats-section-header-actions {
+  margin-left: auto;
+  display: inline-flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.stats-section-header-actions .sidebar-label,
+.stats-section-header-actions .stats-section-subtle {
+  white-space: nowrap;
+}
+
+.stats-contrib-select {
+  width: auto;
+  min-width: 156px;
+  padding: 6px 9px;
+  font-size: 0.78rem;
+}
+
 .stats-day-list {
   list-style: none;
   margin: 0;
@@ -1061,6 +1080,120 @@ select {
   background: linear-gradient(90deg, rgba(59, 130, 246, 0.8), rgba(56, 189, 248, 0.85));
 }
 
+.stats-contrib-frame {
+  display: grid;
+  grid-template-columns: 30px minmax(0, 1fr);
+  gap: 8px;
+}
+
+.stats-contrib-weekdays {
+  display: grid;
+  grid-template-rows: repeat(7, 12px);
+  gap: 3px;
+  padding-top: 18px;
+}
+
+.stats-contrib-weekdays span {
+  font-size: 0.63rem;
+  line-height: 12px;
+  color: var(--text-muted);
+  text-align: right;
+}
+
+.stats-contrib-scroll {
+  min-width: 0;
+  overflow-x: auto;
+  overflow-y: hidden;
+  padding-bottom: 2px;
+}
+
+.stats-contrib-months {
+  display: grid;
+  gap: 3px;
+  margin-bottom: 4px;
+  min-width: -moz-max-content;
+  min-width: max-content;
+}
+
+.stats-contrib-month {
+  font-size: 0.66rem;
+  color: var(--text-muted);
+  font-family: var(--font-mono);
+}
+
+.stats-contrib-weeks {
+  display: flex;
+  gap: 3px;
+  min-width: -moz-max-content;
+  min-width: max-content;
+}
+
+.stats-contrib-week {
+  display: grid;
+  grid-template-rows: repeat(7, 12px);
+  gap: 3px;
+}
+
+.stats-contrib-cell {
+  width: 12px;
+  height: 12px;
+  border-radius: 3px;
+  border: 1px solid rgba(59, 130, 246, 0.25);
+  background: rgba(59, 130, 246, 0.08);
+  cursor: pointer;
+}
+
+.stats-contrib-cell.level-0 {
+  background: rgba(59, 130, 246, 0.08);
+  border-color: rgba(59, 130, 246, 0.2);
+}
+
+.stats-contrib-cell.level-1 {
+  background: rgba(59, 130, 246, 0.28);
+  border-color: rgba(59, 130, 246, 0.3);
+}
+
+.stats-contrib-cell.level-2 {
+  background: rgba(59, 130, 246, 0.46);
+  border-color: rgba(59, 130, 246, 0.45);
+}
+
+.stats-contrib-cell.level-3 {
+  background: rgba(59, 130, 246, 0.64);
+  border-color: rgba(59, 130, 246, 0.6);
+}
+
+.stats-contrib-cell.level-4 {
+  background: rgba(59, 130, 246, 0.82);
+  border-color: rgba(59, 130, 246, 0.78);
+}
+
+.stats-contrib-cell.is-empty {
+  background: rgba(59, 130, 246, 0.05);
+}
+
+.stats-contrib-cell.is-padding {
+  background: transparent;
+  border-color: transparent;
+  cursor: default;
+}
+
+.stats-contrib-tooltip {
+  position: fixed;
+  z-index: 30;
+  max-width: min(320px, calc(100vw - 24px));
+  border: 1px solid var(--border-strong);
+  border-radius: 8px;
+  background: var(--bg-panel-raised);
+  color: var(--text-primary);
+  padding: 6px 8px;
+  font-size: 0.72rem;
+  font-family: var(--font-mono);
+  line-height: 1.3;
+  pointer-events: none;
+  white-space: nowrap;
+}
+
 .stats-grid-2 {
   display: grid;
   gap: 12px;
@@ -1387,6 +1520,30 @@ select {
     gap: 8px;
   }
 
+  .stats-section-header-actions {
+    width: 100%;
+    margin-left: 0;
+    justify-content: space-between;
+  }
+
+  .stats-contrib-select {
+    flex: 1;
+    min-width: 0;
+    max-width: 180px;
+  }
+
+  .stats-contrib-frame {
+    grid-template-columns: 1fr;
+  }
+
+  .stats-contrib-weekdays {
+    display: none;
+  }
+
+  .stats-contrib-month {
+    font-size: 0.6rem;
+  }
+
   .chat-session-token-strip {
     flex-wrap: wrap;
     gap: 8px;

package/out/renderer/index.html

@@ -7,8 +7,8 @@
     <link rel="icon" type="image/png" sizes="32x32" href="./assets/32x32-DQgygEFU.png" />
     <link rel="icon" type="image/png" sizes="16x16" href="./assets/16x16-B2_QkmoB.png" />
     <title>codex-devtools</title>
-    <script type="module" crossorigin src="./assets/index-C-iGxog-.js"></script>
-    <link rel="stylesheet" crossorigin href="./assets/index-D3FYKy1U.css">
+    <script type="module" crossorigin src="./assets/index-5ydAmpDO.js"></script>
+    <link rel="stylesheet" crossorigin href="./assets/index-Cgat1ue6.css">
   </head>
   <body>
     <div id="root">

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "codex-devtools",
   "type": "module",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Desktop app for inspecting Codex session data",
   "license": "MIT",
   "author": {