tokentracker-cli 0.83.11 → 0.84.0

package/src/lib/session-analytics.js

@@ -22,7 +22,14 @@ const { computeRowCost } = require("./pricing");
 // the agent wrote itself, never the raw prompt body, and stay local-only
 // alongside session_id (no self-parsed prompt fallback, so the strict
 // metadata-only guarantee holds).
-const SIDECAR_VERSION = 8;
+// v9 changes derived metrics, so every cached row must be rebuilt:
+//   - duration_ms is now *active* time (see IDLE_GAP_MS), not the wall-clock
+//     span between the first and last log line, which read as 89 days on
+//     resumed/forked sessions.
+//   - session_id is only set when the log actually contained a sessionId
+//     record. It used to fall back to the file's basename, which produced
+//     resume commands for non-session files (`claude --resume journal`).
+const SIDECAR_VERSION = 9;
 const EDIT_TOOLS = new Set(["apply_patch", "edit", "write", "multiedit", "notebookedit"]);
 const PLACEHOLDER_MODELS = new Set(["<synthetic>", "synthetic", "<unknown>", "unknown"]);
 const CLAUDE_MEM_OBSERVER_PROJECT_SUFFIX = "--claude-mem-observer-sessions";
@@ -74,11 +81,39 @@ function safeTimestamp(value) {
   return new Date(value).toISOString();
 }
 
+// A session that was resumed days later, or whose file replays inherited
+// history from a fork, spans a wall-clock range that says nothing about how
+// long the user actually worked (observed: 2142h / 89 days on a session with
+// zero turns). Accumulate *active* time instead: the sum of gaps between
+// consecutive log timestamps, excluding any gap longer than IDLE_GAP_MS. The
+// long jump from replayed history to real work is one such gap, so it drops
+// out on its own. started_at / ended_at still carry the true span.
+const IDLE_GAP_MS = 30 * 60 * 1000;
+
+function emptyBounds() {
+  return { started_at: null, ended_at: null, active_ms: 0, _last_ts_ms: null };
+}
+
 function updateBounds(bounds, value) {
   const timestamp = safeTimestamp(value);
   if (!timestamp) return;
   if (!bounds.started_at || timestamp < bounds.started_at) bounds.started_at = timestamp;
   if (!bounds.ended_at || timestamp > bounds.ended_at) bounds.ended_at = timestamp;
+  const ms = Date.parse(timestamp);
+  if (!Number.isFinite(ms)) return;
+  if (Number.isFinite(bounds._last_ts_ms)) {
+    const delta = ms - bounds._last_ts_ms;
+    // Ignore out-of-order lines and idle gaps; only real working time counts.
+    if (delta > 0 && delta <= IDLE_GAP_MS) bounds.active_ms += delta;
+  }
+  bounds._last_ts_ms = ms;
+}
+
+// Throwaway per-agent checkouts (`.claude/worktrees/<id>`, `.codex/worktrees/…`)
+// are not the project the user is working on, and the directory is usually gone
+// by the time the session is browsed.
+function isWorktreeRef(ref) {
+  return /[\\/](worktrees|subagents)[\\/]/.test(String(ref || ""));
 }
 
 function projectKey(cwd, filePath) {
@@ -162,11 +197,9 @@ function extractCodexSignalTools(payload) {
 }
 
 function finalizeRecord(record) {
-  const startedMs = Date.parse(record.started_at || "");
-  const endedMs = Date.parse(record.ended_at || "");
-  record.duration_ms = Number.isFinite(startedMs) && Number.isFinite(endedMs)
-    ? Math.max(0, endedMs - startedMs)
-    : 0;
+  delete record._last_ts_ms;
+  record.active_ms = Math.max(0, finite(record.active_ms));
+  record.duration_ms = record.active_ms;
   record.total_tokens = finite(record.total_tokens || record.tokens?.total_tokens);
   record.cost_usd = computeRowCost({ source: record.source, model: record.model, ...record.tokens });
   record.productive = record.edit_turns > 0;
@@ -184,9 +217,26 @@ async function scanClaudeSession(filePath) {
   const input = fs.createReadStream(filePath, { encoding: "utf8" });
   const lines = readline.createInterface({ input, crlfDelay: Infinity });
   const tokens = emptyTotals();
+  // Per-file, deliberately. rollout.js persists its dedup set across files to
+  // catch cross-file duplicates, but that is only sound there because it owns a
+  // single global total. Here each file becomes an independently cached row, so
+  // a cross-file set would make a row's tokens depend on which other files were
+  // scanned first — and the incremental cache reuses rows without replaying
+  // that state. Measured cost of the per-file scope on real data: 808 assistant
+  // messages appear in more than one file (fork/resume replays history into a
+  // new session file), inflating per-session tokens by ~1.5% in aggregate.
+  // Fixing it needs a deterministic owner (e.g. earliest started_at) plus
+  // message keys persisted per row — a sidecar redesign, not a one-liner. Do
+  // NOT "fix" this by widening the set without solving the cache interaction.
   const seenMessages = new Set();
-  const bounds = { started_at: null, ended_at: null };
+  const bounds = emptyBounds();
+  // The basename keeps grouping stable for files that never write a sessionId
+  // record, but only an *observed* sessionId may become a resumable
+  // session_id — otherwise non-session logs under ~/.claude/projects (e.g.
+  // skill-injections.jsonl, journal.jsonl) yield `claude --resume journal`,
+  // a command that always fails.
   let rawSessionId = path.basename(filePath, ".jsonl");
+  let observedSessionId = null;
   let cwd = null;
   let model = "unknown";
   let aiTitle = null;
@@ -209,7 +259,10 @@ async function scanClaudeSession(filePath) {
     let obj;
     try { obj = JSON.parse(line); } catch { continue; }
     updateBounds(bounds, obj.timestamp || obj.message?.timestamp);
-    if (typeof obj.sessionId === "string" && obj.sessionId) rawSessionId = obj.sessionId;
+    if (typeof obj.sessionId === "string" && obj.sessionId) {
+      rawSessionId = obj.sessionId;
+      observedSessionId = obj.sessionId;
+    }
     if (typeof obj.cwd === "string" && obj.cwd) cwd = obj.cwd;
     // Claude writes its own generated one-line summary as an "ai-title" record.
     // It is agent-authored metadata (not the raw prompt body); keep the latest.
@@ -257,7 +310,7 @@ async function scanClaudeSession(filePath) {
   return finalizeRecord({
     version: SIDECAR_VERSION,
     session_hash: sessionHash("claude", rawSessionId),
-    session_id: rawSessionId || null,
+    session_id: observedSessionId || null,
     // Claude's own generated one-line title (the "ai-title" record). Agent-
     // authored metadata, never the raw prompt body. Local-only: stripped in
     // summarizeSessions before any cloud/CSV export. Null when Claude never
@@ -279,7 +332,7 @@ async function scanClaudeSession(filePath) {
 }
 
 async function scanCodexDeliverySignals(filePath) {
-  const bounds = { started_at: null, ended_at: null };
+  const bounds = emptyBounds();
   const input = fs.createReadStream(filePath, { encoding: "utf8" });
   const lines = readline.createInterface({ input, crlfDelay: Infinity });
   let turns = 0;
@@ -541,16 +594,32 @@ async function buildSessionAnalyticsInternal({ home = os.homedir(), force = fals
     ...discovered.claude.map((filePath) => ({ source: "claude", filePath, scan: scanClaudeSession })),
     ...discovered.codex.map((filePath) => ({ source: "codex", filePath, scan: scanCodexSession })),
   ];
+  // Files we could not turn into a row (permission denied, half-written line,
+  // vanished mid-scan). Swallowing these silently made sessions disappear with
+  // no signal at all; count them so the API can say so.
+  let skippedFiles = 0;
   for (const entry of entries) {
     const cacheKey = sessionFileCacheKey(entry.source, entry.filePath);
     const statKey = analyticsEntryStatKey(entry.source, entry.filePath);
-    if (!statKey) continue;
+    if (!statKey) {
+      skippedFiles += 1;
+      continue;
+    }
     let row = null;
     if (!force && previousFiles[cacheKey]?.stat_key === statKey) {
       row = previousRowsByFile.get(cacheKey) || null;
     }
     if (!row) {
-      try { row = await entry.scan(entry.filePath); } catch { /* one active/partial session must not poison the sidecar */ }
+      try {
+        row = await entry.scan(entry.filePath);
+      } catch (error) {
+        // One active/partial session must not poison the sidecar, but do not
+        // pretend it never existed either.
+        skippedFiles += 1;
+        if (!process.env.NODE_TEST_CONTEXT) {
+          console.warn(`[session-analytics] skipped ${entry.source} session file: ${error?.message || error}`);
+        }
+      }
     }
     if (!row) continue;
     // A one-way file hash enables incremental reuse without persisting or
@@ -570,6 +639,9 @@ async function buildSessionAnalyticsInternal({ home = os.homedir(), force = fals
     checked_at: generatedAt,
     files: nextFiles,
   })}\n`);
+  // Non-enumerable so the array still behaves exactly like a plain row list
+  // for every existing caller (map/filter/JSON of the rows is unaffected).
+  Object.defineProperty(sessions, "skippedFiles", { value: skippedFiles, enumerable: false });
   return sessions;
 }
 
@@ -582,23 +654,41 @@ const sessionAnalyticsBuilds = new Map();
 function buildSessionAnalytics(options = {}) {
   const normalizedOptions = options && typeof options === "object" ? options : {};
   const home = path.resolve(String(normalizedOptions.home || os.homedir()));
+  const force = Boolean(normalizedOptions.force);
   const existing = sessionAnalyticsBuilds.get(home);
-  if (existing) return existing;
-
-  const promise = buildSessionAnalyticsInternal({ ...normalizedOptions, home });
-  sessionAnalyticsBuilds.set(home, promise);
+  // Joining an in-flight build is only correct when that build is at least as
+  // thorough as what this caller asked for. A refresh that landed while a plain
+  // build was running used to be handed the un-refreshed result: the spinner
+  // stopped and nothing had actually been re-scanned. Chain instead of joining
+  // — never run two scans at once, they race the atomic sidecar write.
+  if (existing && (!force || existing.force)) return existing.promise;
+
+  const run = () => buildSessionAnalyticsInternal({ ...normalizedOptions, home, force });
+  const promise = existing ? existing.promise.then(run, run) : run();
+  const entry = { promise, force: force || Boolean(existing?.force) };
+  sessionAnalyticsBuilds.set(home, entry);
   const clear = () => {
-    if (sessionAnalyticsBuilds.get(home) === promise) sessionAnalyticsBuilds.delete(home);
+    if (sessionAnalyticsBuilds.get(home) === entry) sessionAnalyticsBuilds.delete(home);
   };
   promise.then(clear, clear);
   return promise;
 }
 
+// Does a session overlap the [from, to] day window? Testing started_at alone
+// dropped every session that began before the window and ended inside it —
+// exactly the long/resumed ones, which also sort to the top because the sort
+// key is ended_at. On real data a 7-day window lost 6 sessions, the largest
+// 224M tokens. Treat the window as an interval intersection instead.
+function withinDayRange(row, from, to) {
+  const startDay = String(row?.started_at || row?.ended_at || "").slice(0, 10);
+  const endDay = String(row?.ended_at || row?.started_at || "").slice(0, 10);
+  if (from && (!endDay || endDay < from)) return false;
+  if (to && (!startDay || startDay > to)) return false;
+  return true;
+}
+
 function summarizeSessions(sessions, { from = "", to = "", includeSessions = true } = {}) {
-  const filtered = (sessions || []).filter((row) => {
-    const day = String(row.started_at || row.ended_at || "").slice(0, 10);
-    return (!from || day >= from) && (!to || day <= to);
-  });
+  const filtered = (sessions || []).filter((row) => withinDayRange(row, from, to));
   const byModel = new Map();
   const subagents = new Map();
   for (const row of filtered) {
@@ -750,14 +840,22 @@ function mergeSessionFragments(rows) {
     cur.total_tokens = finite(cur.total_tokens) + finite(row.total_tokens);
     cur.cost_usd = finite(cur.cost_usd) + finite(row.cost_usd);
     cur.productive = Boolean(cur.productive) || Boolean(row.productive);
+    cur.active_ms = finite(cur.active_ms) + finite(row.active_ms);
     if (!cur.title && row.title) cur.title = row.title;
     // Representative model/project comes from the busiest fragment (most
     // tokens) so a tiny sidechain cannot overwrite the real coding model.
     if (finite(row.total_tokens) > finite(cur._repr_tokens)) {
       cur._repr_tokens = finite(row.total_tokens);
       if (row.model && row.model !== "unknown") cur.model = row.model;
-      cur.project_key = row.project_key;
-      cur.project_ref = row.project_ref;
+      // Project needs its own guard: a subagent running in a git worktree has
+      // that throwaway directory as its cwd, so the busiest fragment can label
+      // the whole session with a temp name like "agent-a3cb8089a11d3471a" and
+      // point project_ref at a directory that no longer exists. Only let a
+      // worktree fragment name the session when nothing better is available.
+      if (!isWorktreeRef(row.project_ref) || isWorktreeRef(cur.project_ref)) {
+        cur.project_key = row.project_key;
+        cur.project_ref = row.project_ref;
+      }
     }
     if (row.started_at && (!cur.started_at || row.started_at < cur.started_at)) cur.started_at = row.started_at;
     if (row.ended_at && (!cur.ended_at || row.ended_at > cur.ended_at)) cur.ended_at = row.ended_at;
@@ -765,9 +863,9 @@ function mergeSessionFragments(rows) {
   const merged = [];
   for (const row of byHash.values()) {
     delete row._repr_tokens;
-    const startedMs = Date.parse(row.started_at || "");
-    const endedMs = Date.parse(row.ended_at || "");
-    row.duration_ms = Number.isFinite(startedMs) && Number.isFinite(endedMs) ? Math.max(0, endedMs - startedMs) : 0;
+    // Active time is additive across fragments (see IDLE_GAP_MS); the
+    // wall-clock span between first and last line is not.
+    row.duration_ms = finite(row.active_ms);
     row.first_pass = finite(row.edit_turns) === 1 && finite(row.retry_turns) === 0;
     row.one_shot = row.first_pass;
     merged.push(row);
@@ -780,10 +878,14 @@ function mergeSessionFragments(rows) {
 // the UI can offer one-click resume. Callers must only expose it over the
 // local API.
 function listSessionsForBrowser(sessions, { from = "", to = "", limit = 0 } = {}) {
-  const filtered = mergeSessionFragments(sessions).filter((row) => {
-    const day = String(row.started_at || row.ended_at || "").slice(0, 10);
-    return (!from || day >= from) && (!to || day <= to);
-  });
+  const filtered = mergeSessionFragments(sessions)
+    // Only sessions that actually spent tokens are worth listing. This drops
+    // two kinds of noise: non-session logs under ~/.claude/projects
+    // (skill-injections.jsonl, journal.jsonl, …), and sessions abandoned before
+    // the model replied. Both render as "unknown · 0 tokens · $0.00" rows with
+    // no model, no cost and nothing to analyze.
+    .filter((row) => finite(row.total_tokens) > 0)
+    .filter((row) => withinDayRange(row, from, to));
   filtered.sort((a, b) => String(b.ended_at || "").localeCompare(String(a.ended_at || "")));
   const cap = Number(limit) > 0 ? Number(limit) : 0;
   const limited = cap > 0 ? filtered.slice(0, cap) : filtered;
@@ -791,6 +893,7 @@ function listSessionsForBrowser(sessions, { from = "", to = "", limit = 0 } = {}
     available: filtered.length > 0,
     session_count: filtered.length,
     returned_count: limited.length,
+    skipped_files: finite(sessions?.skippedFiles),
     sessions: limited.map(toSessionBrowserRow),
     provenance: {
       source: "local-session-log",

package/dashboard/dist/assets/DevicePage-CdtlanVo.js

@@ -1 +0,0 @@
-import{a as b,r as l,j as r,c as e,h as v}from"./__vite-browser-external-DwFlHgQR.js";const x={BASE_URL:"/",DEV:!1,MODE:"production",PROD:!0,SSR:!1,VITE_APP_VERSION:"0.83.11",VITE_INSFORGE_ANON_KEY:"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3OC0xMjM0LTU2NzgtOTBhYi1jZGVmMTIzNDU2NzgiLCJlbWFpbCI6ImFub25AaW5zZm9yZ2UuY29tIiwicm9sZSI6ImFub24iLCJpYXQiOjE3ODExNDU5NDd9.T0auta_IrVIh0uXW1bob5QSnzvsnJmN28r5XkSGEuQY",VITE_INSFORGE_BASE_URL:"https://srctyff5.us-east.insforge.app"};function f(){return v(),`${(x&&"https://srctyff5.us-east.insforge.app"||"https://srctyff5.us-east.insforge.app").replace(/\/$/,"")}/functions/tokentracker-device-flow-grant`}function p(s){return(s||"").toUpperCase().replace(/\s+/g,"").replace(/[^A-Z0-9-]/g,"")}function h(){const s=b(),[m,g]=l.useState(""),[i,a]=l.useState({kind:"idle",message:""});l.useEffect(()=>{try{const d=new URLSearchParams(window.location.search).get("user_code");d&&g(p(d))}catch{}},[]);async function u(c){if(c?.preventDefault?.(),!s?.signedIn){a({kind:"error",message:e("device.approval.error.sign_in")});return}const d=p(m);if(!/^[A-HJKMNP-Z2-9]{4}-[A-HJKMNP-Z2-9]{4}$/.test(d)){a({kind:"error",message:e("device.approval.error.invalid_code")});return}a({kind:"working",message:e("device.approval.action.approving")});try{const n=await s.getAccessToken?.();if(!n){a({kind:"error",message:e("device.approval.error.no_token")});return}const o=await fetch(f(),{method:"POST",headers:{"Content-Type":"application/json",Authorization:`Bearer ${n}`},body:JSON.stringify({user_code:d})}),t=await o.json().catch(()=>({}));o.ok?a({kind:"success",message:t.status==="already_approved"?t.client_info?e("device.approval.success.already_client",{client:t.client_info}):e("device.approval.success.already"):t.client_info?e("device.approval.success.approved_client",{client:t.client_info}):e("device.approval.success.approved")}):o.status===404?a({kind:"error",message:e("device.approval.error.not_found")}):o.status===410?a({kind:"error",message:e("device.approval.error.expired")}):o.status===401?a({kind:"error",message:e("device.approval.error.session_expired")}):a({kind:"error",message:t?.error?e("device.approval.error.server_detail",{message:t.error}):e("device.approval.error.server",{status:o.status})})}catch(n){a({kind:"error",message:e("device.approval.error.network",{message:n?.message||n})})}}return r.jsx("div",{className:"min-h-screen flex items-center justify-center bg-white dark:bg-oai-gray-950 px-6 py-12",children:r.jsxs("div",{className:"w-full max-w-md rounded-xl border border-oai-gray-200 dark:border-oai-gray-800 bg-white dark:bg-oai-gray-900 p-8",children:[r.jsx("h1",{className:"text-2xl font-semibold text-oai-gray-900 dark:text-white mb-2",children:e("device.approval.title")}),r.jsx("p",{className:"text-sm text-oai-gray-500 dark:text-oai-gray-400 mb-6",children:e("device.approval.description")}),s?.signedIn?null:r.jsx("div",{className:"rounded-md border border-amber-200 bg-amber-50 dark:bg-amber-900/20 dark:border-amber-800 p-4 mb-4",children:r.jsx("p",{className:"text-sm text-amber-700 dark:text-amber-300",children:e("device.approval.sign_in_banner")})}),r.jsxs("form",{onSubmit:u,className:"space-y-4",children:[r.jsxs("label",{className:"block",children:[r.jsx("span",{className:"block text-xs font-medium uppercase tracking-wide text-oai-gray-500 dark:text-oai-gray-400 mb-1",children:e("device.approval.code_label")}),r.jsx("input",{type:"text",value:m,onChange:c=>g(p(c.target.value)),placeholder:"XXXX-XXXX",spellCheck:!1,autoCapitalize:"characters",maxLength:9,className:"w-full font-mono text-xl tracking-widest text-center rounded-md border border-oai-gray-300 dark:border-oai-gray-700 bg-white dark:bg-oai-gray-900 text-oai-gray-900 dark:text-white px-4 py-3 focus:outline-none focus:ring-inset focus:ring-2 focus:ring-emerald-600"})]}),r.jsx("button",{type:"submit",disabled:i.kind==="working"||!s?.signedIn,className:"w-full rounded-md bg-emerald-600 hover:bg-emerald-500 disabled:bg-oai-gray-300 disabled:cursor-not-allowed text-white font-medium py-3 transition-colors",children:i.kind==="working"?e("device.approval.action.approving"):e("device.approval.action.approve")})]}),i.kind==="success"&&r.jsx("div",{className:"mt-4 rounded-md border border-emerald-200 bg-emerald-50 dark:bg-emerald-900/20 dark:border-emerald-800 p-4",children:r.jsx("p",{className:"text-sm text-emerald-700 dark:text-emerald-300",children:i.message})}),i.kind==="error"&&r.jsx("div",{className:"mt-4 rounded-md border border-red-200 bg-red-50 dark:bg-red-900/20 dark:border-red-800 p-4",children:r.jsx("p",{className:"text-sm text-red-700 dark:text-red-300",children:i.message})})]})})}export{h as default};

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

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