ccclub 0.3.9 → 0.3.11

package/dist/index.js

@@ -241,7 +241,7 @@ function isHookInstalled() {
 import { writeFile as writeFile3, mkdir as mkdir3 } from "fs/promises";
 import { join as join3 } from "path";
 import { homedir as homedir3 } from "os";
-import { existsSync as existsSync3 } from "fs";
+import { existsSync as existsSync3, readFileSync as readFileSync2 } from "fs";
 import { execFile } from "child_process";
 var PLIST_NAME = "dev.ccclub.sync";
 var LAUNCH_AGENTS_DIR = join3(homedir3(), "Library", "LaunchAgents");
@@ -278,32 +278,49 @@ function getPlist() {
 </dict>
 </plist>`;
 }
+function isCurrentPlist() {
+  if (!existsSync3(PLIST_PATH)) return false;
+  try {
+    return readFileSync2(PLIST_PATH, "utf-8") === getPlist();
+  } catch {
+    return false;
+  }
+}
+async function launchctl(args) {
+  await new Promise((resolve2, reject) => {
+    execFile("launchctl", args, (err) => err ? reject(err) : resolve2());
+  });
+}
 async function installHeartbeat() {
   if (process.platform !== "darwin") {
     return false;
   }
-  if (existsSync3(PLIST_PATH)) {
+  if (isCurrentPlist()) {
     return true;
   }
   if (!existsSync3(LAUNCH_AGENTS_DIR)) {
     await mkdir3(LAUNCH_AGENTS_DIR, { recursive: true });
   }
+  if (existsSync3(PLIST_PATH)) {
+    try {
+      await launchctl(["unload", PLIST_PATH]);
+    } catch {
+    }
+  }
   await writeFile3(PLIST_PATH, getPlist());
   try {
-    await new Promise((resolve2, reject) => {
-      execFile("launchctl", ["load", PLIST_PATH], (err) => err ? reject(err) : resolve2());
-    });
+    await launchctl(["load", PLIST_PATH]);
   } catch {
   }
   return true;
 }
 function isHeartbeatInstalled() {
-  return existsSync3(PLIST_PATH);
+  return isCurrentPlist();
 }
 
 // src/commands/sync.ts
 import { readFile as readFile4, writeFile as writeFile4 } from "fs/promises";
-import { existsSync as existsSync4, readFileSync as readFileSync3, writeFileSync as writeFileSync2 } from "fs";
+import { existsSync as existsSync4, readFileSync as readFileSync4, writeFileSync as writeFileSync2 } from "fs";
 import { join as join11 } from "path";
 import { homedir as homedir11 } from "os";
 import chalk2 from "chalk";
@@ -614,12 +631,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 +655,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 +718,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: [] };
@@ -1106,7 +1153,7 @@ import { execSync as execSync2, exec } from "child_process";
 import { promisify } from "util";
 import { userInfo as userInfo2, homedir as homedir10 } from "os";
 import { join as join10 } from "path";
-import { readFileSync as readFileSync2, writeFileSync } from "fs";
+import { readFileSync as readFileSync3, writeFileSync } from "fs";
 var execAsync = promisify(exec);
 var debug = (...args) => {
   if (process.env.CCCLUB_DEBUG) console.error("[usage-debug]", ...args);
@@ -1115,7 +1162,7 @@ var CACHE_TTL_MS = 5 * 60 * 1e3;
 var CACHE_PATH = join10(homedir10(), CCCLUB_CONFIG_DIR, "usage-cache.json");
 function readCache(allowStale = false) {
   try {
-    const raw = readFileSync2(CACHE_PATH, "utf-8");
+    const raw = readFileSync3(CACHE_PATH, "utf-8");
     const { snapshot, fetchedAt } = JSON.parse(raw);
     if (allowStale || Date.now() - fetchedAt < CACHE_TTL_MS) return snapshot;
   } catch {
@@ -1186,7 +1233,7 @@ async function fetchUsageLimits() {
     debug("caught error:", err instanceof Error ? err.message : String(err));
   }
   try {
-    const tmp = JSON.parse(readFileSync2("/tmp/sl-claude-usage", "utf-8"));
+    const tmp = JSON.parse(readFileSync3("/tmp/sl-claude-usage", "utf-8"));
     if (typeof tmp.fiveHour === "number" && typeof tmp.sevenDay === "number") {
       const result = { fiveHour: tmp.fiveHour, sevenDay: tmp.sevenDay, snapshotAt: (/* @__PURE__ */ new Date()).toISOString() };
       debug("returning cc-costline cache fallback:", result.fiveHour, result.sevenDay);
@@ -1212,7 +1259,7 @@ function needsFullSync() {
   const path = getSyncVersionPath();
   if (!existsSync4(path)) return true;
   try {
-    const stored = readFileSync3(path, "utf-8").trim();
+    const stored = readFileSync4(path, "utf-8").trim();
     return stored !== SYNC_FORMAT_VERSION;
   } catch {
     return true;
@@ -1224,7 +1271,7 @@ async function syncCommand(options) {
   if (options.silent && !options.full) {
     if (existsSync4(timePath)) {
       try {
-        const ts = parseInt(readFileSync3(timePath, "utf-8").trim(), 10);
+        const ts = parseInt(readFileSync4(timePath, "utf-8").trim(), 10);
         if (Date.now() - ts < THROTTLE_MS) return;
       } catch {
       }
@@ -1569,7 +1616,7 @@ import Table from "cli-table3";
 import ora4 from "ora";
 
 // src/update-check.ts
-import { readFileSync as readFileSync4, writeFileSync as writeFileSync3, existsSync as existsSync5 } from "fs";
+import { readFileSync as readFileSync5, writeFileSync as writeFileSync3, existsSync as existsSync5 } from "fs";
 import { join as join12 } from "path";
 import { homedir as homedir12 } from "os";
 var CHECK_INTERVAL_MS = 12 * 60 * 60 * 1e3;
@@ -1579,7 +1626,7 @@ function startUpdateCheck(currentVersion) {
   if (process.argv.includes("--silent") || process.argv.includes("-s")) return;
   try {
     if (existsSync5(CHECK_FILE)) {
-      const ts = parseInt(readFileSync4(CHECK_FILE, "utf-8").trim(), 10);
+      const ts = parseInt(readFileSync5(CHECK_FILE, "utf-8").trim(), 10);
       if (Date.now() - ts < CHECK_INTERVAL_MS) return;
     }
   } catch {
@@ -1747,7 +1794,7 @@ function printGroup(data, code, period, config, showCache = false, showAll = fal
   ${data.group.name}`));
   const periodLabel = { daily: "TODAY", yesterday: "YESTERDAY", weekly: "7 DAYS", monthly: "30 DAYS", "all-time": "ALL TIME" };
   const now = Date.now();
-  const activeCount = data.rankings.filter((r) => r.lastSync && now - new Date(r.lastSync).getTime() < ACTIVE_THRESHOLD_MS).length;
+  const activeCount = data.rankings.filter((r) => isEntryActive(r, now)).length;
   console.log(theme.muted(`  ${periodLabel[period] || period.toUpperCase()} \xB7 ${data.start.slice(0, 10)} \u2192 ${data.end.slice(0, 10)} \xB7 ${data.group.memberCount} members`));
   if (activeCount > 0) {
     console.log(theme.success(`  ${activeCount} active`));
@@ -1842,7 +1889,10 @@ function printGroup(data, code, period, config, showCache = false, showAll = fal
   }
 }
 function isEntryActive(entry, now) {
-  return Boolean(entry.lastSync && now - new Date(entry.lastSync).getTime() < ACTIVE_THRESHOLD_MS);
+  const value = entry.lastActiveAt || entry.lastSync;
+  if (!value) return false;
+  const activeAt = new Date(value).getTime();
+  return Number.isFinite(activeAt) && now - activeAt < ACTIVE_THRESHOLD_MS;
 }
 function podiumStyle(rank) {
   if (rank === 1) return theme.gold;
@@ -2256,7 +2306,7 @@ async function hookCommand() {
 }
 
 // src/index.ts
-var VERSION = "0.3.9";
+var VERSION = "0.3.11";
 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.9",
+  "version": "0.3.11",
   "type": "module",
   "description": "Claude Code and Codex leaderboard among friends for coding agent tokens and costs",
   "bin": {