ccclub 0.3.8 → 0.3.10

package/dist/index.js

@@ -614,12 +614,21 @@ async function collectCodexUsage() {
   const entries = [];
   const turns = [];
   const seen = /* @__PURE__ */ new Set();
+  const seenTurns = /* @__PURE__ */ new Set();
+  function addTurn(timestamp, key) {
+    if (seenTurns.has(key)) return;
+    seenTurns.add(key);
+    turns.push({ source, timestamp, key });
+  }
   for (const sessionDir of sessionDirs) {
     const sessionFiles = files.filter((file) => file.startsWith(`${sessionDir}${sep}`));
     for (const file of sessionFiles) {
       const sessionId = sessionIdForFile(sessionDir, file);
       let previousTotal = null;
       let currentModel;
+      let sawTaskStarted = false;
+      const fallbackUserTurns = [];
+      const seenFallbackUserTurns = /* @__PURE__ */ new Set();
       await readJsonlFile(file, (value) => {
         const record = asRecord(value);
         if (record == null) return;
@@ -629,6 +638,25 @@ async function collectCodexUsage() {
           currentModel = extractModelFromPayload(payload) ?? currentModel;
           return;
         }
+        if (type === "event_msg" && payload?.type === "task_started") {
+          const timestamp2 = toIsoTimestamp(payload.started_at ?? record.timestamp);
+          if (timestamp2 == null) return;
+          const turnId = asString(payload.turn_id);
+          const key = turnId != null ? `${source}:${sessionId}:${turnId}` : `${source}:${sessionId}:${timestamp2}:task_started`;
+          sawTaskStarted = true;
+          addTurn(timestamp2, key);
+          return;
+        }
+        if (type === "event_msg" && payload?.type === "user_message") {
+          const timestamp2 = toIsoTimestamp(record.timestamp);
+          if (timestamp2 == null) return;
+          const key = `${source}:${sessionId}:${timestamp2}:user_message`;
+          if (!seenFallbackUserTurns.has(key)) {
+            seenFallbackUserTurns.add(key);
+            fallbackUserTurns.push({ source, timestamp: timestamp2, key });
+          }
+          return;
+        }
         if (type !== "event_msg" || payload?.type !== "token_count") return;
         const timestamp = toIsoTimestamp(record.timestamp);
         if (timestamp == null) return;
@@ -673,8 +701,10 @@ async function collectCodexUsage() {
           totalTokens,
           costUSD: calculateCost(model, inputTokens, rawUsage.outputTokens, 0, cacheReadTokens)
         });
-        turns.push({ source, timestamp, key: dedupeKey });
       });
+      if (!sawTaskStarted) {
+        for (const turn of fallbackUserTurns) addTurn(turn.timestamp, turn.key);
+      }
     }
   }
   return { source, entries, turns, files: files.length, warnings: [] };
@@ -991,6 +1021,7 @@ function aggregateSourceToBlocks(source, entries, humanTurns) {
     let reasoningTokens = 0;
     let totalTokens = 0;
     let costUSD = 0;
+    let lastActivityMs = 0;
     for (const entry of currentBlock) {
       inputTokens += entry.inputTokens;
       outputTokens += entry.outputTokens;
@@ -1011,11 +1042,14 @@ function aggregateSourceToBlocks(source, entries, humanTurns) {
           entry.reasoningTokens || 0
         );
       }
+      const entryMs = new Date(entry.timestamp).getTime();
+      if (Number.isFinite(entryMs) && entryMs > lastActivityMs) lastActivityMs = entryMs;
     }
     blocks.push({
       source,
       blockStart: blockStart.toISOString(),
       blockEnd: blockEnd.toISOString(),
+      lastActivityAt: new Date(lastActivityMs || blockEnd.getTime()).toISOString(),
       inputTokens,
       outputTokens,
       cacheCreationTokens,
@@ -2252,7 +2286,7 @@ async function hookCommand() {
 }
 
 // src/index.ts
-var VERSION = "0.3.8";
+var VERSION = "0.3.10";
 startUpdateCheck(VERSION);
 var program = new Command();
 if (process.argv.slice(2).includes("-v")) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccclub",
-  "version": "0.3.8",
+  "version": "0.3.10",
   "type": "module",
   "description": "Claude Code and Codex leaderboard among friends for coding agent tokens and costs",
   "bin": {