taskchef 9.6.0 → 9.7.0

package/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "taskchef",
-  "version": "9.6.0",
+  "version": "9.7.0",
   "description": "Native Codex dashboard with lightweight project delegation.",
   "author": {
     "name": "Favo Yang",

package/docs/mcp-app.md

@@ -367,7 +367,7 @@ a marketplace does not automatically move their installed plugin identity.
 
 ## Usage analytics
 
-![Usage analytics with sample data](images/usage-analytics.jpg)
+![Usage analytics with sample data](images/usage-project-tokens.png)
 
 The Board/Usage selector sits beside the logo in the navbar, separated from
 Board filters by a divider. It opens an on-demand historical usage view. Ranges are
@@ -376,7 +376,15 @@ Last month (the full previous calendar month). The default is 30 days; the
 selected range is remembered locally when Usage is reopened.
 There is no custom range. Dates use the view's local timezone, including DST.
 Range changes and reopening Usage query one shared history snapshot without
-rescanning logs. The snapshot is scoped by CLI/exec visibility, independently of
+rescanning logs. The combined snapshot is also saved atomically with private file
+permissions under `~/.agents/taskchef/cache/usage-history/`, scoped by Codex home
+and CLI/exec visibility. It contains the fields needed for charts, including
+weekly readings, and no message content or per-file parsing records. After an
+MCP server restart, the first Usage request loads a compatible disk snapshot
+and returns saved charts before refreshing history in the background. Range and
+timezone changes share that refresh. A missing, damaged, or incompatible snapshot
+falls back to a normal scan. A failed background refresh retains the last good
+snapshot, shows a Retry action, and never overwrites it with a failed result. The snapshot is scoped by CLI/exec visibility, independently of
 range or timezone. After one minute it refreshes in the background while cached
 charts remain visible. Refresh explicitly rebuilds it, reusing existing per-file
 metadata and incremental parsing caches. Unchanged files retain parsed records
@@ -387,14 +395,31 @@ metadata changes; transient I/O failures retry while retaining healthy sources.
 Rescan explicitly reparses available files and refreshes the inventory, while
 retaining known history for missing sources. Board polling never starts a history scan.
 
-The combined chart uses cost bars on the left axis and a token line on the
-right. Today's cost bars have a lighter fill and dashed borders in both charts;
-the token segment leading into today is dashed too. Finished days, including
-the last day of Last month, stay solid. The project chart uses stacked cost bars for the period's top five
-projects plus Other. Select a legend entry or a Top 10 row to isolate that
-project in the project chart; All projects restores the stack. Hovering or
-focusing a legend entry highlights its bars and dims other project colors. Totals, the
-combined chart, and rankings always describe the full selected period.
+The combined Tokens and cost chart uses cost bars on the left axis and a token
+line on the right. Bars emphasize daily spending; the line shows activity changes.
+Today's cost bars have a lighter fill and dashed borders; token segments leading
+into today are dashed too. Finished days stay solid.
+Tokens and cost by project shows stacked cost bars followed by a stacked token
+area chart. Both use the period's top ten projects by estimated cost plus Other,
+with matching colors. Select a legend entry or a Top 10 row to isolate that
+project in both charts; All projects restores the stacks. Hovering or focusing
+a legend entry highlights that project in both charts. Hover or focus a day in
+the token chart to inspect exact project tokens and cost. Totals, the combined
+chart, and rankings always describe the full selected period.
+
+Weekly limits occupies one third of the summary row beside Recorded tokens and
+Estimated cost. Narrow views stack these cards. Its heading shows the latest
+recorded Codex percentage left and the next reset in the viewer's timezone.
+The latest reading is independent of the chart's selected historical period;
+a reading whose reset has passed is unavailable until a new observation arrives.
+Only the main Codex bucket appears; model-specific limits are excluded. The
+compact chart uses the last observation per local day and connects observations
+across missing days. Known resets add an explicit refill jump. Connecting lines
+interpolate between recorded points; they are not additional measurements.
+Codex writes service-provided seven-day primary or secondary allowance windows
+into local rollout token-count events, including events without token counters.
+TaskChef reads these logs; it does not poll the service for current allowance.
+Root-chat CLI/exec visibility controls which logs supply observations.
 
 Archived chats and descendant usage are included. CLI/exec visibility settings
 still apply to root chats. Descendants are counted once under their root chat's

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "taskchef",
-  "version": "9.6.0",
+  "version": "9.7.0",
   "description": "A native Codex dashboard for chats, usage, pull requests, and schedules.",
   "license": "Apache-2.0",
   "author": "Favo Yang",

package/src/codex-session-usage.js

@@ -19,9 +19,10 @@ const bucket = () => ({ tokens: zero(), costUsd: 0, partial: false, costPartial:
 // Cumulative totals and call counters are independent. A missing boundary can
 // leave one turn partial without preventing later calls from being allocated.
 export function summarizeRecords(records, latestTurnId, models, child = false) {
-  const total = bucket(), latest = bucket(), durations = new Map(), seen = new Set(), timeline = [];
+  const total = bucket(), latest = bucket(), durations = new Map(), seen = new Set(), timeline = [], weeklyLimits = [];
   let previous = zero();
   for (const record of [...records].sort((a, b) => a.time - b.time || a.order - b.order)) {
+    if (record.kind === "weekly-limit") { weeklyLimits.push(record); continue; }
     const key = JSON.stringify([record.time, record.kind, record.turn, record.root, record.model, record.total, record.last, record.duration]);
     if (seen.has(key)) continue;
     seen.add(key);
@@ -71,7 +72,7 @@ export function summarizeRecords(records, latestTurnId, models, child = false) {
       latest.partial = latest.costPartial = true;
     }
   }
-  return { total, latest, durations, timeline };
+  return { total, latest, durations, timeline, weeklyLimits };
 }
 
 async function inventory(root, paths = []) {
@@ -138,7 +139,7 @@ export class CodexSessionUsage {
     if (!saved && cachePath) {
       try {
         const value = JSON.parse(await readFile(cachePath, "utf8"));
-        if ([1, 2, 3].includes(value.version) && validResult(value.result) && (value.version === 1 || (Array.isArray(value.result.timeline) && value.result.timeline.every(sample => Number.isFinite(sample.time) && usage(sample.tokens) && Number.isFinite(sample.costUsd) && sample.costUsd >= 0 && sample.samples === 1 && typeof sample.partial === "boolean" && typeof sample.costPartial === "boolean")))) saved = value;
+        if ([1, 2, 3, 4].includes(value.version) && validResult(value.result) && (value.version === 1 || (Array.isArray(value.result.timeline) && value.result.timeline.every(sample => Number.isFinite(sample.time) && usage(sample.tokens) && Number.isFinite(sample.costUsd) && sample.costUsd >= 0 && sample.samples === 1 && typeof sample.partial === "boolean" && typeof sample.costPartial === "boolean")))) saved = value;
       } catch { /* An absent or damaged cache is rebuilt from source records. */ }
     }
     const sourceKeys = (items) => items.flatMap(([sessionId, versions]) => versions
@@ -164,7 +165,7 @@ export class CodexSessionUsage {
       })) knownSources = [];
     } catch { knownSources = []; /* No prior valid source coverage is available. */ }
     const missingSources = knownSources.filter(key => !currentSources.has(key));
-    if (!rescan && !saved?.retryRead && saved?.version === 3 && typeof saved.result.analyticsPartial === "boolean" && saved.recordSources && saved.sourceSignature === sourceSignature) { this.results.set(resultKey, saved); return saved.result; }
+    if (!rescan && !saved?.retryRead && saved?.version === 4 && typeof saved.result.analyticsPartial === "boolean" && saved.recordSources && saved.sourceSignature === sourceSignature) { this.results.set(resultKey, saved); return saved.result; }
     const availablePaths = new Set(sources.flatMap(([, versions]) => versions.filter(version => version.length > 2).map(version => version[0])));
     let retryRead = false;
     const parsed = [];
@@ -183,7 +184,7 @@ export class CodexSessionUsage {
           if (!availablePaths.has(path)) throw new Error("Rollout is missing.");
           const previous = saved?.sourceFiles?.[sourceKey];
           let file;
-          if (!rescan && previous && JSON.stringify(previous.stamp) === JSON.stringify(stamp) && Array.isArray(saved.recordSources?.[sourceKey])) {
+          if (!rescan && saved?.version === 4 && previous && JSON.stringify(previous.stamp) === JSON.stringify(stamp) && Array.isArray(saved.recordSources?.[sourceKey])) {
             file = { records: saved.recordSources[sourceKey], partial: previous.partial };
           } else {
             if (rescan) this.files.delete(path);
@@ -208,10 +209,10 @@ export class CodexSessionUsage {
     const retainedSources = saved?.recordSources && typeof saved.recordSources === "object" ? saved.recordSources : {};
     for (const key of missingSources) {
       const rows = retainedSources[key];
-      if (Array.isArray(rows) && rows.every(row => row && Number.isFinite(row.time) && ["usage", "duration", "issue"].includes(row.kind))) recordSources[key] = rows;
+      if (Array.isArray(rows) && rows.every(row => row && Number.isFinite(row.time) && ["usage", "duration", "issue", "weekly-limit"].includes(row.kind))) recordSources[key] = rows;
     }
     const result = { latest: bucket(), total: bucket(), subagents: sessions.length - 1, pricingDate: pricing.date,
-      durationMs: 0, durationTurns: 0, timeline: [], analyticsPartial: inventoryFailed, partial: inventoryFailed };
+      durationMs: 0, durationTurns: 0, timeline: [], weeklyLimits: [], analyticsPartial: inventoryFailed, partial: inventoryFailed };
     for (const { session, records, failed, latestFailed, timePartial } of parsed) {
       const summary = summarizeRecords(records, latestTurnId, pricing.models, session.id !== id);
       const retained = missingSources.filter(key => JSON.parse(key)[0] === session.id).flatMap(key => recordSources[key] ?? []);
@@ -226,9 +227,11 @@ export class CodexSessionUsage {
         summary.latest.costPartial ||= missing.latest.samples > 0 || missing.latest.costPartial;
         summary.durations = combined.durations;
         summary.timeline = combined.timeline;
+        summary.weeklyLimits = combined.weeklyLimits;
       }
       result.analyticsPartial ||= timePartial || summary.total.tokens.total_tokens !== summary.timeline.reduce((sum, sample) => sum + sample.tokens.total_tokens, 0);
       result.timeline.push(...summary.timeline);
+      result.weeklyLimits.push(...summary.weeklyLimits);
       for (const key of ["total", "latest"]) {
         add(result[key].tokens, summary[key].tokens);
         result[key].costUsd += summary[key].costUsd;
@@ -267,7 +270,7 @@ export class CodexSessionUsage {
       }
       if (missingSources.some(key => JSON.parse(key)[0] === id)) result.partial = true;
     }
-    const entry = { version: 3, sourceSignature, result, recordSources, sourceFiles, retryRead, knownSources: [...new Set([...knownSources, ...currentSources])] };
+    const entry = { version: 4, sourceSignature, result, recordSources, sourceFiles, retryRead, knownSources: [...new Set([...knownSources, ...currentSources])] };
     // Keep successful sources even if another source failed. Retry failures on
     // the next read without reparsing all healthy historical files.
     this.results.set(resultKey, entry);
@@ -341,6 +344,16 @@ export class CodexSessionUsage {
     if (p.type === "task_started") { file.turn = p.turn_id; file.root = p.root_turn_id ?? file.root; }
     const time = Date.parse(row.timestamp);
     if (!Number.isFinite(time)) { file.partial = true; return; }
+    if (p.type === "token_count" && p.rate_limits) {
+      const limits = p.rate_limits;
+      for (const window of [limits.primary, limits.secondary]) {
+        if (window?.window_minutes !== 10080 || !Number.isFinite(window.used_percent)
+          || window.used_percent < 0 || window.used_percent > 100 || !Number.isSafeInteger(window.resets_at) || window.resets_at * 1000 <= time) continue;
+        file.records.push({ kind: "weekly-limit", time, id: typeof limits.limit_id === "string" ? limits.limit_id : "codex",
+          name: typeof limits.limit_name === "string" ? limits.limit_name : null,
+          remainingPercent: 100 - window.used_percent, resetsAt: window.resets_at * 1000 });
+      }
+    }
     if (p.type === "token_count" && p.info) file.records.push({ kind: "usage", time, order: file.offset,
       turn: file.turn, root: file.root, model: file.model, total: p.info.total_token_usage, last: p.info.last_token_usage });
     if (["task_complete", "turn_aborted"].includes(p.type)) {