claude-cup 0.4.1 → 0.5.0

package/src/aggregator.js

@@ -1,297 +1,317 @@
-// Aggregates parsed transcript events into "today" stats + persisted daily history.
-import { EventEmitter } from 'node:events';
-import { readFileSync, writeFileSync, mkdirSync } from 'node:fs';
-import { dirname } from 'node:path';
-
-// USD per million tokens (estimate; close enough for a jar).
-const PRICING = [
-  { match: /opus/i, in: 5, out: 25 },
-  { match: /sonnet/i, in: 3, out: 15 },
-  { match: /haiku/i, in: 1, out: 5 },
-];
-const DEFAULT_PRICE = { in: 3, out: 15 };
-
-export function priceFor(model) {
-  for (const p of PRICING) if (p.match.test(model || '')) return p;
-  return DEFAULT_PRICE;
-}
-
-export function costOf(model, usage) {
-  const p = priceFor(model);
-  const M = 1e6;
-  return (
-    (usage.in * p.in +
-      usage.out * p.out +
-      usage.cacheRead * p.in * 0.1 +
-      usage.cacheW5m * p.in * 1.25 +
-      usage.cacheW1h * p.in * 2) / M
-  );
-}
-
-export function localDateKey(ts) {
-  const d = new Date(ts);
-  const mm = String(d.getMonth() + 1).padStart(2, '0');
-  const dd = String(d.getDate()).padStart(2, '0');
-  return `${d.getFullYear()}-${mm}-${dd}`;
-}
-
-export function localMidnight(now = Date.now()) {
-  const d = new Date(now);
-  d.setHours(0, 0, 0, 0);
-  return d.getTime();
-}
-
-const EDIT_DEDUP_MS = 2 * 60 * 1000;
-
-function emptyDay(dateKey) {
-  return {
-    date: dateKey,
-    tokensIn: 0,
-    tokensOut: 0,
-    cacheRead: 0,
-    cacheWrite: 0,
-    totalTokens: 0,
-    cost: 0,
-    toolCalls: 0,
-    toolsByCategory: {},
-    assistantMessages: 0,
-    userPrompts: 0,
-    models: {},
-    fillMax: 0,
-    _editEvents: [],
-    _terminalCount: 0,
-    _commitCount: 0,
-  };
-}
-
-const BURN_WINDOW_MS = 10 * 60 * 1000;
-
-export class Aggregator extends EventEmitter {
-  constructor({ historyPath, now = () => Date.now() } = {}) {
-    super();
-    this.historyPath = historyPath || null;
-    this.now = now;
-    this.day = emptyDay(localDateKey(this.now()));
-    this.sessions = new Set();
-    this.seen = new Set();
-    this.histSeen = new Set();
-    this.backfill = {}; // dateKey -> partial day totals from old transcripts
-    this.burn = []; // {ts, tokens}
-    this.history = { days: {} };
-    this._saveTimer = null;
-    this._loadHistory();
-  }
-
-  _loadHistory() {
-    if (!this.historyPath) return;
-    try {
-      const parsed = JSON.parse(readFileSync(this.historyPath, 'utf8'));
-      if (parsed && typeof parsed.days === 'object') this.history = parsed;
-    } catch {
-      /* first run */
-    }
-    // Restore today's stats if the server restarted mid-day.
-    const saved = this.history.days[this.day.date];
-    if (saved && saved._full) {
-      this.day = { ...emptyDay(this.day.date), ...saved._full };
-      this.sessions = new Set(saved._full.sessionIds || []);
-      this.seen = new Set(saved._full.seenUuids || []);
-    }
-  }
-
-  _rolloverIfNeeded() {
-    const key = localDateKey(this.now());
-    if (key !== this.day.date) {
-      this._snapshotToHistory();
-      this.day = emptyDay(key);
-      this.sessions = new Set();
-      this.seen = new Set();
-      this.burn = [];
-      this.emit('rollover', key);
-    }
-  }
-
-  _snapshotToHistory() {
-    const d = this.day;
-    this.history.days[d.date] = {
-      totalTokens: d.totalTokens,
-      cost: Math.round(d.cost * 10000) / 10000,
-      toolCalls: d.toolCalls,
-      messages: d.assistantMessages,
-      fillMax: d.fillMax,
-      _full: {
-        ...d,
-        sessionIds: [...this.sessions].slice(0, 500),
-        seenUuids: [...this.seen].slice(-5000),
-      },
-    };
-  }
-
-  saveNow() {
-    if (!this.historyPath) return;
-    this._snapshotToHistory();
-    try {
-      mkdirSync(dirname(this.historyPath), { recursive: true });
-      writeFileSync(this.historyPath, JSON.stringify(this.history));
-    } catch {
-      /* non-fatal */
-    }
-  }
-
-  _saveSoon() {
-    if (!this.historyPath || this._saveTimer) return;
-    this._saveTimer = setTimeout(() => {
-      this._saveTimer = null;
-      this.saveNow();
-    }, 5000);
-    this._saveTimer.unref?.();
-  }
-
-  noteFill(pct) {
-    this._rolloverIfNeeded();
-    if (typeof pct === 'number' && pct > this.day.fillMax) {
-      this.day.fillMax = Math.min(100, Math.round(pct * 10) / 10);
-      this._saveSoon();
-    }
-  }
-
-  /** Accumulates an event from a previous day into the history shelf. */
-  _addBackfill(evt) {
-    if (evt.kind !== 'assistant') return;
-    if (evt.uuid) {
-      if (this.histSeen.has(evt.uuid)) return;
-      this.histSeen.add(evt.uuid);
-    }
-    const key = localDateKey(evt.ts);
-    const b = (this.backfill[key] ||= { totalTokens: 0, cost: 0, toolCalls: 0, messages: 0, fillMax: 0 });
-    const u = evt.usage;
-    b.totalTokens += u.in + u.out;
-    b.cost += costOf(evt.model, u);
-    b.toolCalls += evt.tools.length;
-    b.messages += 1;
-  }
-
-  /** @returns {boolean} true if the event counted toward today (and may animate) */
-  addEvent(evt) {
-    if (!evt) return false;
-    this._rolloverIfNeeded();
-    if (evt.ts > this.now() + 60_000) return false;
-    if (evt.ts < localMidnight(this.now())) {
-      if (evt.ts >= localMidnight(this.now()) - 7 * 86400000) this._addBackfill(evt);
-      return false;
-    }
-    if (evt.uuid) {
-      if (this.seen.has(evt.uuid)) return false;
-      this.seen.add(evt.uuid);
-    }
-    if (evt.sessionId) this.sessions.add(evt.sessionId);
-    const d = this.day;
-
-    if (evt.kind === 'prompt') {
-      d.userPrompts += 1;
-      this._saveSoon();
-      return true;
-    }
-
-    if (evt.kind === 'assistant') {
-      const u = evt.usage;
-      const fresh = u.in + u.out;
-      d.tokensIn += u.in;
-      d.tokensOut += u.out;
-      d.cacheRead += u.cacheRead;
-      d.cacheWrite += u.cacheW5m + u.cacheW1h;
-      d.totalTokens += fresh;
-      d.cost += costOf(evt.model, u);
-      d.assistantMessages += 1;
-      d.models[evt.model] = (d.models[evt.model] || 0) + fresh;
-      let evtEdits = 0;
-      let evtTerminals = 0;
-      for (const t of evt.tools) {
-        d.toolCalls += 1;
-        d.toolsByCategory[t.category] = (d.toolsByCategory[t.category] || 0) + 1;
-        if (t.category === 'edit') evtEdits++;
-        if (t.category === 'terminal') evtTerminals++;
-      }
-      if (evtEdits > 0) d._editEvents.push({ ts: evt.ts, count: evtEdits });
-      d._terminalCount += evtTerminals;
-      if (fresh > 0) {
-        this.burn.push({ ts: evt.ts, tokens: fresh });
-      }
-      this._saveSoon();
-      return true;
-    }
-    return false;
-  }
-
-  burnRate() {
-    const cutoff = this.now() - BURN_WINDOW_MS;
-    while (this.burn.length && this.burn[0].ts < cutoff) this.burn.shift();
-    const total = this.burn.reduce((a, b) => a + b.tokens, 0);
-    return Math.round(total / (BURN_WINDOW_MS / 60000));
-  }
-
-  _netEdits() {
-    const edits = this.day._editEvents;
-    if (!edits.length) return 0;
-    let net = 0;
-    for (let i = 0; i < edits.length; i++) {
-      const next = edits[i + 1];
-      if (next && (next.ts - edits[i].ts) < EDIT_DEDUP_MS) continue;
-      net += edits[i].count;
-    }
-    return net;
-  }
-
-  buildRate() {
-    const d = this.day;
-    const net = this._netEdits();
-    const kiloTokens = Math.max(1, d.totalTokens / 1000);
-    return Math.round(((net + d._terminalCount + d._commitCount * 5) / kiloTokens) * 100) / 100;
-  }
-
-  snapshot() {
-    this._rolloverIfNeeded();
-    const d = this.day;
-    return {
-      date: d.date,
-      tokensIn: d.tokensIn,
-      tokensOut: d.tokensOut,
-      cacheRead: d.cacheRead,
-      cacheWrite: d.cacheWrite,
-      totalTokens: d.totalTokens,
-      cost: Math.round(d.cost * 100) / 100,
-      toolCalls: d.toolCalls,
-      toolsByCategory: d.toolsByCategory,
-      assistantMessages: d.assistantMessages,
-      userPrompts: d.userPrompts,
-      sessions: this.sessions.size,
-      models: d.models,
-      burnRate: this.burnRate(),
-      fillMax: d.fillMax,
-      buildRate: this.buildRate(),
-      netEdits: this._netEdits(),
-      cleanTerminal: d._terminalCount,
-      commits: d._commitCount,
-    };
-  }
-
-  /** last N days (excluding today), oldest first. Live records win over backfill. */
-  historyDays(n = 7) {
-    const out = [];
-    for (let i = n; i >= 1; i--) {
-      const key = localDateKey(this.now() - i * 86400000);
-      const day = this.history.days[key]?._full ? this.history.days[key] : null;
-      const fallback = this.backfill[key] || this.history.days[key];
-      const d = day || fallback;
-      out.push({
-        date: key,
-        totalTokens: d?.totalTokens || 0,
-        cost: Math.round((d?.cost || 0) * 100) / 100,
-        toolCalls: d?.toolCalls || 0,
-        messages: d?.messages || 0,
-        fillMax: d?.fillMax || 0,
-      });
-    }
-    return out;
-  }
-}
+// Aggregates parsed transcript events into "today" stats + persisted daily history.
+import { EventEmitter } from 'node:events';
+import { readFileSync, writeFileSync, mkdirSync } from 'node:fs';
+import { dirname } from 'node:path';
+
+// USD per million tokens (estimate; close enough for a jar).
+const PRICING = [
+  { match: /opus/i, in: 5, out: 25 },
+  { match: /sonnet/i, in: 3, out: 15 },
+  { match: /haiku/i, in: 1, out: 5 },
+];
+const DEFAULT_PRICE = { in: 3, out: 15 };
+
+export function priceFor(model) {
+  for (const p of PRICING) if (p.match.test(model || '')) return p;
+  return DEFAULT_PRICE;
+}
+
+export function costOf(model, usage) {
+  const p = priceFor(model);
+  const M = 1e6;
+  return (
+    (usage.in * p.in +
+      usage.out * p.out +
+      usage.cacheRead * p.in * 0.1 +
+      usage.cacheW5m * p.in * 1.25 +
+      usage.cacheW1h * p.in * 2) / M
+  );
+}
+
+export function localDateKey(ts) {
+  const d = new Date(ts);
+  const mm = String(d.getMonth() + 1).padStart(2, '0');
+  const dd = String(d.getDate()).padStart(2, '0');
+  return `${d.getFullYear()}-${mm}-${dd}`;
+}
+
+export function localMidnight(now = Date.now()) {
+  const d = new Date(now);
+  d.setHours(0, 0, 0, 0);
+  return d.getTime();
+}
+
+const EDIT_DEDUP_MS = 2 * 60 * 1000;
+
+function emptyDay(dateKey) {
+  return {
+    date: dateKey,
+    tokensIn: 0,
+    tokensOut: 0,
+    cacheRead: 0,
+    cacheWrite: 0,
+    totalTokens: 0,
+    cost: 0,
+    toolCalls: 0,
+    toolsByCategory: {},
+    assistantMessages: 0,
+    userPrompts: 0,
+    models: {},
+    fillMax: 0,
+    _editEvents: [],
+    _terminalCount: 0,
+    _commitCount: 0,
+  };
+}
+
+const BURN_WINDOW_MS = 10 * 60 * 1000;
+
+export class Aggregator extends EventEmitter {
+  constructor({ historyPath, now = () => Date.now() } = {}) {
+    super();
+    this.historyPath = historyPath || null;
+    this.now = now;
+    this.day = emptyDay(localDateKey(this.now()));
+    this.sessions = new Set();
+    this.seen = new Set();
+    this.histSeen = new Set();
+    this.backfill = {}; // dateKey -> partial day totals from old transcripts
+    this.burn = []; // {ts, tokens}
+    this.history = { days: {} };
+    this._saveTimer = null;
+    this._loadHistory();
+  }
+
+  _loadHistory() {
+    if (!this.historyPath) return;
+    try {
+      const parsed = JSON.parse(readFileSync(this.historyPath, 'utf8'));
+      if (parsed && typeof parsed.days === 'object') this.history = parsed;
+    } catch {
+      /* first run */
+    }
+    // Restore today's stats if the server restarted mid-day.
+    const saved = this.history.days[this.day.date];
+    if (saved && saved._full) {
+      this.day = { ...emptyDay(this.day.date), ...saved._full };
+      this.sessions = new Set(saved._full.sessionIds || []);
+      this.seen = new Set(saved._full.seenUuids || []);
+    }
+  }
+
+  _rolloverIfNeeded() {
+    const key = localDateKey(this.now());
+    if (key !== this.day.date) {
+      this._snapshotToHistory();
+      this.day = emptyDay(key);
+      this.sessions = new Set();
+      this.seen = new Set();
+      this.burn = [];
+      this.emit('rollover', key);
+    }
+  }
+
+  _snapshotToHistory() {
+    const d = this.day;
+    this.history.days[d.date] = {
+      totalTokens: d.totalTokens,
+      cost: Math.round(d.cost * 10000) / 10000,
+      toolCalls: d.toolCalls,
+      messages: d.assistantMessages,
+      fillMax: d.fillMax,
+      buildRate: this.buildRate(),
+      _full: {
+        ...d,
+        sessionIds: [...this.sessions].slice(0, 500),
+        seenUuids: [...this.seen].slice(-5000),
+      },
+    };
+  }
+
+  /** Weighted 7-day rolling Build Rate: today=1.0, then 0.9, 0.8, ... 0.4 */
+  rollingBuildRate() {
+    const weights = [0.4, 0.5, 0.6, 0.7, 0.8, 0.9]; // oldest first, today added below
+    const past = this.historyDays(6); // 6 prior days, oldest first
+    let weightedSum = 0;
+    let weightTotal = 0;
+    past.forEach((day, i) => {
+      const w = weights[i] || 0.4;
+      const br = day.buildRate || 0;
+      weightedSum += br * w;
+      weightTotal += w;
+    });
+    const todayBr = this.buildRate();
+    weightedSum += todayBr * 1.0;
+    weightTotal += 1.0;
+    return Math.round((weightedSum / weightTotal) * 100) / 100;
+  }
+
+  saveNow() {
+    if (!this.historyPath) return;
+    this._snapshotToHistory();
+    try {
+      mkdirSync(dirname(this.historyPath), { recursive: true });
+      writeFileSync(this.historyPath, JSON.stringify(this.history));
+    } catch {
+      /* non-fatal */
+    }
+  }
+
+  _saveSoon() {
+    if (!this.historyPath || this._saveTimer) return;
+    this._saveTimer = setTimeout(() => {
+      this._saveTimer = null;
+      this.saveNow();
+    }, 5000);
+    this._saveTimer.unref?.();
+  }
+
+  noteFill(pct) {
+    this._rolloverIfNeeded();
+    if (typeof pct === 'number' && pct > this.day.fillMax) {
+      this.day.fillMax = Math.min(100, Math.round(pct * 10) / 10);
+      this._saveSoon();
+    }
+  }
+
+  /** Accumulates an event from a previous day into the history shelf. */
+  _addBackfill(evt) {
+    if (evt.kind !== 'assistant') return;
+    if (evt.uuid) {
+      if (this.histSeen.has(evt.uuid)) return;
+      this.histSeen.add(evt.uuid);
+    }
+    const key = localDateKey(evt.ts);
+    const b = (this.backfill[key] ||= { totalTokens: 0, cost: 0, toolCalls: 0, messages: 0, fillMax: 0 });
+    const u = evt.usage;
+    b.totalTokens += u.in + u.out;
+    b.cost += costOf(evt.model, u);
+    b.toolCalls += evt.tools.length;
+    b.messages += 1;
+  }
+
+  /** @returns {boolean} true if the event counted toward today (and may animate) */
+  addEvent(evt) {
+    if (!evt) return false;
+    this._rolloverIfNeeded();
+    if (evt.ts > this.now() + 60_000) return false;
+    if (evt.ts < localMidnight(this.now())) {
+      if (evt.ts >= localMidnight(this.now()) - 7 * 86400000) this._addBackfill(evt);
+      return false;
+    }
+    if (evt.uuid) {
+      if (this.seen.has(evt.uuid)) return false;
+      this.seen.add(evt.uuid);
+    }
+    if (evt.sessionId) this.sessions.add(evt.sessionId);
+    const d = this.day;
+
+    if (evt.kind === 'prompt') {
+      d.userPrompts += 1;
+      this._saveSoon();
+      return true;
+    }
+
+    if (evt.kind === 'assistant') {
+      const u = evt.usage;
+      const fresh = u.in + u.out;
+      d.tokensIn += u.in;
+      d.tokensOut += u.out;
+      d.cacheRead += u.cacheRead;
+      d.cacheWrite += u.cacheW5m + u.cacheW1h;
+      d.totalTokens += fresh;
+      d.cost += costOf(evt.model, u);
+      d.assistantMessages += 1;
+      d.models[evt.model] = (d.models[evt.model] || 0) + fresh;
+      let evtEdits = 0;
+      let evtTerminals = 0;
+      for (const t of evt.tools) {
+        d.toolCalls += 1;
+        d.toolsByCategory[t.category] = (d.toolsByCategory[t.category] || 0) + 1;
+        if (t.category === 'edit') evtEdits++;
+        if (t.category === 'terminal') evtTerminals++;
+      }
+      if (evtEdits > 0) d._editEvents.push({ ts: evt.ts, count: evtEdits });
+      d._terminalCount += evtTerminals;
+      if (fresh > 0) {
+        this.burn.push({ ts: evt.ts, tokens: fresh });
+      }
+      this._saveSoon();
+      return true;
+    }
+    return false;
+  }
+
+  burnRate() {
+    const cutoff = this.now() - BURN_WINDOW_MS;
+    while (this.burn.length && this.burn[0].ts < cutoff) this.burn.shift();
+    const total = this.burn.reduce((a, b) => a + b.tokens, 0);
+    return Math.round(total / (BURN_WINDOW_MS / 60000));
+  }
+
+  _netEdits() {
+    const edits = this.day._editEvents;
+    if (!edits.length) return 0;
+    let net = 0;
+    for (let i = 0; i < edits.length; i++) {
+      const next = edits[i + 1];
+      if (next && (next.ts - edits[i].ts) < EDIT_DEDUP_MS) continue;
+      net += edits[i].count;
+    }
+    return net;
+  }
+
+  buildRate() {
+    const d = this.day;
+    const net = this._netEdits();
+    const kiloTokens = Math.max(1, d.totalTokens / 1000);
+    return Math.round(((net + d._terminalCount + d._commitCount * 5) / kiloTokens) * 100) / 100;
+  }
+
+  snapshot() {
+    this._rolloverIfNeeded();
+    const d = this.day;
+    return {
+      date: d.date,
+      tokensIn: d.tokensIn,
+      tokensOut: d.tokensOut,
+      cacheRead: d.cacheRead,
+      cacheWrite: d.cacheWrite,
+      totalTokens: d.totalTokens,
+      cost: Math.round(d.cost * 100) / 100,
+      toolCalls: d.toolCalls,
+      toolsByCategory: d.toolsByCategory,
+      assistantMessages: d.assistantMessages,
+      userPrompts: d.userPrompts,
+      sessions: this.sessions.size,
+      models: d.models,
+      burnRate: this.burnRate(),
+      fillMax: d.fillMax,
+      buildRate: this.buildRate(),
+      netEdits: this._netEdits(),
+      cleanTerminal: d._terminalCount,
+      commits: d._commitCount,
+    };
+  }
+
+  /** last N days (excluding today), oldest first. Live records win over backfill. */
+  historyDays(n = 7) {
+    const out = [];
+    for (let i = n; i >= 1; i--) {
+      const key = localDateKey(this.now() - i * 86400000);
+      const day = this.history.days[key]?._full ? this.history.days[key] : null;
+      const fallback = this.backfill[key] || this.history.days[key];
+      const d = day || fallback;
+      out.push({
+        date: key,
+        totalTokens: d?.totalTokens || 0,
+        cost: Math.round((d?.cost || 0) * 100) / 100,
+        toolCalls: d?.toolCalls || 0,
+        messages: d?.messages || 0,
+        fillMax: d?.fillMax || 0,
+        buildRate: d?.buildRate || 0,
+      });
+    }
+    return out;
+  }
+}

package/src/cli.js

@@ -23,7 +23,7 @@ import { openDb, insertEvent, upsertCurrentSession, getCurrentSession } from '..
 import { registerClaudeCode, registerCursorIfPresent, getRegistrationRecordPath } from '../mcp-server/src/registration.js';
 import { runCalibration } from '../mcp-server/src/calibrator.js';
 import { computeSessionFingerprint, saveFingerprint } from '../mcp-server/src/fingerprint.js';
-import { submitAndRank, getCachedRank } from './leaderboard.js';
+import { submitAndRank, getCachedRank, nextRefreshMs } from './leaderboard.js';
 
 
 const pkgRoot = join(dirname(fileURLToPath(import.meta.url)), '..');
@@ -290,20 +290,29 @@ Options:
 
   const getPower = () => ({ powerLevel: currentPower, richness: currentRichness });
 
-  // --- Leaderboard: submit Build Rate and get rank ---
+  // --- Leaderboard: submit rolling Build Rate and get rank ---
+  // Adaptive cadence: 2 min when BR is actively changing, 5 min when idle.
   let currentLeaderboard = getCachedRank();
-  const refreshLeaderboard = async () => {
+  let lbTimer = null;
+  const scheduleLb = (delayMs) => {
+    if (lbTimer) clearTimeout(lbTimer);
+    lbTimer = setTimeout(runLb, delayMs);
+    lbTimer.unref?.();
+  };
+  const runLb = async () => {
     try {
-      const snap = aggregator.snapshot();
-      if (snap.buildRate > 0) {
-        currentLeaderboard = await submitAndRank(snap.buildRate);
+      const rollingBR = aggregator.rollingBuildRate();
+      if (rollingBR > 0) {
+        const prev = currentLeaderboard;
+        currentLeaderboard = await submitAndRank(rollingBR);
         setLeaderboard(currentLeaderboard);
+        scheduleLb(nextRefreshMs(prev, currentLeaderboard));
+        return;
       }
     } catch { /* non-fatal */ }
+    scheduleLb(5 * 60_000);
   };
-  setTimeout(refreshLeaderboard, 8000);
-  const lbTimer = setInterval(refreshLeaderboard, 5 * 60_000);
-  lbTimer.unref?.();
+  scheduleLb(8000);
   const getLeaderboard = () => currentLeaderboard;
 
   const port = await listen(server, args.port);