ccclub 0.2.2 → 0.2.3

package/dist/index.js

@@ -175,10 +175,12 @@ async function collectUsageEntries() {
   const projectsDir = join3(homedir3(), CLAUDE_PROJECTS_DIR);
   const files = await glob("**/*.jsonl", { cwd: projectsDir, absolute: true });
   if (files.length === 0) {
-    return [];
+    return { entries: [], humanTurns: [] };
   }
   const entries = [];
+  const humanTurns = [];
   const seen = /* @__PURE__ */ new Set();
+  const seenHuman = /* @__PURE__ */ new Set();
   for (const file of files) {
     const content = await readFile3(file, "utf-8");
     const lines = content.split("\n").filter((l) => l.trim());
@@ -189,6 +191,14 @@ async function collectUsageEntries() {
       } catch {
         continue;
       }
+      if (parsed.type === "human" && parsed.timestamp) {
+        const humanKey = `${parsed.sessionId || ""}:${parsed.timestamp}`;
+        if (!seenHuman.has(humanKey)) {
+          seenHuman.add(humanKey);
+          humanTurns.push(parsed.timestamp);
+        }
+        continue;
+      }
       if (parsed.type !== "assistant" || !parsed.message?.usage) {
         continue;
       }
@@ -217,7 +227,8 @@ async function collectUsageEntries() {
     }
   }
   entries.sort((a, b) => new Date(a.timestamp).getTime() - new Date(b.timestamp).getTime());
-  return entries;
+  humanTurns.sort();
+  return { entries, humanTurns };
 }
 
 // src/aggregator.ts
@@ -226,12 +237,26 @@ function floorToHour(date) {
   floored.setUTCMinutes(0, 0, 0);
   return floored;
 }
-function aggregateToBlocks(entries) {
+function aggregateToBlocks(entries, humanTurns = []) {
   if (entries.length === 0) return [];
+  const humanTurnMs = humanTurns.map((t) => new Date(t).getTime());
   const blocks = [];
   let blockStart = floorToHour(new Date(entries[0].timestamp));
   let blockEnd = new Date(blockStart.getTime() + BLOCK_DURATION_MS);
   let currentBlock = [];
+  let humanIdx = 0;
+  function countHumanTurns() {
+    const startMs = blockStart.getTime();
+    const endMs = blockEnd.getTime();
+    let count = 0;
+    while (humanIdx < humanTurnMs.length && humanTurnMs[humanIdx] < startMs) humanIdx++;
+    let i = humanIdx;
+    while (i < humanTurnMs.length && humanTurnMs[i] < endMs) {
+      count++;
+      i++;
+    }
+    return count;
+  }
   function flushBlock() {
     if (currentBlock.length === 0) return;
     const models = /* @__PURE__ */ new Set();
@@ -270,7 +295,8 @@ function aggregateToBlocks(entries) {
       totalTokens,
       costUSD: Math.round(costUSD * 1e4) / 1e4,
       models: Array.from(models),
-      entryCount: currentBlock.length
+      entryCount: currentBlock.length,
+      chatCount: countHumanTurns()
     });
   }
   for (const entry of entries) {
@@ -297,13 +323,13 @@ async function doSync(firstSync = false, silent = false) {
   } : console.log;
   const spinner = silent ? null : ora("Collecting usage data...").start();
   try {
-    const entries = await collectUsageEntries();
+    const { entries, humanTurns } = await collectUsageEntries();
     if (spinner) spinner.text = `Found ${entries.length} entries`;
     if (entries.length === 0) {
       if (spinner) spinner.warn("No usage data found in ~/.claude/projects/");
       return;
     }
-    const allBlocks = aggregateToBlocks(entries);
+    const allBlocks = aggregateToBlocks(entries, humanTurns);
     const lastSyncPath = getLastSyncPath();
     let lastSync = null;
     if (existsSync3(lastSyncPath)) {
@@ -559,7 +585,7 @@ function printGroup(data, code, period, config) {
   console.log(chalk4.dim(`  ${period.toUpperCase()} \xB7 ${data.start.slice(0, 10)} \u2192 ${data.end.slice(0, 10)} \xB7 ${data.group.memberCount} members
 `));
   const table = new Table({
-    head: ["#", "Name", "Tokens", "Cost", "Calls"].map((h) => chalk4.cyan(h)),
+    head: ["#", "Name", "Tokens", "Cost", "Chats"].map((h) => chalk4.cyan(h)),
     style: { head: [], border: [] },
     colWidths: [5, 20, 16, 12, 8]
   });
@@ -573,7 +599,7 @@ function printGroup(data, code, period, config) {
       name,
       entry.totalTokens.toLocaleString(),
       `$${entry.costUSD.toFixed(2)}`,
-      String(entry.entryCount)
+      String(entry.chatCount || entry.entryCount)
     ]);
   }
   console.log(table.toString());
@@ -649,8 +675,8 @@ async function showDataCommand() {
   console.log(chalk6.bold("\n  What CCClub uploads:\n"));
   console.log(chalk6.dim("  Only aggregated 5-hour block summaries. No conversation content,"));
   console.log(chalk6.dim("  no file paths, no project names, no session details.\n"));
-  const entries = await collectUsageEntries();
-  const blocks = aggregateToBlocks(entries);
+  const { entries, humanTurns } = await collectUsageEntries();
+  const blocks = aggregateToBlocks(entries, humanTurns);
   if (blocks.length === 0) {
     console.log(chalk6.yellow("  No usage data found in ~/.claude/projects/"));
     return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccclub",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "type": "module",
   "description": "See how much Claude Code you and your friends are using",
   "bin": {