ccgather 2.0.33 → 2.0.35

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.33" : "0.0.0";
+    VERSION = true ? "2.0.35" : "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/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 os3 = __toESM(require("os"));
-var crypto = __toESM(require("crypto"));
+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 {
@@ -619,7 +645,7 @@ function readCredentials() {
 // src/lib/pricing.ts
 var fs2 = __toESM(require("fs"));
 var path2 = __toESM(require("path"));
-var os2 = __toESM(require("os"));
+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;
@@ -632,9 +658,9 @@ var FALLBACK_PRICING = {
 var pricingData = null;
 function getCacheFilePath() {
   const configDir = process.platform === "win32" ? path2.join(
-    process.env.APPDATA || path2.join(os2.homedir(), "AppData", "Roaming"),
+    process.env.APPDATA || path2.join(os3.homedir(), "AppData", "Roaming"),
     "ccgather-nodejs"
-  ) : path2.join(os2.homedir(), ".config", "ccgather-nodejs");
+  ) : path2.join(os3.homedir(), ".config", "ccgather-nodejs");
   return path2.join(configDir, "pricing-cache.json");
 }
 function loadCache() {
@@ -800,7 +826,7 @@ function extractProjectName(filePath) {
 }
 function getClaudeProjectsDirs() {
   const dirs = [];
-  const home = os3.homedir();
+  const home = os4.homedir();
   const configDir = process.env.CLAUDE_CONFIG_DIR;
   if (configDir) {
     const envPath = path3.join(configDir, "projects");
@@ -857,7 +883,7 @@ function generateSessionHash(filePath, maxLines = 50) {
     const lines = content.split("\n").slice(0, maxLines).join("\n");
     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;
   }
@@ -871,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,
@@ -879,7 +905,7 @@ function generateSessionFingerprint(sessionFiles) {
   };
 }
 function getSessionPathDebugInfo() {
-  const home = os3.homedir();
+  const home = os4.homedir();
   const cwd = process.cwd();
   const encodedCwd = encodePathLikeClaude(cwd);
   const pathsToCheck = [
@@ -1198,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) {
@@ -1437,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,6 +1,6 @@
 {
   "name": "ccgather",
-  "version": "2.0.33",
+  "version": "2.0.35",
   "description": "CLI tool for syncing Claude Code usage data to CCgather leaderboard",
   "bin": {
     "ccgather": "dist/index.js",