ccclub 0.3.13 → 0.3.15

package/dist/index.js

@@ -56,20 +56,17 @@ var PLAN_LABELS = {
   api: "API"
 };
 var MODEL_PRICING = {
-  // Claude Opus 4.5+
+  // Claude models. We track API-equivalent value, matching ccusage's calculated mode.
   "claude-opus-4-7": { input: 5, output: 25, cacheCreation: 6.25, cacheRead: 0.5 },
   "claude-opus-4-6": { input: 5, output: 25, cacheCreation: 6.25, cacheRead: 0.5 },
   "claude-opus-4-5": { input: 5, output: 25, cacheCreation: 6.25, cacheRead: 0.5 },
   "claude-opus-4-5-20251101": { input: 5, output: 25, cacheCreation: 6.25, cacheRead: 0.5 },
-  // Opus 4.0–4.1
   "claude-opus-4-1-20250805": { input: 15, output: 75, cacheCreation: 18.75, cacheRead: 1.5 },
-  // Sonnet
   "claude-sonnet-4-6": { input: 3, output: 15, cacheCreation: 3.75, cacheRead: 0.3 },
   "claude-sonnet-4-5": { input: 3, output: 15, cacheCreation: 3.75, cacheRead: 0.3 },
   "claude-sonnet-4-5-20250929": { input: 3, output: 15, cacheCreation: 3.75, cacheRead: 0.3 },
   "claude-sonnet-4-20250514": { input: 3, output: 15, cacheCreation: 3.75, cacheRead: 0.3 },
   "claude-3-5-sonnet-20241022": { input: 3, output: 15, cacheCreation: 3.75, cacheRead: 0.3 },
-  // Haiku
   "claude-haiku-4-5-20251001": { input: 1, output: 5, cacheCreation: 1.25, cacheRead: 0.1 },
   "claude-3-5-haiku-20241022": { input: 0.8, output: 4, cacheCreation: 1, cacheRead: 0.08 },
   // OpenAI GPT/Codex family.
@@ -79,7 +76,12 @@ var MODEL_PRICING = {
   "gpt-5.4-nano": { input: 0.2, output: 1.25, cacheCreation: 0, cacheRead: 0.02 },
   "gpt-5.3-codex": { input: 1.75, output: 14, cacheCreation: 0, cacheRead: 0.175 },
   "gpt-5.2-codex": { input: 1.75, output: 14, cacheCreation: 0, cacheRead: 0.175 },
+  "gpt-5.1-codex": { input: 1.25, output: 10, cacheCreation: 0, cacheRead: 0.125 },
+  "gpt-5.1-codex-max": { input: 1.25, output: 10, cacheCreation: 0, cacheRead: 0.125 },
+  "gpt-5.1-codex-mini": { input: 0.25, output: 2, cacheCreation: 0, cacheRead: 0.025 },
   "gpt-5-codex": { input: 1.25, output: 10, cacheCreation: 0, cacheRead: 0.125 },
+  "codex-mini-latest": { input: 1.5, output: 6, cacheCreation: 0, cacheRead: 0.375 },
+  "codex-auto-review": { input: 0, output: 0, cacheCreation: 0, cacheRead: 0 },
   "gpt-5": { input: 1.25, output: 10, cacheCreation: 0, cacheRead: 0.125 },
   "gpt-5-mini": { input: 0.25, output: 2, cacheCreation: 0, cacheRead: 0.025 },
   "gpt-5-nano": { input: 0.05, output: 0.4, cacheCreation: 0, cacheRead: 5e-3 }
@@ -94,7 +96,12 @@ var FAMILY_FALLBACK = {
   "gpt-5.4": MODEL_PRICING["gpt-5.4"],
   "gpt-5.3-codex": MODEL_PRICING["gpt-5.3-codex"],
   "gpt-5.2-codex": MODEL_PRICING["gpt-5.2-codex"],
+  "gpt-5.1-codex-mini": MODEL_PRICING["gpt-5.1-codex-mini"],
+  "gpt-5.1-codex-max": MODEL_PRICING["gpt-5.1-codex-max"],
+  "gpt-5.1-codex": MODEL_PRICING["gpt-5.1-codex"],
   "gpt-5-codex": MODEL_PRICING["gpt-5-codex"],
+  "codex-mini-latest": MODEL_PRICING["codex-mini-latest"],
+  "codex-auto-review": MODEL_PRICING["codex-auto-review"],
   "gpt-5-nano": MODEL_PRICING["gpt-5-nano"],
   "gpt-5-mini": MODEL_PRICING["gpt-5-mini"],
   "gpt-5": MODEL_PRICING["gpt-5"],
@@ -336,7 +343,7 @@ function isHeartbeatInstalled() {
 }
 
 // src/commands/sync.ts
-import { readFile as readFile4, writeFile as writeFile4 } from "fs/promises";
+import { readFile as readFile5, writeFile as writeFile4 } from "fs/promises";
 import { existsSync as existsSync4, readFileSync as readFileSync4, writeFileSync as writeFileSync2 } from "fs";
 import { join as join11 } from "path";
 import { homedir as homedir11 } from "os";
@@ -544,7 +551,7 @@ async function collectClaudeUsage() {
   const files = await globFiles(projectDirs, "**/*.jsonl");
   const entries = [];
   const turns = [];
-  const seen = /* @__PURE__ */ new Set();
+  const entryIndexByDedupeKey = /* @__PURE__ */ new Map();
   const seenTurns = /* @__PURE__ */ new Set();
   for (const file of files) {
     await readJsonlFile(file, (value) => {
@@ -565,7 +572,8 @@ async function collectClaudeUsage() {
       const usage = value.message.usage;
       const sessionId = value.sessionId || "";
       const requestId = asString(value.requestId);
-      const dedupeKey = requestId ? `${source}:${sessionId}:${requestId}` : [
+      const messageId = asString(value.message.id);
+      const dedupeKey = messageId ? requestId ? `${messageId}:${requestId}` : messageId : [
         source,
         sessionId,
         timestamp,
@@ -574,15 +582,13 @@ async function collectClaudeUsage() {
         usage.cache_creation_input_tokens ?? 0,
         usage.cache_read_input_tokens ?? 0
       ].join(":");
-      if (seen.has(dedupeKey)) return;
-      seen.add(dedupeKey);
       const inputTokens = usage.input_tokens || 0;
       const outputTokens = usage.output_tokens || 0;
       const cacheCreationTokens = usage.cache_creation_input_tokens || 0;
       const cacheReadTokens = usage.cache_read_input_tokens || 0;
       const model = value.message.model || "unknown";
       const costUSD = value.costUSD && value.costUSD > 0 ? value.costUSD : calculateCost(model, inputTokens, outputTokens, cacheCreationTokens, cacheReadTokens);
-      entries.push({
+      const entry = {
         source,
         timestamp,
         sessionId,
@@ -594,7 +600,16 @@ async function collectClaudeUsage() {
         cacheReadTokens,
         totalTokens: inputTokens + outputTokens + cacheCreationTokens + cacheReadTokens,
         costUSD
-      });
+      };
+      const existingIndex = entryIndexByDedupeKey.get(dedupeKey);
+      if (existingIndex != null) {
+        if (entry.totalTokens > entries[existingIndex].totalTokens) {
+          entries[existingIndex] = entry;
+        }
+        return;
+      }
+      entryIndexByDedupeKey.set(dedupeKey, entries.length);
+      entries.push(entry);
     });
   }
   return { source, entries, turns, files: files.length, warnings: [] };
@@ -606,12 +621,28 @@ var claudeCollector = {
 };
 
 // src/sources/codex.ts
+import { readFile as readFile4 } from "fs/promises";
 import { join as join7, relative, sep } from "path";
 import { homedir as homedir7 } from "os";
+var CODEX_FAST_COST_MULTIPLIER = 2;
+var codexFastServiceTierRegex = /(?:^|\n)\s*service_tier\s*=\s*["']?(?:fast|priority)["']?/iu;
+function getCodexHomes() {
+  return parsePathList(process.env[CODEX_HOME_ENV], [join7(homedir7(), DEFAULT_CODEX_DIR)]);
+}
 function getCodexSessionDirs() {
-  const homes = parsePathList(process.env[CODEX_HOME_ENV], [join7(homedir7(), DEFAULT_CODEX_DIR)]);
+  const homes = getCodexHomes();
   return existingDirectories(homes.map((home) => join7(home, "sessions")));
 }
+async function getCodexCostMultiplier() {
+  for (const home of getCodexHomes()) {
+    try {
+      const config = await readFile4(join7(home, "config.toml"), "utf8");
+      if (codexFastServiceTierRegex.test(config)) return CODEX_FAST_COST_MULTIPLIER;
+    } catch {
+    }
+  }
+  return 1;
+}
 function normalizeRawUsage(value) {
   const record = asRecord(value);
   if (record == null) return null;
@@ -619,7 +650,7 @@ function normalizeRawUsage(value) {
   const cachedInputTokens = asNumber(record.cached_input_tokens ?? record.cache_read_input_tokens);
   const outputTokens = asNumber(record.output_tokens);
   const reasoningTokens = asNumber(record.reasoning_output_tokens);
-  const fallbackTotal = inputTokens + outputTokens;
+  const fallbackTotal = inputTokens + outputTokens + reasoningTokens;
   const totalTokens = asNumber(record.total_tokens) || fallbackTotal;
   return { inputTokens, cachedInputTokens, outputTokens, reasoningTokens, totalTokens };
 }
@@ -643,7 +674,10 @@ function sessionIdForFile(sessionDir, file) {
 }
 async function collectCodexUsage() {
   const source = "codex";
-  const sessionDirs = await getCodexSessionDirs();
+  const [sessionDirs, costMultiplier] = await Promise.all([
+    getCodexSessionDirs(),
+    getCodexCostMultiplier()
+  ]);
   const files = await globFiles(sessionDirs, "**/*.jsonl");
   const entries = [];
   const turns = [];
@@ -733,7 +767,7 @@ async function collectCodexUsage() {
           cacheReadTokens,
           reasoningTokens: 0,
           totalTokens,
-          costUSD: calculateCost(model, inputTokens, rawUsage.outputTokens, 0, cacheReadTokens)
+          costUSD: calculateCost(model, inputTokens, rawUsage.outputTokens, 0, cacheReadTokens) * costMultiplier
         });
       });
       if (!sawTaskStarted) {
@@ -1336,12 +1370,12 @@ async function doSync(firstSync = false, silent = false) {
     const lastSyncPath = getLastSyncPath();
     let lastSync = null;
     if (existsSync4(lastSyncPath)) {
-      lastSync = (await readFile4(lastSyncPath, "utf-8")).trim() || null;
+      lastSync = (await readFile5(lastSyncPath, "utf-8")).trim() || null;
     }
     let lastSyncBySource = {};
     if (existsSync4(getLastSyncBySourcePath())) {
       try {
-        lastSyncBySource = JSON.parse(await readFile4(getLastSyncBySourcePath(), "utf-8"));
+        lastSyncBySource = JSON.parse(await readFile5(getLastSyncBySourcePath(), "utf-8"));
       } catch {
         lastSyncBySource = {};
       }
@@ -1675,6 +1709,7 @@ async function getUpdateResult() {
 
 // src/commands/rank.ts
 var ACTIVE_THRESHOLD_MS = 15 * 60 * 1e3;
+var AGENT_ORDER = ["claude", "codex", "opencode", "amp", "pi"];
 async function rankCommand(options) {
   const config = await requireConfig();
   if (!isHookInstalled()) await installHook();
@@ -1811,10 +1846,12 @@ 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) => isEntryActive(r, now)).length;
+  const activeEntries = data.rankings.filter((r) => isEntryActive(r, now));
+  const activeCount = activeEntries.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`));
+    const activeSplit = formatActiveSourceSplit(activeEntries);
+    console.log(theme.success(`  ${activeCount} active`) + (activeSplit ? ` ${activeSplit}` : ""));
   }
   console.log("");
   const activeRankings = showAll || data.rankings.length <= 15 ? data.rankings : data.rankings.filter((r) => r.costUSD > 0 || r.userId === config.userId);
@@ -1911,6 +1948,34 @@ function isEntryActive(entry, now) {
   const activeAt = new Date(value).getTime();
   return Number.isFinite(activeAt) && now - activeAt < ACTIVE_THRESHOLD_MS;
 }
+function activeSourceForEntry(entry) {
+  return entry.lastActiveSource ?? entry.agents?.[0];
+}
+function formatActiveSourceSplit(entries) {
+  const counts = /* @__PURE__ */ new Map();
+  for (const entry of entries) {
+    const source = activeSourceForEntry(entry);
+    if (!source) continue;
+    counts.set(source, (counts.get(source) ?? 0) + 1);
+  }
+  const sources = AGENT_ORDER.filter((source) => (counts.get(source) ?? 0) > 0);
+  if (sources.length === 0) return "";
+  if (sources.length === 2 && sources.includes("claude") && sources.includes("codex")) {
+    return [
+      theme.muted("Claude"),
+      theme.successBold(String(counts.get("claude") ?? 0)) + theme.faint(":"),
+      theme.successBold(String(counts.get("codex") ?? 0)),
+      theme.muted("Codex")
+    ].join(" ");
+  }
+  return sources.map((source) => formatActiveSourceScore(source, counts.get(source) ?? 0, false)).join(theme.faint(" \xB7 "));
+}
+function formatActiveSourceScore(source, count, countFirst) {
+  const icon = source === "claude" ? theme.gold("\u25CF") : source === "codex" ? theme.linkText("\u25CF") : theme.success("\u25CF");
+  const label = source === "claude" ? "Claude" : formatAgentLabel(source);
+  const coloredCount = theme.successBold(String(count));
+  return countFirst ? `${coloredCount} ${icon} ${theme.muted(label)}` : `${icon} ${theme.muted(label)} ${coloredCount}`;
+}
 function podiumStyle(rank) {
   if (rank === 1) return theme.gold;
   if (rank === 2) return theme.silver;
@@ -2323,7 +2388,7 @@ async function hookCommand() {
 }
 
 // src/index.ts
-var VERSION = "0.3.13";
+var VERSION = "0.3.15";
 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.13",
+  "version": "0.3.15",
   "type": "module",
   "description": "Claude Code and Codex leaderboard among friends for coding agent tokens and costs",
   "bin": {