tokentracker-cli 1.5.15 → 1.5.17

package/src/lib/qoder-limits.js

@@ -6,6 +6,7 @@ const net = require("node:net");
 const os = require("node:os");
 const path = require("node:path");
 const { fetchQoderCnCliLimits } = require("./qoder-cn-cli-limits");
+const { createLimitsCache } = require("./limits-cache");
 
 const QODER_SITES = {
   international: {
@@ -406,18 +407,40 @@ function writeQoderActivityCache(window, {
   } catch (_error) {}
 }
 
-function qoderLimitsCachePath({ home = os.homedir(), namespace } = {}) {
-  const file = namespace
+// The active region partitions the cache by filename (cn vs global); the
+// record itself stays account-agnostic. A window without a parseable reset is
+// kept only within the 12h unknown-reset TTL, and the global max-age only
+// bounds snapshots with no future-dated window — a dated survivor outlives it.
+// Provenance must describe the data's age, not the transport (#955): a fresh
+// hit re-serves the winning source it was written with, an older hit honestly
+// reports the disk cache.
+const qoderLimitsCache = createLimitsCache({
+  file: ({ namespace }) => (namespace
     ? `qoder-${namespace}-usage-limits-cache.json`
-    : QODER_LIMITS_CACHE_FILE;
-  return path.join(home, ".tokentracker", "tracker", file);
-}
+    : QODER_LIMITS_CACHE_FILE),
+  key: "qoder",
+  maxAgeMs: QODER_LIMITS_CACHE_MAX_AGE_MS,
+  maxAgeGate: "ifNoDatedSurvivor",
+  unknownResetTtlMs: QODER_LIMITS_CACHE_UNKNOWN_RESET_TTL_MS,
+  fields: {
+    plan_label: "string",
+    quota_exceeded: "boolTrue",
+    // Remember the winning source so a fresh re-serve keeps honest provenance
+    // instead of always claiming "disk-cache" (#955).
+    source: { write: (record) => (typeof record?.source === "string" ? record.source : null) },
+  },
+  windowKeys: ["primary_window", "secondary_window", "tertiary_window"],
+  // tertiary_window is written only when present and read back only when it
+  // survives — primary/secondary always appear (null when dead).
+  sparseWindowKeys: ["tertiary_window"],
+  stale: "byAge",
+  freshTtlMs: QODER_LIMITS_CACHE_FRESH_TTL_MS,
+  cachedFlag: true,
+  source: "provenance",
+});
 
-function qoderCachedWindow(window, { cachedAtMs, nowMs } = {}) {
-  if (!window || typeof window !== "object") return null;
-  const resetAtMs = Date.parse(window.reset_at || "");
-  if (Number.isFinite(resetAtMs)) return resetAtMs > nowMs ? window : null;
-  return nowMs - cachedAtMs <= QODER_LIMITS_CACHE_UNKNOWN_RESET_TTL_MS ? window : null;
+function qoderLimitsCachePath({ home = os.homedir(), namespace } = {}) {
+  return qoderLimitsCache.path({ home, namespace });
 }
 
 function readQoderLimitsCache({
@@ -425,44 +448,7 @@ function readQoderLimitsCache({
   nowMs = Date.now(),
   namespace,
 } = {}) {
-  try {
-    const raw = JSON.parse(fs.readFileSync(qoderLimitsCachePath({ home, namespace }), "utf8"))?.qoder;
-    const cachedAtMs = Date.parse(raw?.cached_at || "");
-    if (!Number.isFinite(cachedAtMs) || cachedAtMs > nowMs + 60_000) return null;
-    const primaryWindow = qoderCachedWindow(raw.primary_window, { cachedAtMs, nowMs });
-    const secondaryWindow = qoderCachedWindow(raw.secondary_window, { cachedAtMs, nowMs });
-    const tertiaryWindow = qoderCachedWindow(raw.tertiary_window, { cachedAtMs, nowMs });
-    if (!primaryWindow && !secondaryWindow && !tertiaryWindow) return null;
-    const hasUnexpiredDatedWindow = [primaryWindow, secondaryWindow, tertiaryWindow]
-      .some((window) => Number.isFinite(Date.parse(window?.reset_at || "")));
-    if (nowMs - cachedAtMs > QODER_LIMITS_CACHE_MAX_AGE_MS && !hasUnexpiredDatedWindow) {
-      return null;
-    }
-    // Provenance must describe the data's age, not the transport (#955): a
-    // successful refresh writes this cache and immediately floors later log
-    // scans, so the next refresh re-serves the same payload. Marking every
-    // hit stale/disk-cache made the Limits page permanently partial.
-    const ageMs = nowMs - cachedAtMs;
-    const fresh = ageMs <= QODER_LIMITS_CACHE_FRESH_TTL_MS;
-    const writtenSource = typeof raw.source === "string" && raw.source.trim()
-      ? raw.source.trim()
-      : null;
-    return {
-      configured: true,
-      error: null,
-      plan_label: typeof raw.plan_label === "string" ? raw.plan_label : null,
-      quota_exceeded: raw.quota_exceeded === true,
-      primary_window: primaryWindow,
-      secondary_window: secondaryWindow,
-      ...(tertiaryWindow ? { tertiary_window: tertiaryWindow } : {}),
-      cached: true,
-      stale: !fresh,
-      cached_at: raw.cached_at,
-      source: fresh && writtenSource ? writtenSource : "disk-cache",
-    };
-  } catch (_error) {
-    return null;
-  }
+  return qoderLimitsCache.read({ home, nowMs, namespace });
 }
 
 function writeQoderLimitsCache(limits, {
@@ -470,27 +456,7 @@ function writeQoderLimitsCache(limits, {
   nowMs = Date.now(),
   namespace,
 } = {}) {
-  if (!limits?.configured || limits.error || (!limits.primary_window && !limits.secondary_window && !limits.tertiary_window)) return;
-  const cachePath = qoderLimitsCachePath({ home, namespace });
-  const payload = {
-    qoder: {
-      plan_label: limits.plan_label || null,
-      quota_exceeded: limits.quota_exceeded === true,
-      primary_window: limits.primary_window || null,
-      secondary_window: limits.secondary_window || null,
-      ...(limits.tertiary_window ? { tertiary_window: limits.tertiary_window } : {}),
-      // Remember the winning source so a fresh re-serve keeps honest
-      // provenance instead of always claiming "disk-cache" (#955).
-      source: typeof limits.source === "string" ? limits.source : null,
-      cached_at: new Date(nowMs).toISOString(),
-    },
-  };
-  try {
-    fs.mkdirSync(path.dirname(cachePath), { recursive: true });
-    const tmpPath = `${cachePath}.${process.pid}.tmp`;
-    fs.writeFileSync(tmpPath, JSON.stringify(payload, null, 2), { encoding: "utf8", mode: 0o600 });
-    fs.renameSync(tmpPath, cachePath);
-  } catch (_error) {}
+  qoderLimitsCache.write(limits, { home, nowMs, namespace });
 }
 
 function buildQoderActivityHeaders(authStatus, {

package/src/lib/session-analytics.js

@@ -95,7 +95,10 @@ const {
 // v27 adds oh-my-pi (omp) sessions from ~/.omp/agent/sessions/**/*.jsonl.
 // v28 records per-minute usage buckets for Claude and Grok, so date ranges
 // recompute in-range tokens/cost instead of falling back to lifetime totals.
-const SIDECAR_VERSION = 28;
+// v29 adds DSH request timing and first-response samples from step/stream metadata.
+// v30 drops DSH v1 failed-finish chunks (error/aborted) from request samples.
+// v29 cached those retries as clean timings; unchanged logs must be rebuilt.
+const SIDECAR_VERSION = 30;
 // Invalidate only Codex token summaries; other sources keep their cached rows.
 const CODEX_USAGE_VERSION = 1;
 const EDIT_TOOLS = new Set([

package/src/lib/session-performance.js

@@ -228,10 +228,25 @@ function createZcodePerformanceCollector() {
   return { consumeUsage, finish: totals.finish };
 }
 
+function createDshPerformanceCollector() {
+  const totals = accumulator();
+  function consumeUsage({ model, outputTokens, start, end, firstToken } = {}) {
+    // Step boundaries surround model work, before tool execution. Retry and
+    // interrupted steps are filtered by the transcript reader.
+    if (!Number.isFinite(start) || !Number.isFinite(end) || end < start || end - start > MAX_DURATION_MS) return;
+    totals.request(model, outputTokens, start, end);
+    if (Number.isFinite(firstToken) && firstToken >= start && firstToken <= end) {
+      totals.add(model, { first_response_total_ms: firstToken - start, first_response_sample_count: 1 });
+    }
+  }
+  return { consumeUsage, finish: totals.finish };
+}
+
 module.exports = {
   normalizePerformance,
   mergePerformance,
   createClaudePerformanceCollector,
   createCodexPerformanceCollector,
   createZcodePerformanceCollector,
+  createDshPerformanceCollector,
 };

package/dashboard/dist/assets/DialogDescription-C3KGos_G.js

@@ -1 +0,0 @@
-import{r as n,J as a}from"./__vite-browser-external-CkF0pdTJ.js";import{u as p}from"./DialogTitle-B0cNIo0E.js";import{u as c}from"./composite-BHisG82k.js";const x=n.forwardRef(function(e,r){const{render:l,className:u,style:m,id:s,...t}=e,i=p(),o=c(s);return i.useSyncedValueWithCleanup("descriptionElementId",o),a("p",e,{ref:r,props:[{id:o},t]})});export{x as D};

package/dashboard/dist/assets/use-reduced-motion-DfbDxs5a.js

@@ -1 +0,0 @@
-import{r as o}from"./__vite-browser-external-CkF0pdTJ.js";import{h as r,i as t,p as s}from"./react-BY0y0K4x.js";function i(){!r.current&&t();const[e]=o.useState(s.current);return e}export{i as u};