zozul-cli 0.3.8 → 0.4.0

package/dist/storage/repo.js

@@ -34,14 +34,14 @@ export class SessionRepo {
         ended_at      = COALESCE(@ended_at, ended_at),
         total_turns   = @total_turns,
         model         = COALESCE(@model, model),
-        -- Use MAX so OTEL values aren't clobbered by JSONL re-ingest,
-        -- but JSONL values fill in as a floor for sessions without OTEL data.
-        total_input_tokens          = MAX(total_input_tokens, @total_input_tokens),
-        total_output_tokens         = MAX(total_output_tokens, @total_output_tokens),
-        total_cache_read_tokens     = MAX(total_cache_read_tokens, @total_cache_read_tokens),
-        total_cache_creation_tokens = MAX(total_cache_creation_tokens, @total_cache_creation_tokens),
-        total_cost_usd              = MAX(total_cost_usd, @total_cost_usd),
-        total_duration_ms           = MAX(total_duration_ms, @total_duration_ms)
+        -- JSONL values act as initial estimates; recomputeSessionCostsFromOtel
+        -- overwrites with authoritative OTEL data when available.
+        total_input_tokens          = @total_input_tokens,
+        total_output_tokens         = @total_output_tokens,
+        total_cache_read_tokens     = @total_cache_read_tokens,
+        total_cache_creation_tokens = @total_cache_creation_tokens,
+        total_cost_usd              = @total_cost_usd,
+        total_duration_ms           = @total_duration_ms
     `).run({
             ...session,
             ended_at: session.ended_at ?? null,
@@ -143,11 +143,13 @@ export class SessionRepo {
     listSessions(limit = 50, offset = 0, from, to) {
         if (from && to) {
             return this.db.prepare(`
-        SELECT * FROM sessions WHERE parent_session_id IS NULL AND started_at >= ? AND started_at <= ? ORDER BY started_at DESC LIMIT ? OFFSET ?
+        SELECT s.*, (SELECT COUNT(*) FROM turns t WHERE t.session_id = s.id AND t.is_real_user = 1) as user_turns
+        FROM sessions s WHERE s.parent_session_id IS NULL AND s.started_at >= ? AND s.started_at <= ? ORDER BY s.started_at DESC LIMIT ? OFFSET ?
       `).all(from, to, limit, offset);
         }
         return this.db.prepare(`
-      SELECT * FROM sessions WHERE parent_session_id IS NULL ORDER BY started_at DESC LIMIT ? OFFSET ?
+      SELECT s.*, (SELECT COUNT(*) FROM turns t WHERE t.session_id = s.id AND t.is_real_user = 1) as user_turns
+      FROM sessions s WHERE s.parent_session_id IS NULL ORDER BY s.started_at DESC LIMIT ? OFFSET ?
     `).all(limit, offset);
     }
     countSessions(from, to) {
@@ -159,7 +161,10 @@ export class SessionRepo {
         return row.n;
     }
     getSession(id) {
-        return this.db.prepare(`SELECT * FROM sessions WHERE id = ?`).get(id);
+        return this.db.prepare(`
+      SELECT s.*, (SELECT COUNT(*) FROM turns t WHERE t.session_id = s.id AND t.is_real_user = 1) as user_turns
+      FROM sessions s WHERE s.id = ?
+    `).get(id);
     }
     getSubSessions(parentSessionId) {
         return this.db.prepare(`
@@ -214,13 +219,13 @@ export class SessionRepo {
     // ── OTEL data ──
     insertOtelMetric(metric) {
         this.db.prepare(`
-      INSERT INTO otel_metrics (name, value, attributes, session_id, model, timestamp)
+      INSERT OR IGNORE INTO otel_metrics (name, value, attributes, session_id, model, timestamp)
       VALUES (@name, @value, @attributes, @session_id, @model, @timestamp)
     `).run(metric);
     }
     insertOtelMetricBatch(metrics) {
         const stmt = this.db.prepare(`
-      INSERT INTO otel_metrics (name, value, attributes, session_id, model, timestamp)
+      INSERT OR IGNORE INTO otel_metrics (name, value, attributes, session_id, model, timestamp)
       VALUES (@name, @value, @attributes, @session_id, @model, @timestamp)
     `);
         const tx = this.db.transaction((rows) => {
@@ -523,6 +528,7 @@ export class SessionRepo {
         SUM(CASE WHEN t.is_real_user = 1 THEN 1 ELSE 0 END) as human_interventions,
         COALESCE(SUM(t.duration_ms), 0) as total_duration_ms,
         COALESCE(SUM(${PROPORTIONAL_COST_SQL}), 0) as total_cost_usd,
+        COALESCE(SUM(t.input_tokens), 0) + COALESCE(SUM(t.output_tokens), 0) + COALESCE(SUM(t.cache_read_tokens), 0) as total_tokens,
         MAX(t.timestamp) as last_seen
       FROM turns t
       LEFT JOIN turn_tag_sets tts ON tts.turn_id = t.id
@@ -533,7 +539,7 @@ export class SessionRepo {
     `).all(...params);
     }
     recomputeSessionCostsFromOtel() {
-        // Recompute from raw OTEL for sessions that have metrics
+        // Step 1: Recompute from raw OTEL for sessions that have metrics (authoritative)
         const updated = this.db.prepare(`
       UPDATE sessions SET
         total_cost_usd = COALESCE((
@@ -543,30 +549,35 @@ export class SessionRepo {
         total_input_tokens = COALESCE((
           SELECT SUM(value) FROM otel_metrics
           WHERE name = 'claude_code.token.usage' AND json_extract(attributes, '$.type') = 'input' AND session_id = sessions.id
-        ), total_input_tokens),
+        ), 0),
         total_output_tokens = COALESCE((
           SELECT SUM(value) FROM otel_metrics
           WHERE name = 'claude_code.token.usage' AND json_extract(attributes, '$.type') = 'output' AND session_id = sessions.id
-        ), total_output_tokens),
+        ), 0),
         total_cache_read_tokens = COALESCE((
           SELECT SUM(value) FROM otel_metrics
           WHERE name = 'claude_code.token.usage' AND json_extract(attributes, '$.type') = 'cacheRead' AND session_id = sessions.id
-        ), total_cache_read_tokens),
+        ), 0),
         total_cache_creation_tokens = COALESCE((
           SELECT SUM(value) FROM otel_metrics
           WHERE name = 'claude_code.token.usage' AND json_extract(attributes, '$.type') = 'cacheCreation' AND session_id = sessions.id
-        ), total_cache_creation_tokens),
-        total_duration_ms = COALESCE((
-          SELECT SUM(value) * 1000 FROM otel_metrics
-          WHERE name = 'claude_code.active_time.total' AND session_id = sessions.id
-        ), total_duration_ms)
+        ), 0)
       WHERE id IN (SELECT DISTINCT session_id FROM otel_metrics WHERE session_id IS NOT NULL)
     `).run();
-        // Zero out cost/duration for sessions with no OTEL backing (unverifiable)
+        // Step 2: Recompute duration from turns for all sessions
+        this.db.prepare(`
+      UPDATE sessions SET
+        total_duration_ms = COALESCE((
+          SELECT SUM(duration_ms) FROM turns WHERE session_id = sessions.id
+        ), 0)
+    `).run();
+        // Step 3: Fallback for sessions without OTEL — use SUM(turns.cost_usd)
         this.db.prepare(`
-      UPDATE sessions SET total_cost_usd = 0, total_duration_ms = 0
-      WHERE (total_cost_usd > 0 OR total_duration_ms > 0)
-        AND id NOT IN (SELECT DISTINCT session_id FROM otel_metrics WHERE session_id IS NOT NULL)
+      UPDATE sessions SET
+        total_cost_usd = COALESCE((
+          SELECT SUM(cost_usd) FROM turns WHERE session_id = sessions.id
+        ), 0)
+      WHERE id NOT IN (SELECT DISTINCT session_id FROM otel_metrics WHERE session_id IS NOT NULL)
     `).run();
         return updated.changes;
     }

package/dist/storage/repo.js.map

@@ -1 +1 @@
-{"version":3,"file":"repo.js","sourceRoot":"","sources":["../../src/storage/repo.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"repo.js","sourceRoot":"","sources":["../../src/storage/repo.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,MAAM,qBAAqB,GAAG;;;;;;;;aAQjB,CAAC;AAEd,MAAM,OAAO,WAAW;IACF;IAApB,YAAoB,EAAqB;QAArB,OAAE,GAAF,EAAE,CAAmB;IAAG,CAAC;IAE7C,aAAa,CAAC,OAAoE;QAChF,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;;;;;;;;;;;;;;;;;;;;;;KAuBf,CAAC,CAAC,GAAG,CAAC;YACL,GAAG,OAAO;YACV,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,IAAI;YAClC,iBAAiB,EAAE,OAAO,CAAC,iBAAiB,IAAI,IAAI;YACpD,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,IAAI;SACvC,CAAC,CAAC;IACL,CAAC;IAED;;;;OAIG;IACH,qBAAqB,CAAC,SAAiB,EAAE,MASxC;QACC,6CAA6C;QAC7C,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;;;;;KAMf,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,CAAC,eAAe,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;QAE3E,mEAAmE;QACnE,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;KA2Bf,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;IACtF,CAAC;IAED,UAAU,CAAC,IAAyB;QAClC,+EAA+E;QAC/E,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;;;;;;;;;;;;;KAc3B,CAAC,CAAC,GAAG,CAAC,IAAI,CAA+B,CAAC;QAC3C,OAAO,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC;IACtB,CAAC;IAED,aAAa,CAAC,OASb;QACC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;;KAGf,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAClB,CAAC;IAED;;;OAGG;IACH,sBAAsB,CAAC,MAAc,EAAE,QASpC;QACD,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,yCAAyC,CAAC,CAAC;QACvE,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;;KAG3B,CAAC,CAAC;QACH,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE;YACvB,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAChB,KAAK,MAAM,GAAG,IAAI,QAAQ;gBAAE,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC3C,CAAC,CAAC,EAAE,CAAC;IACP,CAAC;IAED,eAAe,CAAC,KAKf;QACC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;;KAGf,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAChB,CAAC;IAED,YAAY,CAAC,KAAK,GAAG,EAAE,EAAE,MAAM,GAAG,CAAC,EAAE,IAAa,EAAE,EAAW;QAC7D,IAAI,IAAI,IAAI,EAAE,EAAE,CAAC;YACf,OAAO,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;;OAGtB,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,CAA4C,CAAC;QAC7E,CAAC;QACD,OAAO,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;;KAGtB,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAA4C,CAAC;IACnE,CAAC;IAED,aAAa,CAAC,IAAa,EAAE,EAAW;QACtC,IAAI,IAAI,IAAI,EAAE,EAAE,CAAC;YACf,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,4GAA4G,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAkB,CAAC;YACzK,OAAO,GAAG,CAAC,CAAC,CAAC;QACf,CAAC;QACD,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,oEAAoE,CAAC,CAAC,GAAG,EAAmB,CAAC;QACzH,OAAO,GAAG,CAAC,CAAC,CAAC;IACf,CAAC;IAED,UAAU,CAAC,EAAU;QACnB,OAAO,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;;KAGtB,CAAC,CAAC,GAAG,CAAC,EAAE,CAAsD,CAAC;IAClE,CAAC;IAED,cAAc,CAAC,eAAuB;QACpC,OAAO,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;KAEtB,CAAC,CAAC,GAAG,CAAC,eAAe,CAAiB,CAAC;IAC1C,CAAC;IAED,eAAe,CAAC,SAAiB;QAC/B,OAAO,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;KAEtB,CAAC,CAAC,GAAG,CAAC,SAAS,CAAc,CAAC;IACjC,CAAC;IAED,kBAAkB,CAAC,SAAiB;QAClC,OAAO,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;KAEtB,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACpB,CAAC;IAED,oBAAoB,CAAC,SAAiB;QACpC,OAAO,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;KAEtB,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACpB,CAAC;IAED,iBAAiB,CAAC,IAAa,EAAE,EAAW;QAC1C,IAAI,IAAI,IAAI,EAAE,EAAE,CAAC;YACf,OAAO,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;;;;;;;;;;;;OAatB,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QAC7B,CAAC;QACD,OAAO,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;;;;;;;;;;KAWtB,CAAC,CAAC,GAAG,EAAE,CAAC;IACX,CAAC;IAED,kBAAkB;IAElB,gBAAgB,CAAC,MAOhB;QACC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;;KAGf,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACjB,CAAC;IAED,qBAAqB,CAAC,OAOnB;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;;KAG5B,CAAC,CAAC;QACH,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,IAAoB,EAAE,EAAE;YACtD,KAAK,MAAM,GAAG,IAAI,IAAI;gBAAE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,OAAO,CAAC,CAAC;IACd,CAAC;IAED,eAAe,CAAC,KAMf;QACC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;;KAGf,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAChB,CAAC;IAED,oBAAoB,CAAC,MAMlB;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;;KAG5B,CAAC,CAAC;QACH,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,IAAmB,EAAE,EAAE;YACrD,KAAK,MAAM,GAAG,IAAI,IAAI;gBAAE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,MAAM,CAAC,CAAC;IACb,CAAC;IAED,0BAA0B;IAE1B,kBAAkB,CAAC,IAAY,EAAE,EAAU,EAAE,WAAmB;QAC9D,OAAO,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;;;;;;;;;;KAWtB,CAAC,CAAC,GAAG,CAAC,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE,EAAE,CAA+E,CAAC;IAC3H,CAAC;IAED,iBAAiB,CAAC,IAAY,EAAE,EAAU,EAAE,WAAmB;QAC7D,iEAAiE;QACjE,IAAI,WAAW,IAAI,KAAK,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;;;;;;;;OAStB,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAA0C,CAAC;QAC5D,CAAC;QACD,OAAO,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;;;;;;;;KAStB,CAAC,CAAC,GAAG,CAAC,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE,EAAE,CAA0C,CAAC;IACtF,CAAC;IAED,qBAAqB;QACnB,OAAO,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;;;;;KAMtB,CAAC,CAAC,GAAG,EAA4C,CAAC;IACrD,CAAC;IAED,iBAAiB;QACf,OAAO,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;;;;;;;;KAStB,CAAC,CAAC,GAAG,EAAuD,CAAC;IAChE,CAAC;IAED,mBAAmB,CAAC,KAAK,GAAG,EAAE;QAC5B,OAAO,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;;;;KAKtB,CAAC,CAAC,GAAG,CAAC,KAAK,CAAgI,CAAC;IAC/I,CAAC;IAED,kBAAkB;IAElB,OAAO,CAAC,MAAc,EAAE,IAAY;QAClC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;;KAGf,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;IACjD,CAAC;IAED,aAAa,CAAC,OAAiB,EAAE,IAAY;QAC3C,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;;KAG5B,CAAC,CAAC;QACH,MAAM,QAAQ,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAC1C,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE;YACvB,KAAK,MAAM,MAAM,IAAI,OAAO;gBAAE,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;QACjE,CAAC,CAAC,EAAE,CAAC;IACP,CAAC;IAED,eAAe,CAAC,MAAc;QAC5B,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;KAE5B,CAAC,CAAC,GAAG,CAAC,MAAM,CAAuB,CAAC;QACrC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED,kBAAkB,CAAC,MAAc;QAC/B,OAAO,IAAI,CAAC,EAAE,CAAC,OAAO,CACpB,kEAAkE,CACnE,CAAC,GAAG,CAAC,MAAM,CAAiB,CAAC;IAChC,CAAC;IAED,cAAc,CAAC,IAAY,EAAE,KAAK,GAAG,EAAE,EAAE,MAAM,GAAG,CAAC;QACjD,MAAM,UAAU,GAAG;;;qBAGF,CAAC;QAClB,OAAO,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;sEAE2C,UAAU;uEACT,UAAU;2EACN,UAAU;+EACN,UAAU;;;;;;KAMpF,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,CAAoJ,CAAC;IACjL,CAAC;IAED,cAAc,CAAC,OAQX,EAAE;QACJ,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,KAAK,EAAE,IAAI,GAAG,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,GAAG,EAAE,EAAE,MAAM,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC;QACxF,MAAM,UAAU,GAAa,EAAE,CAAC;QAChC,MAAM,MAAM,GAAc,EAAE,CAAC;QAE7B,IAAI,QAAQ,EAAE,CAAC;YACb,UAAU,CAAC,IAAI,CAAC,sDAAsD,CAAC,CAAC;QAC1E,CAAC;aAAM,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACnC,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACnD,IAAI,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACtC,UAAU,CAAC,IAAI,CAAC;yDACiC,YAAY;;UAE3D,CAAC,CAAC;gBACJ,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YACpC,CAAC;iBAAM,CAAC;gBACN,UAAU,CAAC,IAAI,CAAC,kEAAkE,YAAY,IAAI,CAAC,CAAC;gBACpG,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;YACvB,CAAC;QACH,CAAC;aAAM,CAAC;YACN,UAAU,CAAC,IAAI,CAAC,kDAAkD,CAAC,CAAC;QACtE,CAAC;QAED,IAAI,IAAI,IAAI,EAAE,EAAE,CAAC;YACf,UAAU,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;YACzD,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACxB,CAAC;QAED,+DAA+D;QAC/D,UAAU,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACtC,UAAU,CAAC,IAAI,CAAC,2EAA2E,CAAC,CAAC;QAE7F,MAAM,KAAK,GAAG,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/E,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAE3B,8EAA8E;QAC9E,MAAM,UAAU,GAAG;;;qBAGF,CAAC;QAClB,OAAO,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;;sEAG2C,UAAU;uEACT,UAAU;2EACN,UAAU;+EACN,UAAU;;QAEjF,KAAK;;;KAGR,CAAC,CAAC,GAAG,CAAC,GAAG,MAAM,CAAkK,CAAC;IACrL,CAAC;IAED,YAAY,CAAC,MAAc;QACzB,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,kCAAkC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAwB,CAAC;QACpG,IAAI,CAAC,IAAI;YAAE,OAAO,EAAE,CAAC;QAErB,mDAAmD;QACnD,MAAM,YAAY,GAAG,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;;;KAIpC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAuC,CAAC;QAE/E,MAAM,QAAQ,GAAG,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC;QAEjE,OAAO,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;oBACP,qBAAqB;;;;;KAKpC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAc,CAAC;IAClE,CAAC;IAED,cAAc,CAAC,IAAY,EAAE,IAAa,EAAE,EAAW;QACrD,MAAM,UAAU,GAAG,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,4CAA4C,CAAC,CAAC,CAAC,EAAE,CAAC;QAClF,MAAM,MAAM,GAAc,CAAC,IAAI,CAAC,CAAC;QACjC,IAAI,IAAI,IAAI,EAAE;YAAE,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACtC,OAAO,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;;;;;;cAOb,qBAAqB;;;;;yBAKV,UAAU;KAC9B,CAAC,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC;IACpB,CAAC;IAED,eAAe,CAAC,KAAe,EAAE,OAAsB,KAAK,EAAE,IAAa,EAAE,EAAW;QACtF,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QACpC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QACvE,MAAM,YAAY,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACpD,MAAM,UAAU,GAAG,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,4CAA4C,CAAC,CAAC,CAAC,EAAE,CAAC;QAClF,MAAM,UAAU,GAAc,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3D,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;YACnB,OAAO,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;;;;;;gBAOb,qBAAqB;;;;;kEAK6B,YAAY;WACnE,UAAU;OACd,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,EAAE,GAAG,UAAU,CAAC,CAAC;QAClC,CAAC;QACD,OAAO,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;;;;;;cAOb,qBAAqB;;;;;;yBAMV,YAAY;;;SAG5B,UAAU;KACd,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,GAAG,UAAU,CAAC,CAAC;IAChD,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;;;;;KAMtB,CAAC,CAAC,GAAG,EAAuF,CAAC;IAChG,CAAC;IAED;;;;OAIG;IACH,aAAa,CAAC,IAAa,EAAE,EAAW;QACtC,MAAM,UAAU,GAAG,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,4CAA4C,CAAC,CAAC,CAAC,EAAE,CAAC;QAClF,MAAM,MAAM,GAAc,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAEvD,OAAO,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;;;;;;;;;;uBAWJ,qBAAqB;;;;;;yCAMH,UAAU;;;KAG9C,CAAC,CAAC,GAAG,CAAC,GAAG,MAAM,CAAoK,CAAC;IACvL,CAAC;IAED,6BAA6B;QAC3B,iFAAiF;QACjF,MAAM,OAAO,GAAG,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;;;;;;;;;;;;;;;;;;;;;;KAuB/B,CAAC,CAAC,GAAG,EAAE,CAAC;QAET,yDAAyD;QACzD,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;;;;KAKf,CAAC,CAAC,GAAG,EAAE,CAAC;QAET,uEAAuE;QACvE,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;;;;;KAMf,CAAC,CAAC,GAAG,EAAE,CAAC;QAET,OAAO,OAAO,CAAC,OAAO,CAAC;IACzB,CAAC;IAED,wBAAwB;IAExB,gBAAgB,CAAC,SAAiB;QAChC,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE,CAAC,OAAO,CACzB,iEAAiE,CAClE,CAAC,GAAG,CAAC,SAAS,CAA2C,CAAC;QAC3D,OAAO,GAAG,EAAE,cAAc,IAAI,CAAC,CAAC;IAClC,CAAC;IAED,gBAAgB,CAAC,SAAiB,EAAE,YAAoB;QACtD,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;;;;;KAMf,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;IAClC,CAAC;IAED,4BAA4B;IAE5B,mBAAmB,CAAC,QAAgB;QAClC,OAAO,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;KAEtB,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAwC,CAAC;IAC1D,CAAC;IAED,gBAAgB,CAAC,GAAa;QAC5B,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QAChC,MAAM,YAAY,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAClD,OAAO,IAAI,CAAC,EAAE,CAAC,OAAO,CACpB,uCAAuC,YAAY,GAAG,CACvD,CAAC,GAAG,CAAC,GAAG,GAAG,CAAiB,CAAC;IAChC,CAAC;IAED,aAAa,CAAC,KAAa,EAAE,KAAa;QACxC,OAAO,IAAI,CAAC,EAAE,CAAC,OAAO,CACpB,0DAA0D,CAC3D,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAc,CAAC;IACnC,CAAC;IAED,gBAAgB,CAAC,KAAa,EAAE,KAAa;QAC3C,OAAO,IAAI,CAAC,EAAE,CAAC,OAAO,CACpB,8DAA8D,CAC/D,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAiB,CAAC;IACtC,CAAC;IAED,kBAAkB,CAAC,KAAa,EAAE,KAAa;QAC7C,OAAO,IAAI,CAAC,EAAE,CAAC,OAAO,CACpB,gEAAgE,CACjE,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAmB,CAAC;IACxC,CAAC;IAED,mBAAmB,CAAC,KAAa,EAAE,KAAa;QAC9C,OAAO,IAAI,CAAC,EAAE,CAAC,OAAO,CACpB,iEAAiE,CAClE,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAoB,CAAC;IACzC,CAAC;IAED,kBAAkB,CAAC,KAAa,EAAE,KAAa;QAC7C,OAAO,IAAI,CAAC,EAAE,CAAC,OAAO,CACpB,gEAAgE,CACjE,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAmB,CAAC;IACxC,CAAC;IAED,gBAAgB,CAAC,KAAa,EAAE,KAAa;QAC3C,OAAO,IAAI,CAAC,EAAE,CAAC,OAAO,CACpB,8DAA8D,CAC/D,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAiB,CAAC;IACtC,CAAC;IAED,aAAa;QACX,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,OAAO,CAC1B,8CAA8C,CAC/C,CAAC,GAAG,EAA8D,CAAC;QACpE,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC,UAAU,EAAE,UAAU,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC;IAChG,CAAC;CACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zozul-cli",
-  "version": "0.3.8",
+  "version": "0.4.0",
   "description": "Observability for Claude Code — track token usage, costs, turns, and conversation history",
   "readmeFilename": "README.md",
   "type": "module",

package/src/cli/commands.ts

@@ -350,6 +350,11 @@ export function buildCli(): Command {
       console.log("Scanning for Claude Code session files...");
       const result = await ingestAllSessions(repo, { force: opts.force, noTag: opts.tag === false });
       console.log(`Ingested: ${result.ingested}  Skipped: ${result.skipped}`);
+
+      // Recompute costs from OTEL to overwrite JSONL estimates with authoritative data
+      const fixed = repo.recomputeSessionCostsFromOtel();
+      if (fixed > 0) console.log(`Recomputed costs for ${fixed} sessions from OTEL data`);
+
       db.close();
     });
 

package/src/dashboard/index.html

@@ -58,6 +58,21 @@
   .source-badge.local { border-color: var(--blue); color: var(--blue); }
   .source-badge.clickable { cursor: pointer; }
   .source-badge.clickable:hover { opacity: 0.7; }
+  .view-toggle {
+    background: none;
+    border: 1px solid var(--border);
+    color: var(--text-dim);
+    padding: 4px 10px;
+    border-radius: 6px;
+    cursor: pointer;
+    font-family: var(--mono);
+    font-size: 13px;
+    font-weight: 600;
+    min-width: 32px;
+    transition: border-color 0.15s, color 0.15s;
+  }
+  .view-toggle:hover { border-color: var(--accent); color: var(--text); }
+  .view-toggle.tokens { color: var(--blue, #64b5f6); border-color: var(--blue, #64b5f6); }
   .auto-btn {
     background: none;
     border: 1px solid var(--border);
@@ -437,6 +452,7 @@
   <span class="subtitle">Agent Observability</span>
   <div class="header-right">
     <span class="source-badge" id="source-badge" style="display:none" onclick="toggleDataSource()">Local</span>
+    <button class="view-toggle" id="view-mode-toggle" onclick="toggleViewMode()" title="Switch between cost and token view">$</button>
     <button class="auto-btn" onclick="manualRefresh()" title="Auto-refresh every 10s">
       <span class="live-dot"></span>
       Auto
@@ -458,9 +474,9 @@
   <div id="view-summary" class="view active">
     <div class="time-selector"></div>
     <div class="stats-grid" id="summary-stats"></div>
-    <div class="chart-card"><h3>Daily Cost (30d)</h3><canvas id="chart-daily-cost"></canvas></div>
+    <div class="chart-card"><h3 id="chart-title">Daily Cost (30d)</h3><canvas id="chart-daily-cost"></canvas></div>
     <div class="panel">
-      <div class="panel-header"><span>Cost by Project</span></div>
+      <div class="panel-header"><span id="project-panel-title">Cost by Project</span></div>
       <ul class="project-list" id="project-breakdown"></ul>
     </div>
   </div>
@@ -512,7 +528,7 @@
           <th class="sortable" data-sort="sessions:project_path">Project</th>
           <th class="sortable" data-sort="sessions:started_at">Started</th>
           <th class="sortable" data-sort="sessions:total_duration_ms">Duration</th>
-          <th class="sortable" data-sort="sessions:total_turns">Turns</th>
+          <th class="sortable" data-sort="sessions:user_turns">Prompts</th>
           <th class="sortable desc" data-sort="sessions:total_cost_usd">Cost</th>
           <th class="sortable" data-sort="sessions:model">Model</th>
         </tr></thead>
@@ -640,6 +656,7 @@ let remoteAvailable = false;
 let autoRefreshTimer = null;
 let currentView = 'summary';
 let currentTimeWindow = '7d';
+let viewMode = 'cost'; // 'cost' or 'tokens'
 let previousView = 'tasks';
 let allTaskGroups = [];
 let allTagStats = [];
@@ -712,7 +729,16 @@ function toggleDataSource() {
 async function fetchJson(path) {
   if (dataSource === 'remote' && typeof ZOZUL_CONFIG !== 'undefined') {
     try {
-      const url = ZOZUL_CONFIG.remote.baseUrl + path.replace('/api/', '/');
+      let remotePath = path.replace('/api/', '/');
+      // Ensure trailing slash before query params to avoid 307 redirects (which drop headers)
+      const qIdx = remotePath.indexOf('?');
+      if (qIdx === -1) {
+        if (!remotePath.endsWith('/')) remotePath += '/';
+      } else {
+        const base = remotePath.slice(0, qIdx);
+        if (!base.endsWith('/')) remotePath = base + '/' + remotePath.slice(qIdx);
+      }
+      const url = ZOZUL_CONFIG.remote.baseUrl + remotePath;
       const res = await fetch(url, { headers: { 'X-API-Key': ZOZUL_CONFIG.remote.apiKey } });
       if (res.ok) return res.json();
     } catch {}
@@ -771,6 +797,24 @@ function fmtCost(n) {
   const v = n ?? 0;
   return v >= 1 ? '$' + v.toFixed(2) : '$' + v.toFixed(4);
 }
+function fmtTokens(n) {
+  const v = n ?? 0;
+  if (v >= 1_000_000) return (v / 1_000_000).toFixed(1) + 'M';
+  if (v >= 1_000) return (v / 1_000).toFixed(1) + 'K';
+  return v.toLocaleString();
+}
+function fmtMetric(cost, tokens) {
+  if (viewMode === 'tokens') return tokens != null ? fmtTokens(tokens) : '\u2014';
+  return fmtCost(cost);
+}
+function toggleViewMode() {
+  viewMode = viewMode === 'cost' ? 'tokens' : 'cost';
+  const btn = document.getElementById('view-mode-toggle');
+  btn.textContent = viewMode === 'cost' ? '$' : 'T';
+  btn.classList.toggle('tokens', viewMode === 'tokens');
+  btn.title = viewMode === 'cost' ? 'Switch to token view' : 'Switch to cost view';
+  loadViewData(currentView);
+}
 function fmtDuration(ms) {
   if (!ms || ms <= 0) return '\u2014';
   const s = Math.floor(ms / 1000);
@@ -836,9 +880,13 @@ function timeQueryString() {
   return 'from=' + encodeURIComponent(from) + '&to=' + encodeURIComponent(now.toISOString());
 }
 
+function chartStepForWindow() {
+  return currentTimeWindow === '24h' ? '1h' : '1d';
+}
+
 function renderTimeSelectors() {
   document.querySelectorAll('.time-selector').forEach(el => {
-    el.innerHTML = ['7d', '30d', 'all'].map(w =>
+    el.innerHTML = ['24h', '7d', '30d', 'all'].map(w =>
       '<button class="time-btn' + (w === currentTimeWindow ? ' active' : '') + '" data-window="' + w + '">' +
       (w === 'all' ? 'All' : w) + '</button>'
     ).join('');
@@ -934,18 +982,23 @@ async function loadSummary() {
     const timeQs = timeQueryString();
     const timeParam = timeQs ? '?' + timeQs : '';
     const timeSep = timeQs ? '&' + timeQs : '';
-    const [stats, tasks, costSeries, sessionsResp] = await Promise.all([
+    const chartRange = currentTimeWindow === 'all' ? '90d' : currentTimeWindow;
+    const chartStep = currentTimeWindow === '24h' ? '1h' : '1d';
+    const [stats, tasks, costSeries, tokenSeries, sessionsResp] = await Promise.all([
       fetchJson('/api/stats' + timeParam),
       fetchJson('/api/tasks'),
-      fetchJson('/api/metrics/cost?range=' + (currentTimeWindow === 'all' ? '90d' : currentTimeWindow) + '&step=1d'),
+      fetchJson('/api/metrics/cost?range=' + chartRange + '&step=' + chartStep),
+      fetchJson('/api/metrics/tokens?range=' + chartRange + '&step=' + chartStep),
       fetchJson('/api/sessions?limit=500&offset=0' + timeSep),
     ]);
+    const totalTokens = (stats.total_input_tokens ?? 0) + (stats.total_output_tokens ?? 0) + (stats.total_cache_read_tokens ?? 0);
     renderSummaryStats({
       totalCost: stats.total_cost_usd ?? 0,
+      totalTokens,
       totalSessions: stats.total_sessions ?? 0,
       totalTasks: tasks.length ?? 0,
     });
-    renderDailyCostChart(costSeries);
+    renderUsageChart(costSeries, tokenSeries);
     const sessions = Array.isArray(sessionsResp) ? sessionsResp : sessionsResp.sessions;
     renderProjectBreakdown(sessions);
   } catch (e) {
@@ -953,18 +1006,52 @@ async function loadSummary() {
   }
 }
 
-function renderDailyCostChart(costData) {
-  if (!costData || !costData.length) return;
-  const labels = costData.map(d => {
+function renderUsageChart(costData, tokenData) {
+  const isTokens = viewMode === 'tokens';
+  const isHourly = currentTimeWindow === '24h';
+  const sourceData = isTokens ? tokenData : costData;
+
+  const titleEl = document.getElementById('chart-title');
+  if (titleEl) {
+    const period = isHourly ? 'Hourly' : 'Daily';
+    titleEl.textContent = isTokens ? period + ' Tokens' : period + ' Cost';
+  }
+
+  if (!sourceData || !sourceData.length) return;
+
+  const labels = sourceData.map(d => {
     const dt = new Date(d.timestamp);
-    return dt.toLocaleDateString(undefined, { month: 'short', day: 'numeric' });
+    return isHourly
+      ? dt.toLocaleTimeString(undefined, { hour: 'numeric', hour12: true })
+      : dt.toLocaleDateString(undefined, { month: 'short', day: 'numeric' });
   });
-  const data = costData.map(d => d.cost);
+
+  let data, label, bgColor, borderColor, tooltipFmt, yFmt;
+  if (isTokens) {
+    data = sourceData.map(d => (d.input ?? 0) + (d.output ?? 0) + (d.cache_read ?? 0));
+    label = 'Tokens';
+    bgColor = 'rgba(100,181,246,0.3)';
+    borderColor = '#64b5f6';
+    tooltipFmt = ctx => fmtTokens(ctx.parsed.y);
+    yFmt = v => fmtTokens(v);
+  } else {
+    data = sourceData.map(d => d.cost);
+    label = 'Cost (USD)';
+    bgColor = 'rgba(255,152,0,0.3)';
+    borderColor = '#ff9800';
+    tooltipFmt = ctx => '$' + ctx.parsed.y.toFixed(4);
+    yFmt = v => '$' + v.toFixed(2);
+  }
 
   const existing = chartInstances['chart-daily-cost'];
   if (existing) {
     existing.data.labels = labels;
     existing.data.datasets[0].data = data;
+    existing.data.datasets[0].label = label;
+    existing.data.datasets[0].backgroundColor = bgColor;
+    existing.data.datasets[0].borderColor = borderColor;
+    existing.options.plugins.tooltip.callbacks.label = tooltipFmt;
+    existing.options.scales.y.ticks.callback = yFmt;
     existing.update('none');
     return;
   }
@@ -976,10 +1063,10 @@ function renderDailyCostChart(costData) {
     data: {
       labels,
       datasets: [{
-        label: 'Cost (USD)',
+        label,
         data,
-        backgroundColor: 'rgba(255,152,0,0.3)',
-        borderColor: '#ff9800',
+        backgroundColor: bgColor,
+        borderColor,
         borderWidth: 1,
         borderRadius: 3,
       }]
@@ -988,11 +1075,11 @@ function renderDailyCostChart(costData) {
       responsive: true,
       plugins: {
         legend: { display: false },
-        tooltip: { callbacks: { label: ctx => '$' + ctx.parsed.y.toFixed(4) } },
+        tooltip: { callbacks: { label: tooltipFmt } },
       },
       scales: {
         x: { ticks: { color: '#8b8fa3', font: { family: '"JetBrains Mono", monospace', size: 10 } } },
-        y: { ticks: { color: '#8b8fa3', font: { family: '"JetBrains Mono", monospace', size: 10 }, callback: v => '$' + v.toFixed(2) } },
+        y: { ticks: { color: '#8b8fa3', font: { family: '"JetBrains Mono", monospace', size: 10 }, callback: yFmt } },
       }
     }
   });
@@ -1009,26 +1096,34 @@ function renderProjectBreakdown(sessions) {
   const byProject = {};
   for (const s of sessions) {
     const proj = s.project_path || 'Unknown';
-    if (!byProject[proj]) byProject[proj] = 0;
-    byProject[proj] += s.total_cost_usd || 0;
-  }
-  const sorted = Object.entries(byProject).sort((a, b) => b[1] - a[1]);
-  const maxCost = sorted[0]?.[1] || 1;
-
-  el.innerHTML = sorted.slice(0, 10).map(([proj, cost]) => {
-    const pct = Math.round(cost / maxCost * 100);
+    if (!byProject[proj]) byProject[proj] = { cost: 0, tokens: 0 };
+    byProject[proj].cost += s.total_cost_usd || 0;
+    byProject[proj].tokens += (s.total_input_tokens || 0) + (s.total_output_tokens || 0) + (s.total_cache_read_tokens || 0);
+  }
+  const isTokens = viewMode === 'tokens';
+  const panelTitle = document.getElementById('project-panel-title');
+  if (panelTitle) panelTitle.textContent = isTokens ? 'Tokens by Project' : 'Cost by Project';
+  const sorted = Object.entries(byProject).sort((a, b) => (isTokens ? b[1].tokens - a[1].tokens : b[1].cost - a[1].cost));
+  const maxVal = (isTokens ? sorted[0]?.[1].tokens : sorted[0]?.[1].cost) || 1;
+
+  el.innerHTML = sorted.slice(0, 10).map(([proj, vals]) => {
+    const val = isTokens ? vals.tokens : vals.cost;
+    const pct = Math.round(val / maxVal * 100);
     return '<li class="project-item">' +
       '<span class="project-name" title="' + escHtml(proj) + '">' + escHtml(basename(proj)) + '</span>' +
       '<div class="project-bar-wrap"><div class="project-bar" style="width:' + pct + '%"></div></div>' +
-      '<span class="project-cost">' + fmtCost(cost) + '</span>' +
+      '<span class="project-cost">' + (isTokens ? fmtTokens(val) : fmtCost(val)) + '</span>' +
     '</li>';
   }).join('');
 }
 
 function renderSummaryStats(s) {
   const grid = document.getElementById('summary-stats');
+  const primary = viewMode === 'tokens'
+    ? { label: 'Total Tokens', value: fmtTokens(s.totalTokens) }
+    : { label: 'Total Cost', value: fmtCost(s.totalCost) };
   grid.innerHTML = [
-    { label: 'Total Cost', value: fmtCost(s.totalCost), hero: true },
+    { label: primary.label, value: primary.value, hero: true },
     { label: 'Total Sessions', value: fmtNum(s.totalSessions), hero: true },
     { label: 'Total Tasks', value: fmtNum(s.totalTasks), hero: true },
   ].map(c =>
@@ -1066,7 +1161,7 @@ function renderTaskTable(groups) {
     return '<tr class="clickable" onclick="showTaskDetail(\'' + escHtml(g.tags).replace(/'/g, "\\'") + '\')">' +
       '<td>' + pills + '</td>' +
       '<td>' + fmtDuration(g.total_duration_ms) + '</td>' +
-      '<td><span class="badge badge-cost">' + fmtCost(g.total_cost_usd) + '</span></td>' +
+      '<td><span class="badge badge-cost">' + fmtMetric(g.total_cost_usd, g.total_tokens) + '</span></td>' +
       '<td>' + fmtNum(g.human_interventions) + '</td>' +
       '<td title="' + fmtAbsolute(g.last_seen) + '">' + fmtRelative(g.last_seen) + '</td>' +
       '</tr>';
@@ -1186,8 +1281,10 @@ async function loadTags() {
   try {
     const tasks = await fetchJson('/api/tasks');
     if (!tasks.length) { allTagStats = []; renderTagTable([]); return; }
+    const timeQs = timeQueryString();
+    const timeSep = timeQs ? '&' + timeQs : '';
     const statsList = await Promise.all(
-      tasks.map(t => fetchJson('/api/tasks/stats?tags=' + encodeURIComponent(t.task) + '&mode=any')
+      tasks.map(t => fetchJson('/api/tasks/stats?tags=' + encodeURIComponent(t.task) + '&mode=any' + timeSep)
         .then(s => ({ ...s, tag: t.task, last_seen: t.last_tagged }))
         .catch(() => ({ tag: t.task, turn_count: t.turn_count, human_interventions: 0, total_duration_ms: 0, total_cost_usd: 0, last_seen: t.last_tagged }))
       )
@@ -1198,6 +1295,7 @@ async function loadTags() {
       human_interventions: s.user_turns ?? s.human_interventions ?? 0,
       total_duration_ms: s.total_duration_ms ?? 0,
       total_cost_usd: s.total_cost_usd ?? 0,
+      total_tokens: (s.total_input_tokens ?? 0) + (s.total_output_tokens ?? 0) + (s.total_cache_read_tokens ?? 0),
       last_seen: s.last_seen,
     }));
     renderTagTable(sortData(allTagStats, sortState.tags));
@@ -1216,7 +1314,7 @@ function renderTagTable(stats) {
     '<tr class="clickable" onclick="showTagDetail(\'' + escHtml(t.tag).replace(/'/g, "\\'") + '\')">' +
       '<td><span class="tag-pill">' + escHtml(t.tag) + '</span></td>' +
       '<td>' + fmtDuration(t.total_duration_ms) + '</td>' +
-      '<td><span class="badge badge-cost">' + fmtCost(t.total_cost_usd) + '</span></td>' +
+      '<td><span class="badge badge-cost">' + fmtMetric(t.total_cost_usd, t.total_tokens) + '</span></td>' +
       '<td>' + fmtNum(t.human_interventions) + '</td>' +
       '<td title="' + fmtAbsolute(t.last_seen) + '">' + fmtRelative(t.last_seen) + '</td>' +
     '</tr>'
@@ -1360,7 +1458,7 @@ async function showSession(id, returnTo) {
   const [session, turns, subagents] = await Promise.all([
     fetchJson('/api/sessions/' + id),
     fetchJson('/api/sessions/' + id + '/turns'),
-    fetchJson('/api/sessions/' + id + '/subagents'),
+    fetchJson('/api/sessions/' + id + '/subagents').catch(() => []),
   ]);
 
   const stats = [
@@ -1368,7 +1466,7 @@ async function showSession(id, returnTo) {
     { label: 'Project', value: '<span title="' + escHtml(session.project_path ?? '') + '">' + escHtml(basename(session.project_path)) + '</span>' },
     { label: 'Model', value: '<span style="font-family:var(--mono);font-size:13px">' + escHtml(session.model ?? '\u2014') + '</span>' },
     { label: 'Duration', value: fmtDuration(session.total_duration_ms) },
-    { label: 'Turns', value: session.total_turns },
+    { label: 'Prompts', value: session.user_turns ?? session.total_turns },
     { label: 'Input Tokens', value: fmtNum(session.total_input_tokens) },
     { label: 'Output Tokens', value: fmtNum(session.total_output_tokens) },
     { label: 'Cost', value: fmtCost(session.total_cost_usd) },
@@ -1535,8 +1633,8 @@ function renderSessionsTable(sessions) {
       '<td' + projAttr + '>' + escHtml(proj) + '</td>' +
       '<td title="' + fmtAbsolute(s.started_at) + '">' + fmtRelative(s.started_at) + '</td>' +
       '<td>' + fmtDuration(s.total_duration_ms) + '</td>' +
-      '<td>' + (s.total_turns ?? 0) + '</td>' +
-      '<td><span class="badge badge-cost">' + fmtCost(s.total_cost_usd) + '</span></td>' +
+      '<td>' + (s.user_turns ?? s.total_turns ?? 0) + '</td>' +
+      '<td><span class="badge badge-cost">' + fmtMetric(s.total_cost_usd, (s.total_input_tokens || 0) + (s.total_output_tokens || 0) + (s.total_cache_read_tokens || 0)) + '</span></td>' +
       '<td style="font-family:var(--mono);font-size:11px;color:var(--text-dim)">' + escHtml(s.model ?? '\u2014') + '</td>' +
       '</tr>';
   }).join('');

package/src/storage/db.ts

@@ -126,6 +126,18 @@ function migrate(db: Database.Database): void {
     try { db.exec(sql); } catch { /* column already exists */ }
   }
   db.exec(`CREATE INDEX IF NOT EXISTS idx_sessions_parent ON sessions(parent_session_id)`);
+
+  // Deduplicate otel_metrics and add unique constraint to match backend
+  try {
+    db.exec(`
+      DELETE FROM otel_metrics WHERE id NOT IN (
+        SELECT MIN(id) FROM otel_metrics
+        GROUP BY session_id, name, timestamp, json_extract(attributes, '$.type')
+      );
+      CREATE UNIQUE INDEX uq_otel_metrics_session_name_ts_type
+        ON otel_metrics(session_id, name, timestamp, json_extract(attributes, '$.type'));
+    `);
+  } catch { /* index already exists */ }
 }
 
 export type SessionRow = {