ccgather 2.0.32 → 2.0.34

package/dist/index.js

@@ -253,7 +253,7 @@ var init_ui = __esm({
     "use strict";
     import_chalk = __toESM(require("chalk"));
     import_string_width = __toESM(require("string-width"));
-    VERSION = true ? "2.0.32" : "0.0.0";
+    VERSION = true ? "2.0.33" : "0.0.0";
     colors = {
       primary: import_chalk.default.hex("#DA7756"),
       // Claude coral
@@ -489,19 +489,45 @@ var import_ora2 = __toESM(require("ora"));
 var import_inquirer2 = __toESM(require("inquirer"));
 init_config();
 
-// src/lib/ccgather-json.ts
-var fs2 = __toESM(require("fs"));
-var path2 = __toESM(require("path"));
-var os2 = __toESM(require("os"));
+// src/lib/device.ts
+var os = __toESM(require("os"));
 var crypto = __toESM(require("crypto"));
+init_config();
+var DEVICE_ID_LENGTH = 16;
+function getDeviceId() {
+  try {
+    const config = getConfig();
+    const existing = config.get("deviceId");
+    if (existing) {
+      return existing;
+    }
+    const salt = crypto.randomBytes(8).toString("hex");
+    const raw = `${os.hostname() || "unknown"}:${os.homedir()}:${os.platform()}:${os.arch()}:${salt}`;
+    const deviceId = crypto.createHash("sha256").update(raw).digest("hex").slice(0, DEVICE_ID_LENGTH);
+    try {
+      config.set("deviceId", deviceId);
+    } catch {
+    }
+    return deviceId;
+  } catch {
+    const raw = `${os.hostname() || "unknown"}:${os.homedir()}:${os.platform()}:${os.arch()}`;
+    return crypto.createHash("sha256").update(raw).digest("hex").slice(0, DEVICE_ID_LENGTH);
+  }
+}
+
+// src/lib/ccgather-json.ts
+var fs3 = __toESM(require("fs"));
+var path3 = __toESM(require("path"));
+var os4 = __toESM(require("os"));
+var crypto2 = __toESM(require("crypto"));
 
 // src/lib/credentials.ts
 var fs = __toESM(require("fs"));
 var path = __toESM(require("path"));
-var os = __toESM(require("os"));
+var os2 = __toESM(require("os"));
 var import_child_process = require("child_process");
 function getCredentialsPath() {
-  return path.join(os.homedir(), ".claude", ".credentials.json");
+  return path.join(os2.homedir(), ".claude", ".credentials.json");
 }
 function readFromMacKeychain() {
   try {
@@ -616,6 +642,154 @@ function readCredentials() {
   };
 }
 
+// src/lib/pricing.ts
+var fs2 = __toESM(require("fs"));
+var path2 = __toESM(require("path"));
+var os3 = __toESM(require("os"));
+var LITELLM_PRICING_URL = "https://raw.githubusercontent.com/BerriAI/litellm/main/model_prices_and_context_window.json";
+var CACHE_TTL_MS = 24 * 60 * 60 * 1e3;
+var FETCH_TIMEOUT_MS = 5e3;
+var FALLBACK_PRICING = {
+  "opus-4": { input: 5, output: 25, cacheWrite: 6.25, cacheRead: 0.5 },
+  "sonnet-4": { input: 3, output: 15, cacheWrite: 3.75, cacheRead: 0.3 },
+  haiku: { input: 1, output: 5, cacheWrite: 1.25, cacheRead: 0.1 },
+  default: { input: 3, output: 15, cacheWrite: 3.75, cacheRead: 0.3 }
+};
+var pricingData = null;
+function getCacheFilePath() {
+  const configDir = process.platform === "win32" ? path2.join(
+    process.env.APPDATA || path2.join(os3.homedir(), "AppData", "Roaming"),
+    "ccgather-nodejs"
+  ) : path2.join(os3.homedir(), ".config", "ccgather-nodejs");
+  return path2.join(configDir, "pricing-cache.json");
+}
+function loadCache() {
+  try {
+    const cachePath = getCacheFilePath();
+    if (!fs2.existsSync(cachePath)) return null;
+    const raw = fs2.readFileSync(cachePath, "utf-8");
+    const cache = JSON.parse(raw);
+    if (Date.now() - cache.fetchedAt > CACHE_TTL_MS) return null;
+    if (!cache.models || Object.keys(cache.models).length === 0) return null;
+    return cache;
+  } catch {
+    return null;
+  }
+}
+function saveCache(models) {
+  try {
+    const cachePath = getCacheFilePath();
+    const cacheDir = path2.dirname(cachePath);
+    if (!fs2.existsSync(cacheDir)) {
+      fs2.mkdirSync(cacheDir, { recursive: true });
+    }
+    const cache = {
+      fetchedAt: Date.now(),
+      models
+    };
+    fs2.writeFileSync(cachePath, JSON.stringify(cache), "utf-8");
+  } catch {
+  }
+}
+function extractClaudePricing(rawData) {
+  const result = {};
+  for (const [key, value] of Object.entries(rawData)) {
+    if (!key.startsWith("claude-")) continue;
+    const inputCostPerToken = value.input_cost_per_token;
+    const outputCostPerToken = value.output_cost_per_token;
+    if (inputCostPerToken == null || outputCostPerToken == null) continue;
+    const input = inputCostPerToken * 1e6;
+    const output = outputCostPerToken * 1e6;
+    const cacheWritePerToken = value.cache_creation_input_token_cost;
+    const cacheReadPerToken = value.cache_read_input_token_cost;
+    const cacheWrite = cacheWritePerToken != null ? cacheWritePerToken * 1e6 : input * 1.25;
+    const cacheRead = cacheReadPerToken != null ? cacheReadPerToken * 1e6 : input * 0.1;
+    const pricing = {
+      input: Math.round(input * 1e3) / 1e3,
+      output: Math.round(output * 1e3) / 1e3,
+      cacheWrite: Math.round(cacheWrite * 1e3) / 1e3,
+      cacheRead: Math.round(cacheRead * 1e3) / 1e3
+    };
+    result[key] = pricing;
+    const withoutDate = key.replace(/-\d{8}$/, "");
+    if (withoutDate !== key && !result[withoutDate]) {
+      result[withoutDate] = pricing;
+    }
+    const withoutVersion = key.replace(/-v\d+:\d+$/, "").replace(/-\d{8}$/, "");
+    if (withoutVersion !== key && withoutVersion !== withoutDate && !result[withoutVersion]) {
+      result[withoutVersion] = pricing;
+    }
+  }
+  return result;
+}
+async function initPricing() {
+  if (pricingData) return;
+  const cached = loadCache();
+  if (cached) {
+    pricingData = cached.models;
+    return;
+  }
+  try {
+    const controller = new AbortController();
+    const timeout = setTimeout(() => controller.abort(), FETCH_TIMEOUT_MS);
+    const response = await fetch(LITELLM_PRICING_URL, {
+      signal: controller.signal
+    });
+    clearTimeout(timeout);
+    if (response.ok) {
+      const rawData = await response.json();
+      const extracted = extractClaudePricing(rawData);
+      if (Object.keys(extracted).length > 0) {
+        pricingData = extracted;
+        saveCache(extracted);
+        return;
+      }
+    }
+  } catch {
+  }
+  pricingData = null;
+}
+function matchModel(model) {
+  if (pricingData) {
+    if (pricingData[model]) {
+      return pricingData[model];
+    }
+    const withoutDate = model.replace(/-\d{8}$/, "");
+    if (pricingData[withoutDate]) {
+      return pricingData[withoutDate];
+    }
+    const withoutVersion = model.replace(/-v\d+:\d+$/, "").replace(/-\d{8}$/, "");
+    if (pricingData[withoutVersion]) {
+      return pricingData[withoutVersion];
+    }
+    const modelLower2 = model.toLowerCase();
+    let bestMatch = null;
+    for (const [key, pricing] of Object.entries(pricingData)) {
+      if (modelLower2.startsWith(key.toLowerCase()) || key.toLowerCase().startsWith(modelLower2.replace(/-\d{8}$/, ""))) {
+        if (!bestMatch || key.length > bestMatch.key.length) {
+          bestMatch = { key, pricing };
+        }
+      }
+    }
+    if (bestMatch) {
+      return bestMatch.pricing;
+    }
+  }
+  const modelLower = model.toLowerCase();
+  if (modelLower.includes("opus")) return FALLBACK_PRICING["opus-4"];
+  if (modelLower.includes("haiku")) return FALLBACK_PRICING["haiku"];
+  if (modelLower.includes("sonnet")) return FALLBACK_PRICING["sonnet-4"];
+  return FALLBACK_PRICING["default"];
+}
+function estimateCost(model, inputTokens, outputTokens, cacheWriteTokens = 0, cacheReadTokens = 0) {
+  const price = matchModel(model);
+  const inputCost = inputTokens / 1e6 * price.input;
+  const outputCost = outputTokens / 1e6 * price.output;
+  const cacheWriteCost = cacheWriteTokens / 1e6 * price.cacheWrite;
+  const cacheReadCost = cacheReadTokens / 1e6 * price.cacheRead;
+  return Math.round((inputCost + outputCost + cacheWriteCost + cacheReadCost) * 100) / 100;
+}
+
 // src/lib/ccgather-json.ts
 function hasOpusUsageInProject(dailyUsage) {
   const opusModels = /* @__PURE__ */ new Set();
@@ -652,26 +826,26 @@ function extractProjectName(filePath) {
 }
 function getClaudeProjectsDirs() {
   const dirs = [];
-  const home = os2.homedir();
+  const home = os4.homedir();
   const configDir = process.env.CLAUDE_CONFIG_DIR;
   if (configDir) {
-    const envPath = path2.join(configDir, "projects");
+    const envPath = path3.join(configDir, "projects");
     dirs.push(envPath);
   }
   if (process.platform === "win32") {
     const appData = process.env.APPDATA;
     if (appData) {
-      const appDataPath = path2.join(appData, "claude", "projects");
+      const appDataPath = path3.join(appData, "claude", "projects");
       dirs.push(appDataPath);
     }
   }
-  const xdgPath = path2.join(home, ".config", "claude", "projects");
+  const xdgPath = path3.join(home, ".config", "claude", "projects");
   dirs.push(xdgPath);
-  const legacyPath = path2.join(home, ".claude", "projects");
+  const legacyPath = path3.join(home, ".claude", "projects");
   dirs.push(legacyPath);
   const uniqueDirs = [...new Set(dirs)];
   const existingDirs = uniqueDirs.filter((dir) => {
-    return fs2.existsSync(dir);
+    return fs3.existsSync(dir);
   });
   return existingDirs;
 }
@@ -690,9 +864,9 @@ function encodePathLikeClaude(inputPath) {
 function findJsonlFiles(dir) {
   const files = [];
   try {
-    const entries = fs2.readdirSync(dir, { withFileTypes: true });
+    const entries = fs3.readdirSync(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = path2.join(dir, entry.name);
+      const fullPath = path3.join(dir, entry.name);
       if (entry.isDirectory()) {
         files.push(...findJsonlFiles(fullPath));
       } else if (entry.name.endsWith(".jsonl")) {
@@ -703,34 +877,13 @@ function findJsonlFiles(dir) {
   }
   return files;
 }
-function estimateCost(model, inputTokens, outputTokens, cacheWriteTokens = 0, cacheReadTokens = 0) {
-  const pricing = {
-    "claude-opus-4": { input: 15, output: 75, cacheWrite: 18.75, cacheRead: 1.5 },
-    "claude-sonnet-4": { input: 3, output: 15, cacheWrite: 3.75, cacheRead: 0.3 },
-    "claude-haiku": { input: 0.25, output: 1.25, cacheWrite: 0.3125, cacheRead: 0.025 },
-    default: { input: 3, output: 15, cacheWrite: 3.75, cacheRead: 0.3 }
-  };
-  let modelKey = "default";
-  for (const key of Object.keys(pricing)) {
-    if (model.includes(key.replace("claude-", ""))) {
-      modelKey = key;
-      break;
-    }
-  }
-  const price = pricing[modelKey];
-  const inputCost = inputTokens / 1e6 * price.input;
-  const outputCost = outputTokens / 1e6 * price.output;
-  const cacheWriteCost = cacheWriteTokens / 1e6 * price.cacheWrite;
-  const cacheReadCost = cacheReadTokens / 1e6 * price.cacheRead;
-  return Math.round((inputCost + outputCost + cacheWriteCost + cacheReadCost) * 100) / 100;
-}
 function generateSessionHash(filePath, maxLines = 50) {
   try {
-    const content = fs2.readFileSync(filePath, "utf-8");
+    const content = fs3.readFileSync(filePath, "utf-8");
     const lines = content.split("\n").slice(0, maxLines).join("\n");
-    const fileName = path2.basename(filePath);
+    const fileName = path3.basename(filePath);
     const hashInput = `${fileName}:${lines}`;
-    return crypto.createHash("sha256").update(hashInput).digest("hex");
+    return crypto2.createHash("sha256").update(hashInput).digest("hex");
   } catch {
     return null;
   }
@@ -744,7 +897,7 @@ function generateSessionFingerprint(sessionFiles) {
     }
   }
   sessionHashes.sort();
-  const combinedHash = crypto.createHash("sha256").update(sessionHashes.join(":")).digest("hex");
+  const combinedHash = crypto2.createHash("sha256").update(sessionHashes.join(":")).digest("hex");
   return {
     sessionHashes,
     combinedHash,
@@ -752,30 +905,30 @@ function generateSessionFingerprint(sessionFiles) {
   };
 }
 function getSessionPathDebugInfo() {
-  const home = os2.homedir();
+  const home = os4.homedir();
   const cwd = process.cwd();
   const encodedCwd = encodePathLikeClaude(cwd);
   const pathsToCheck = [
-    path2.join(home, ".config", "claude", "projects"),
-    path2.join(home, ".claude", "projects")
+    path3.join(home, ".config", "claude", "projects"),
+    path3.join(home, ".claude", "projects")
   ];
   const configDir = process.env.CLAUDE_CONFIG_DIR;
   if (configDir) {
-    pathsToCheck.unshift(path2.join(configDir, "projects"));
+    pathsToCheck.unshift(path3.join(configDir, "projects"));
   }
   if (process.platform === "win32" && process.env.APPDATA) {
-    pathsToCheck.unshift(path2.join(process.env.APPDATA, "claude", "projects"));
+    pathsToCheck.unshift(path3.join(process.env.APPDATA, "claude", "projects"));
   }
   const searchedPaths = pathsToCheck.map((p) => {
-    const exists = fs2.existsSync(p);
+    const exists = fs3.existsSync(p);
     let matchingDirs;
     if (exists) {
       try {
-        const entries = fs2.readdirSync(p, { withFileTypes: true });
+        const entries = fs3.readdirSync(p, { withFileTypes: true });
         matchingDirs = entries.filter((e) => e.isDirectory()).map((e) => e.name).filter((name) => {
           const lowerName = name.toLowerCase();
           const lowerEncoded = encodedCwd.toLowerCase();
-          return lowerName.includes(path2.basename(cwd).toLowerCase()) || lowerEncoded.includes(lowerName) || lowerName.includes(lowerEncoded.slice(-20));
+          return lowerName.includes(path3.basename(cwd).toLowerCase()) || lowerEncoded.includes(lowerName) || lowerName.includes(lowerEncoded.slice(-20));
         }).slice(0, 5);
       } catch {
         matchingDirs = void 0;
@@ -819,11 +972,11 @@ function scanAllProjects(options = {}) {
   const allJsonlFiles = [];
   for (const projectsDir of projectsDirs) {
     try {
-      const entries = fs2.readdirSync(projectsDir, { withFileTypes: true });
+      const entries = fs3.readdirSync(projectsDir, { withFileTypes: true });
       for (const entry of entries) {
         if (!entry.isDirectory()) continue;
         if (entry.name.startsWith(".")) continue;
-        const projectPath = path2.join(projectsDir, entry.name);
+        const projectPath = path3.join(projectsDir, entry.name);
         const jsonlFiles = findJsonlFiles(projectPath);
         allJsonlFiles.push(...jsonlFiles);
       }
@@ -849,7 +1002,7 @@ function scanAllProjects(options = {}) {
     }
     projects[projectName].sessions++;
     try {
-      const content = fs2.readFileSync(filePath, "utf-8");
+      const content = fs3.readFileSync(filePath, "utf-8");
       const lines = content.split("\n").filter((line) => line.trim());
       for (const line of lines) {
         try {
@@ -976,11 +1129,11 @@ function getAllSessionsCount() {
   let count = 0;
   for (const projectsDir of projectsDirs) {
     try {
-      const entries = fs2.readdirSync(projectsDir, { withFileTypes: true });
+      const entries = fs3.readdirSync(projectsDir, { withFileTypes: true });
       for (const entry of entries) {
         if (!entry.isDirectory()) continue;
         if (entry.name.startsWith(".")) continue;
-        const projectPath = path2.join(projectsDir, entry.name);
+        const projectPath = path3.join(projectsDir, entry.name);
         count += findJsonlFiles(projectPath).length;
       }
     } catch {
@@ -995,6 +1148,27 @@ function hasAnySessions() {
 
 // src/commands/submit.ts
 init_ui();
+async function reportSubmitAttempt(reason, debugInfo) {
+  try {
+    const config = getConfig();
+    const apiUrl = getApiUrl();
+    const token = config.get("apiToken");
+    await fetch(`${apiUrl}/cli/submit-attempt`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        ...token && { Authorization: `Bearer ${token}` }
+      },
+      body: JSON.stringify({
+        reason,
+        debugInfo,
+        cliVersion: process.env.npm_package_version || "unknown",
+        platform: process.platform
+      })
+    });
+  } catch {
+  }
+}
 function ccgatherToUsageData(data) {
   const opusCheck = hasOpusUsageInProject(data.dailyUsage);
   return {
@@ -1050,7 +1224,9 @@ async function submitToServer(data) {
         sessionFingerprint: data.sessionFingerprint,
         // Opus info for badge display
         hasOpusUsage: data.hasOpusUsage,
-        opusModels: data.opusModels
+        opusModels: data.opusModels,
+        // Multi-device support
+        deviceId: getDeviceId()
       })
     });
     if (!response.ok) {
@@ -1179,6 +1355,7 @@ async function submit(options) {
   }
   const username = tokenCheck.username || config.get("username");
   verifySpinner.succeed(colors.success(`Authenticated as ${colors.white(username || "unknown")}`));
+  await initPricing();
   if (!hasAnySessions()) {
     console.log(`
   ${error("No Claude Code sessions found.")}`);
@@ -1200,6 +1377,7 @@ async function submit(options) {
       console.log(`    ${status} ${pathInfo.path}`);
     }
     console.log();
+    await reportSubmitAttempt("no_sessions", debugInfo);
     process.exit(1);
   }
   console.log(`
@@ -1222,6 +1400,7 @@ async function submit(options) {
     console.log(`  ${colors.error("\u2717")} ${colors.error("No usage data found.")}`);
     console.log(`  ${colors.muted("Make sure you have used Claude Code at least once.")}
 `);
+    await reportSubmitAttempt("no_data");
     process.exit(1);
   }
   const usageData = ccgatherToUsageData(scannedData);
@@ -1286,6 +1465,23 @@ async function submit(options) {
         `     ${colors.muted("Accumulated")} \u26A1 ${colors.primary(formatNumber(prevTokens))} ${colors.dim("\u2502")} \u{1F4B0} ${colors.warning(formatCost(prevCost))}`
       );
     }
+    if (result.deviceInfo && result.deviceInfo.totalDevices > 1) {
+      const di = result.deviceInfo;
+      const otherCount = di.totalDevices - 1;
+      console.log();
+      console.log(sectionHeader("\u{1F5A5}\uFE0F", "Multi-Device"));
+      console.log();
+      console.log(
+        `     ${colors.muted("This PC")}     \u26A1 ${colors.primary(formatNumber(di.thisDeviceTokens))} ${colors.dim("\u2502")} \u{1F4B0} ${colors.warning(formatCost(di.thisDeviceCost))}`
+      );
+      console.log(
+        `     ${colors.muted(`+ ${otherCount} other`)}   \u26A1 ${colors.primary(formatNumber(di.otherDevicesTokens))} ${colors.dim("\u2502")} \u{1F4B0} ${colors.warning(formatCost(di.otherDevicesCost))}`
+      );
+      console.log(`     ${colors.dim("\u2500".repeat(33))}`);
+      console.log(
+        `     ${colors.white.bold("Combined")}    \u26A1 ${colors.primary(formatNumber(di.combinedTokens))} ${colors.dim("\u2502")} \u{1F4B0} ${colors.warning(formatCost(di.combinedCost))}  ${colors.success("\u2713")}`
+      );
+    }
     if (result.rank || result.countryRank) {
       console.log();
       console.log(sectionHeader("\u{1F4CA}", "Your Ranking"));

package/package.json

@@ -1,55 +1,55 @@
-{
-  "name": "ccgather",
-  "version": "2.0.32",
-  "description": "CLI tool for syncing Claude Code usage data to CCgather leaderboard",
-  "bin": {
-    "ccgather": "dist/index.js",
-    "ccg": "dist/index.js"
-  },
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
-  "scripts": {
-    "build": "tsup",
-    "dev": "tsup --watch",
-    "start": "node dist/index.js",
-    "typecheck": "tsc --noEmit",
-    "test": "vitest run",
-    "test:watch": "vitest"
-  },
-  "keywords": [
-    "claude",
-    "anthropic",
-    "claude-code",
-    "ccgather",
-    "leaderboard",
-    "cli"
-  ],
-  "author": "",
-  "license": "Apache-2.0",
-  "dependencies": {
-    "chalk": "^5.3.0",
-    "commander": "^12.1.0",
-    "conf": "^13.0.1",
-    "inquirer": "^9.2.23",
-    "open": "^10.1.0",
-    "ora": "^8.1.0",
-    "string-width": "^7.2.0"
-  },
-  "devDependencies": {
-    "@types/inquirer": "^9.0.7",
-    "@types/node": "^22.10.2",
-    "tsup": "^8.3.5",
-    "typescript": "^5.7.2",
-    "vitest": "^3.0.0"
-  },
-  "engines": {
-    "node": ">=18"
-  },
-  "files": [
-    "dist"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/DHxWhy/CCgather.git"
-  }
-}
+{
+  "name": "ccgather",
+  "version": "2.0.34",
+  "description": "CLI tool for syncing Claude Code usage data to CCgather leaderboard",
+  "bin": {
+    "ccgather": "dist/index.js",
+    "ccg": "dist/index.js"
+  },
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "scripts": {
+    "build": "tsup",
+    "dev": "tsup --watch",
+    "start": "node dist/index.js",
+    "typecheck": "tsc --noEmit",
+    "test": "vitest run",
+    "test:watch": "vitest"
+  },
+  "keywords": [
+    "claude",
+    "anthropic",
+    "claude-code",
+    "ccgather",
+    "leaderboard",
+    "cli"
+  ],
+  "author": "",
+  "license": "Apache-2.0",
+  "dependencies": {
+    "chalk": "^5.3.0",
+    "commander": "^12.1.0",
+    "conf": "^13.0.1",
+    "inquirer": "^9.2.23",
+    "open": "^10.1.0",
+    "ora": "^8.1.0",
+    "string-width": "^7.2.0"
+  },
+  "devDependencies": {
+    "@types/inquirer": "^9.0.7",
+    "@types/node": "^22.10.2",
+    "tsup": "^8.3.5",
+    "typescript": "^5.7.2",
+    "vitest": "^3.0.0"
+  },
+  "engines": {
+    "node": ">=18"
+  },
+  "files": [
+    "dist"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/DHxWhy/CCgather.git"
+  }
+}