ccgather 2.0.9 → 2.0.11

package/dist/index.js

@@ -329,7 +329,7 @@ var init_ui = __esm({
     "use strict";
     import_chalk = __toESM(require("chalk"));
     import_string_width = __toESM(require("string-width"));
-    VERSION = true ? "2.0.9" : "0.0.0";
+    VERSION = true ? "2.0.11" : "0.0.0";
     colors = {
       primary: import_chalk.default.hex("#DA7756"),
       // Claude coral
@@ -1291,12 +1291,17 @@ async function submit(options) {
   ${colors.muted("Scanning all Claude Code sessions...")}`);
   const totalSessions = getAllSessionsCount();
   console.log(`  ${colors.dim(`Found ${totalSessions} session file(s)`)}`);
+  let lastProgress = 0;
   const scannedData = scanAllProjects({
     onProgress: (current, total) => {
       progressBar(current, total, "Scanning");
+      lastProgress = current;
     }
   });
-  await sleep(200);
+  if (lastProgress > 0) {
+    process.stdout.write("\r" + " ".repeat(60) + "\r");
+  }
+  console.log(`  ${success("Scan complete!")}`);
   if (!scannedData) {
     console.log(`
   ${error("No usage data found.")}`);
@@ -1305,7 +1310,6 @@ async function submit(options) {
     process.exit(1);
   }
   const usageData = ccgatherToUsageData(scannedData);
-  console.log(`  ${success("Scan complete!")}`);
   console.log();
   const formatDate = (dateStr) => {
     if (!dateStr) return "------";
@@ -1342,20 +1346,7 @@ async function submit(options) {
   console.log(
     `  ${colors.dim(`Scanned ${projectCount} project(s), ${usageData.dailyUsage.length} day(s) of data`)}`
   );
-  const { confirmSubmit } = await import_inquirer2.default.prompt([
-    {
-      type: "confirm",
-      name: "confirmSubmit",
-      message: "Submit to CCgather leaderboard?",
-      default: true
-    }
-  ]);
-  if (!confirmSubmit) {
-    console.log(`
-  ${colors.muted("Submission cancelled.")}
-`);
-    return;
-  }
+  console.log();
   const submitSpinner = (0, import_ora2.default)({
     text: "Submitting to CCgather...",
     color: "cyan"
@@ -1371,8 +1362,40 @@ async function submit(options) {
     };
     if (result.previous) {
       const prev = result.previous;
-      const tokenDiff = usageData.totalTokens - prev.totalTokens;
-      const costDiff = usageData.totalCost - prev.totalCost;
+      const previousDates = new Set(prev.previousDates || []);
+      const previousDailyMap = /* @__PURE__ */ new Map();
+      prev.previousDaily?.forEach((d) => {
+        previousDailyMap.set(d.date, { tokens: d.tokens, cost: d.cost });
+      });
+      const currentDates = new Set(usageData.dailyUsage.map((d) => d.date));
+      const newDates = usageData.dailyUsage.filter((d) => !previousDates.has(d.date));
+      const expiredDates = Array.from(previousDates).filter((d) => !currentDates.has(d));
+      const updatedDates = usageData.dailyUsage.filter((d) => {
+        const prevData = previousDailyMap.get(d.date);
+        return prevData && d.tokens > prevData.tokens;
+      });
+      let newTokens = 0;
+      let newCost = 0;
+      newDates.forEach((d) => {
+        newTokens += d.tokens;
+        newCost += d.cost;
+      });
+      updatedDates.forEach((d) => {
+        const prevData = previousDailyMap.get(d.date);
+        if (prevData) {
+          newTokens += d.tokens - prevData.tokens;
+          newCost += d.cost - prevData.cost;
+        }
+      });
+      let expiredTokens = 0;
+      let expiredCost = 0;
+      expiredDates.forEach((date) => {
+        const prevData = previousDailyMap.get(date);
+        if (prevData) {
+          expiredTokens += prevData.tokens;
+          expiredCost += prevData.cost;
+        }
+      });
       const lastSubmit = new Date(prev.lastSubmissionAt);
       const now = /* @__PURE__ */ new Date();
       const hoursDiff = Math.floor((now.getTime() - lastSubmit.getTime()) / (1e3 * 60 * 60));
@@ -1381,20 +1404,69 @@ async function submit(options) {
       console.log(sectionHeader("\u{1F4C8}", "Since Last Submit"));
       console.log();
       console.log(`     ${colors.muted("Last submitted:")} ${colors.dim(timeSince)}`);
-      if (tokenDiff > 0) {
-        console.log(
-          `     ${colors.muted("New tokens:")}     ${colors.success(`+${formatNumber(tokenDiff)}`)}`
-        );
+      console.log();
+      if (newTokens > 0 || updatedDates.length > 0) {
+        const parts = [];
+        if (newTokens > 0) {
+          parts.push(colors.success(`+${formatNumber(newTokens)}`));
+          parts.push(colors.success(`+${formatCost(newCost)}`));
+        }
+        if (newDates.length > 0) {
+          parts.push(
+            colors.primary(`+${newDates.length} new day${newDates.length > 1 ? "s" : ""}`)
+          );
+        }
+        if (updatedDates.length > 0 && newDates.length === 0) {
+          parts.push(
+            colors.primary(
+              `${updatedDates.length} day${updatedDates.length > 1 ? "s" : ""} updated`
+            )
+          );
+        }
+        console.log(`     ${parts.join("   ")}`);
       }
-      if (costDiff > 0) {
+      if (expiredDates.length > 0) {
+        console.log();
         console.log(
-          `     ${colors.muted("New spending:")}   ${colors.success(`+${formatCost(costDiff)}`)}`
+          `     ${colors.warning("\u26A0")} ${colors.dim(`${expiredDates.length} day${expiredDates.length > 1 ? "s" : ""} expired (30-day limit): -${formatNumber(expiredTokens)}`)}`
         );
       }
-      if (tokenDiff === 0 && costDiff === 0) {
-        console.log(`     ${colors.dim("No new usage since last submission")}`);
+      if (newDates.length > 0) {
+        console.log();
+        const displayDates = newDates.slice(-5);
+        if (newDates.length > 5) {
+          console.log(`     ${colors.dim(`... and ${newDates.length - 5} more days`)}`);
+        }
+        displayDates.forEach((d) => {
+          const dateStr = d.date.slice(5).replace("-", "/");
+          console.log(
+            `     ${colors.dim("\u2022")} ${colors.white(dateStr)}: ${colors.success(`+${formatNumber(d.tokens)}`)} ${colors.dim(`(${formatCost(d.cost)})`)}`
+          );
+        });
+      }
+      if (updatedDates.length > 0 && newDates.length === 0) {
+        console.log();
+        updatedDates.slice(-3).forEach((d) => {
+          const prevData = previousDailyMap.get(d.date);
+          if (prevData) {
+            const dateStr = d.date.slice(5).replace("-", "/");
+            const tokenIncrease = d.tokens - prevData.tokens;
+            console.log(
+              `     ${colors.dim("\u2022")} ${colors.white(dateStr)}: ${formatNumber(prevData.tokens)} \u2192 ${formatNumber(d.tokens)} ${colors.success(`(+${formatNumber(tokenIncrease)})`)}`
+            );
+          }
+        });
+      }
+      if (newTokens === 0 && updatedDates.length === 0 && expiredDates.length === 0) {
+        console.log(`     ${colors.dim("No changes since last submission")}`);
       }
       console.log();
+      const rankSpinner = (0, import_ora2.default)({
+        text: colors.dim("Calculating ranking..."),
+        color: "cyan"
+      }).start();
+      await sleep(400);
+      rankSpinner.stop();
     }
     if (result.rank || result.countryRank) {
       console.log();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccgather",
-  "version": "2.0.9",
+  "version": "2.0.11",
   "description": "CLI tool for syncing Claude Code usage data to CCgather leaderboard",
   "bin": {
     "ccgather": "dist/index.js",