ccgather 1.3.34 → 1.3.35

package/dist/index.js

@@ -80,7 +80,7 @@ async function auth(options) {
   console.log(import_chalk2.default.bold("\n\u{1F510} CCgather Authentication\n"));
   const existingToken = config.get("apiToken");
   if (existingToken) {
-    const { overwrite } = await import_inquirer2.default.prompt([
+    const { overwrite } = await import_inquirer.default.prompt([
       {
         type: "confirm",
         name: "overwrite",
@@ -98,7 +98,7 @@ async function auth(options) {
     return;
   }
   const apiUrl = getApiUrl();
-  const spinner = (0, import_ora3.default)("Initializing authentication...").start();
+  const spinner = (0, import_ora.default)("Initializing authentication...").start();
   try {
     const response = await fetch(`${apiUrl}/cli/auth/device`, {
       method: "POST"
@@ -120,7 +120,7 @@ async function auth(options) {
       console.log(import_chalk2.default.yellow("  Could not open browser automatically."));
       console.log(import_chalk2.default.yellow("  Please open the URL above manually.\n"));
     }
-    const pollSpinner = (0, import_ora3.default)("Waiting for authorization...").start();
+    const pollSpinner = (0, import_ora.default)("Waiting for authorization...").start();
     const startTime = Date.now();
     const expiresAt = startTime + deviceData.expires_in * 1e3;
     const pollInterval = Math.max(deviceData.interval * 1e3, 5e3);
@@ -167,7 +167,7 @@ Error: ${error2 instanceof Error ? error2.message : "Unknown error"}
 async function authenticateWithToken(token) {
   const config = getConfig();
   const apiUrl = getApiUrl();
-  const spinner = (0, import_ora3.default)("Verifying token...").start();
+  const spinner = (0, import_ora.default)("Verifying token...").start();
   try {
     const response = await fetch(`${apiUrl}/cli/verify`, {
       method: "POST",
@@ -204,13 +204,13 @@ Error: ${error2 instanceof Error ? error2.message : "Unknown error"}
 function sleep2(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
-var import_chalk2, import_ora3, import_inquirer2, import_open;
+var import_chalk2, import_ora, import_inquirer, import_open;
 var init_auth = __esm({
   "src/commands/auth.ts"() {
     "use strict";
     import_chalk2 = __toESM(require("chalk"));
-    import_ora3 = __toESM(require("ora"));
-    import_inquirer2 = __toESM(require("inquirer"));
+    import_ora = __toESM(require("ora"));
+    import_inquirer = __toESM(require("inquirer"));
     import_open = __toESM(require("open"));
     init_config();
   }
@@ -222,8 +222,8 @@ var import_inquirer3 = __toESM(require("inquirer"));
 var import_chalk3 = __toESM(require("chalk"));
 
 // src/commands/submit.ts
-var import_ora = __toESM(require("ora"));
-var import_inquirer = __toESM(require("inquirer"));
+var import_ora2 = __toESM(require("ora"));
+var import_inquirer2 = __toESM(require("inquirer"));
 init_config();
 
 // src/lib/ccgather-json.ts
@@ -301,6 +301,41 @@ function extractProjectName(filePath) {
 function getClaudeProjectsDir() {
   return path2.join(os2.homedir(), ".claude", "projects");
 }
+function encodePathLikeClaude(inputPath) {
+  return inputPath.split("").map((char) => {
+    const code = char.charCodeAt(0);
+    if (code >= 48 && code <= 57 || // 0-9
+    code >= 65 && code <= 90 || // A-Z
+    code >= 97 && code <= 122 || // a-z
+    char === "-" || char === "_" || char === ".") {
+      return char;
+    }
+    return "-";
+  }).join("");
+}
+function getCurrentProjectDir() {
+  const projectsDir = getClaudeProjectsDir();
+  if (!fs2.existsSync(projectsDir)) {
+    return null;
+  }
+  const cwd = process.cwd();
+  const encodedCwd = encodePathLikeClaude(cwd);
+  try {
+    const entries = fs2.readdirSync(projectsDir, { withFileTypes: true });
+    for (const entry of entries) {
+      if (!entry.isDirectory()) continue;
+      if (entry.name === encodedCwd) {
+        return path2.join(projectsDir, entry.name);
+      }
+      if (entry.name.toLowerCase() === encodedCwd.toLowerCase()) {
+        return path2.join(projectsDir, entry.name);
+      }
+    }
+  } catch {
+    return null;
+  }
+  return null;
+}
 function findJsonlFiles(dir) {
   const files = [];
   try {
@@ -339,8 +374,8 @@ function estimateCost(model, inputTokens, outputTokens, cacheWriteTokens = 0, ca
   return Math.round((inputCost + outputCost + cacheWriteCost + cacheReadCost) * 100) / 100;
 }
 function scanUsageData(options = {}) {
-  const projectsDir = getClaudeProjectsDir();
-  if (!fs2.existsSync(projectsDir)) {
+  const currentProjectDir = getCurrentProjectDir();
+  if (!currentProjectDir) {
     return null;
   }
   const days = options.days ?? 30;
@@ -363,7 +398,7 @@ function scanUsageData(options = {}) {
   const dailyData = {};
   let firstTimestamp = null;
   let lastTimestamp = null;
-  const jsonlFiles = findJsonlFiles(projectsDir);
+  const jsonlFiles = findJsonlFiles(currentProjectDir);
   sessionsCount = jsonlFiles.length;
   const { onProgress } = options;
   for (let i = 0; i < jsonlFiles.length; i++) {
@@ -498,16 +533,23 @@ function scanUsageData(options = {}) {
   };
 }
 function getSessionFileCount() {
-  const projectsDir = getClaudeProjectsDir();
-  if (!fs2.existsSync(projectsDir)) {
+  const currentProjectDir = getCurrentProjectDir();
+  if (!currentProjectDir) {
     return 0;
   }
-  return findJsonlFiles(projectsDir).length;
+  return findJsonlFiles(currentProjectDir).length;
+}
+function hasProjectSessions() {
+  return getCurrentProjectDir() !== null;
+}
+function getCurrentProjectName() {
+  const cwd = process.cwd();
+  return path2.basename(cwd);
 }
 
 // src/lib/ui.ts
 var import_chalk = __toESM(require("chalk"));
-var VERSION = true ? "1.3.34" : "0.0.0";
+var VERSION = true ? "1.3.35" : "0.0.0";
 var colors = {
   primary: import_chalk.default.hex("#DA7756"),
   // Claude coral
@@ -663,13 +705,15 @@ function getCCplanBadge(ccplan) {
 }
 var LEVELS = [
   { min: 0, level: 1, name: "Novice", icon: "\u{1F331}", color: colors.dim },
-  { min: 1e5, level: 2, name: "Apprentice", icon: "\u{1F4DA}", color: colors.muted },
-  { min: 5e5, level: 3, name: "Journeyman", icon: "\u26A1", color: colors.cyan },
-  { min: 1e6, level: 4, name: "Expert", icon: "\u{1F48E}", color: colors.pro },
-  { min: 5e6, level: 5, name: "Master", icon: "\u{1F525}", color: colors.warning },
-  { min: 1e7, level: 6, name: "Grandmaster", icon: "\u{1F451}", color: colors.max },
-  { min: 5e7, level: 7, name: "Legend", icon: "\u{1F31F}", color: colors.primary },
-  { min: 1e8, level: 8, name: "Mythic", icon: "\u{1F3C6}", color: colors.secondary }
+  { min: 5e7, level: 2, name: "Apprentice", icon: "\u{1F4DA}", color: colors.muted },
+  { min: 2e8, level: 3, name: "Journeyman", icon: "\u26A1", color: colors.cyan },
+  { min: 5e8, level: 4, name: "Expert", icon: "\u{1F48E}", color: colors.pro },
+  { min: 1e9, level: 5, name: "Master", icon: "\u{1F525}", color: colors.warning },
+  { min: 3e9, level: 6, name: "Grandmaster", icon: "\u{1F451}", color: colors.max },
+  { min: 1e10, level: 7, name: "Legend", icon: "\u{1F31F}", color: colors.primary },
+  { min: 3e10, level: 8, name: "Mythic", icon: "\u{1F3C6}", color: colors.secondary },
+  { min: 5e10, level: 9, name: "Immortal", icon: "\u{1F4AB}", color: colors.team },
+  { min: 1e11, level: 10, name: "Transcendent", icon: "\u{1F30C}", color: colors.white }
 ];
 function getLevelInfo(tokens) {
   for (let i = LEVELS.length - 1; i >= 0; i--) {
@@ -768,6 +812,48 @@ async function printAnimatedHeader() {
   }
   console.log();
 }
+async function slotMachineRank(finalRank, label, medal, iterations = 12) {
+  const maxRank = Math.max(finalRank * 3, 100);
+  for (let i = 0; i < iterations; i++) {
+    const fakeRank = Math.floor(Math.random() * maxRank) + 1;
+    const speed = Math.min(30 + i * 15, 150);
+    process.stdout.write(
+      `\r     ${medal} ${colors.muted(label)} ${colors.dim(`#${fakeRank}`)}    `
+    );
+    await sleep(speed);
+  }
+  process.stdout.write(
+    `\r     ${medal} ${colors.muted(label)} ${colors.primary.bold(`#${finalRank}`)}    
+`
+  );
+}
+async function animatedProgressBar(targetPercent, barWidth = 20, stepDelay = 25) {
+  const steps = Math.min(targetPercent, 20);
+  const stepSize = targetPercent / steps;
+  for (let i = 0; i <= steps; i++) {
+    const currentPercent = Math.round(i * stepSize);
+    const filled = Math.round(currentPercent / 100 * barWidth);
+    const empty = barWidth - filled;
+    const bar = colors.primary("\u2588".repeat(filled)) + colors.dim("\u2591".repeat(empty));
+    process.stdout.write(`\r     [${bar}] ${colors.white(`${currentPercent}%`)}  `);
+    await sleep(stepDelay);
+  }
+  const finalFilled = Math.round(targetPercent / 100 * barWidth);
+  const finalEmpty = barWidth - finalFilled;
+  return colors.primary("\u2588".repeat(finalFilled)) + colors.dim("\u2591".repeat(finalEmpty));
+}
+async function suspenseDots(message, durationMs = 600) {
+  const frames = ["", ".", "..", "..."];
+  const frameDelay = 100;
+  const iterations = Math.ceil(durationMs / (frames.length * frameDelay));
+  for (let i = 0; i < iterations; i++) {
+    for (const frame of frames) {
+      process.stdout.write(`\r     ${colors.muted(message)}${colors.primary(frame)}     `);
+      await sleep(frameDelay);
+    }
+  }
+  process.stdout.write("\r" + " ".repeat(50) + "\r");
+}
 async function printAnimatedWelcomeBox(user) {
   const lines = [];
   const welcomeLine = `\u{1F44B} ${colors.white.bold(`Welcome back, ${user.username}!`)}`;
@@ -812,6 +898,8 @@ function ccgatherToUsageData(data) {
     cacheReadTokens: data.usage.cacheReadTokens,
     cacheWriteTokens: data.usage.cacheWriteTokens,
     daysTracked: data.stats.daysTracked,
+    firstUsed: data.stats.firstUsed,
+    lastUsed: data.stats.lastUsed,
     ccplan: data.account?.ccplan || null,
     rateLimitTier: data.account?.rateLimitTier || null,
     dailyUsage: data.dailyUsage || []
@@ -847,6 +935,13 @@ async function submitToServer(data) {
     });
     if (!response.ok) {
       const errorData = await response.json().catch(() => ({}));
+      if (response.status === 429 && errorData.retryAfterMinutes) {
+        return {
+          success: false,
+          error: errorData.error || "Rate limit exceeded",
+          retryAfterMinutes: errorData.retryAfterMinutes
+        };
+      }
       return { success: false, error: errorData.error || `HTTP ${response.status}` };
     }
     const result = await response.json();
@@ -874,21 +969,30 @@ function formatBadgeDate(dateStr) {
   if (!dateStr) return (/* @__PURE__ */ new Date()).toISOString().split("T")[0].replace(/-/g, ".");
   return dateStr.split("T")[0].replace(/-/g, ".");
 }
-function displayNewBadges(badges) {
+async function displayNewBadges(badges) {
   if (badges.length === 0) return;
   console.log();
-  for (const badge of badges) {
+  await suspenseDots("Checking achievements", 800);
+  for (let i = 0; i < badges.length; i++) {
+    const badge = badges[i];
     const rarityColor = getRarityColor(badge.rarity);
     const rarityLabel = badge.rarity.toUpperCase();
+    if (i > 0) {
+      await sleep(300);
+    }
     console.log(
-      `     ${badge.icon} ${colors.white.bold(badge.name)} ${rarityColor(`[${rarityLabel}]`)}`
+      `     \u2728 ${badge.icon} ${colors.white.bold(badge.name)} ${rarityColor(`[${rarityLabel}]`)}`
     );
+    await sleep(100);
     console.log(`        ${colors.muted(badge.description)}`);
+    await sleep(80);
     if (badge.praise) {
       console.log(`        ${colors.cyan(`"${badge.praise}"`)}`);
+      await sleep(80);
     }
     if (badge.category === "rank") {
       console.log(`        ${colors.dim(`\u{1F4C5} Achieved: ${formatBadgeDate(badge.earnedAt)}`)}`);
+      await sleep(80);
     }
   }
 }
@@ -905,12 +1009,25 @@ async function submit(options) {
     console.log(`
   ${colors.muted("Logged in as:")} ${colors.white(username)}`);
   }
+  const projectName = getCurrentProjectName();
+  if (!hasProjectSessions()) {
+    console.log(`
+  ${error("No Claude Code sessions found for this project.")}`);
+    console.log(`  ${colors.muted("Project:")} ${colors.white(projectName)}`);
+    console.log();
+    console.log(`  ${colors.muted("Make sure you:")}`);
+    console.log(`  ${colors.muted("  1. Run this command from a project directory")}`);
+    console.log(`  ${colors.muted("  2. Have used Claude Code in this project at least once")}`);
+    console.log();
+    process.exit(1);
+  }
   let usageData = null;
   const totalFiles = getSessionFileCount();
+  console.log(`
+  ${colors.muted("Project:")} ${colors.white(projectName)}`);
   if (totalFiles > 0) {
     console.log(
-      `
-  ${colors.muted("Scanning")} ${colors.white(totalFiles.toString())} ${colors.muted("sessions...")}`
+      `  ${colors.muted("Scanning")} ${colors.white(totalFiles.toString())} ${colors.muted("sessions...")}`
     );
     const scannedData = scanUsageData({
       onProgress: (current, total) => {
@@ -938,10 +1055,20 @@ async function submit(options) {
     process.exit(1);
   }
   console.log();
+  const formatDate = (dateStr) => {
+    if (!dateStr) return "------";
+    const d = new Date(dateStr);
+    const yy = String(d.getFullYear()).slice(2);
+    const mm = String(d.getMonth() + 1).padStart(2, "0");
+    const dd = String(d.getDate()).padStart(2, "0");
+    return `${yy}${mm}${dd}`;
+  };
+  const dateRange = usageData.firstUsed && usageData.lastUsed ? `${formatDate(usageData.firstUsed)} ~ ${formatDate(usageData.lastUsed)}` : "";
+  const daysTrackedDisplay = dateRange ? `${usageData.daysTracked} days ${colors.dim(`(${dateRange})`)}` : usageData.daysTracked.toString();
   const summaryLines = [
     `${colors.muted("Total Cost")}     ${colors.success(formatCost(usageData.totalCost))}`,
     `${colors.muted("Total Tokens")}   ${colors.primary(formatNumber(usageData.totalTokens))}`,
-    `${colors.muted("Days Tracked")}   ${colors.warning(usageData.daysTracked.toString())}`
+    `${colors.muted("Period")}         ${colors.warning(daysTrackedDisplay)}`
   ];
   if (usageData.ccplan) {
     summaryLines.push(
@@ -950,7 +1077,10 @@ async function submit(options) {
   }
   console.log(createBox(summaryLines));
   console.log();
-  const { confirmSubmit } = await import_inquirer.default.prompt([
+  if (usageData.dailyUsage.length > 0) {
+    console.log(`  ${colors.dim(`Daily records: ${usageData.dailyUsage.length} days`)}`);
+  }
+  const { confirmSubmit } = await import_inquirer2.default.prompt([
     {
       type: "confirm",
       name: "confirmSubmit",
@@ -964,7 +1094,7 @@ async function submit(options) {
 `);
     return;
   }
-  const submitSpinner = (0, import_ora.default)({
+  const submitSpinner = (0, import_ora2.default)({
     text: "Submitting to CCgather...",
     color: "cyan"
   }).start();
@@ -983,15 +1113,11 @@ async function submit(options) {
       console.log();
       if (result.rank) {
         const medal = result.rank === 1 ? "\u{1F947}" : result.rank === 2 ? "\u{1F948}" : result.rank === 3 ? "\u{1F949}" : result.rank <= 10 ? "\u{1F3C5}" : "\u{1F30D}";
-        console.log(
-          `     ${medal} ${colors.muted("Global:")} ${colors.primary.bold(`#${result.rank}`)}`
-        );
+        await slotMachineRank(result.rank, "Global:", medal);
       }
       if (result.countryRank) {
         const countryMedal = result.countryRank === 1 ? "\u{1F947}" : result.countryRank <= 3 ? "\u{1F3C6}" : "\u{1F3E0}";
-        console.log(
-          `     ${countryMedal} ${colors.muted("Country:")} ${colors.primary.bold(`#${result.countryRank}`)}`
-        );
+        await slotMachineRank(result.countryRank, "Country:", countryMedal, 10);
       }
     }
     console.log();
@@ -999,25 +1125,25 @@ async function submit(options) {
     console.log();
     const levelProgress = getLevelProgress(usageData.totalTokens);
     const currentLevel = levelProgress.current;
+    await sleep(200);
     console.log(
       `     ${currentLevel.icon} ${currentLevel.color(`Level ${currentLevel.level}`)} ${colors.muted("\u2022")} ${colors.white(currentLevel.name)}`
     );
     if (!levelProgress.isMaxLevel && levelProgress.next) {
-      const barWidth = 20;
-      const filled = Math.round(levelProgress.progress / 100 * barWidth);
-      const empty = barWidth - filled;
-      const bar = colors.primary("\u2588".repeat(filled)) + colors.dim("\u2591".repeat(empty));
-      console.log(`     [${bar}] ${colors.white(`${levelProgress.progress}%`)}`);
+      await animatedProgressBar(levelProgress.progress, 20, 30);
+      console.log();
+      await sleep(150);
       console.log(
         `     ${colors.dim("\u2192")} ${levelProgress.next.icon} ${colors.white(levelProgress.next.name)} ${colors.muted("in")} ${colors.primary(formatNumber(levelProgress.tokensToNext))}`
       );
     } else {
+      await sleep(300);
       console.log(`     ${colors.max("\u2605")} ${colors.max("MAX LEVEL ACHIEVED!")}`);
     }
     if (result.newBadges && result.newBadges.length > 0) {
       console.log();
       console.log(sectionHeader("\u{1F389}", "New Badge Unlocked"));
-      displayNewBadges(result.newBadges);
+      await displayNewBadges(result.newBadges);
     }
     console.log();
     const leaderboardUrl = `https://ccgather.com/leaderboard?u=${username}`;
@@ -1028,9 +1154,29 @@ async function submit(options) {
     submitSpinner.fail(colors.error("Failed to submit"));
     console.log(`
   ${error(result.error || "Unknown error")}`);
-    if (result.error?.includes("auth") || result.error?.includes("token")) {
+    if (result.retryAfterMinutes) {
+      console.log();
+      console.log(
+        `  ${colors.warning("\u23F3")} ${colors.muted("Try again in")} ${colors.white(`${result.retryAfterMinutes} minute${result.retryAfterMinutes !== 1 ? "s" : ""}`)}`
+      );
+    } else if (result.error?.includes("auth") || result.error?.includes("token")) {
       console.log();
-      console.log(`  ${colors.muted("Try re-authenticating from Settings menu.")}`);
+      const { startAuth } = await import_inquirer2.default.prompt([
+        {
+          type: "confirm",
+          name: "startAuth",
+          message: "Would you like to authenticate now?",
+          default: true
+        }
+      ]);
+      if (startAuth) {
+        const { auth: auth2 } = await Promise.resolve().then(() => (init_auth(), auth_exports));
+        await auth2({});
+        console.log();
+        console.log(`  ${colors.muted("Please run")} ${colors.primary("npx ccgather")} ${colors.muted("again to submit.")}`);
+        console.log();
+        process.exit(0);
+      }
     }
     console.log();
     process.exit(1);
@@ -1038,7 +1184,7 @@ async function submit(options) {
 }
 
 // src/commands/status.ts
-var import_ora2 = __toESM(require("ora"));
+var import_ora3 = __toESM(require("ora"));
 init_config();
 
 // src/lib/api.ts
@@ -1080,7 +1226,7 @@ async function status(options) {
   ${error("Not authenticated.")}`);
     process.exit(1);
   }
-  const spinner = (0, import_ora2.default)({
+  const spinner = (0, import_ora3.default)({
     text: "Fetching your stats...",
     color: "cyan"
   }).start();
@@ -1157,7 +1303,9 @@ async function checkLatestVersion() {
 }
 async function promptForUpdate(latestVersion) {
   console.log();
-  console.log(`  ${import_chalk3.default.yellow("\u26A0")}  ${import_chalk3.default.yellow("New version")} ${import_chalk3.default.green(latestVersion)} ${import_chalk3.default.yellow("available!")} ${import_chalk3.default.dim(`(current: ${VERSION})`)}`);
+  console.log(
+    `  ${import_chalk3.default.yellow("\u26A0")}  ${import_chalk3.default.yellow("New version")} ${import_chalk3.default.green(latestVersion)} ${import_chalk3.default.yellow("available!")} ${import_chalk3.default.dim(`(current: ${VERSION})`)}`
+  );
   console.log();
   const { shouldUpdate } = await import_inquirer3.default.prompt([
     {

package/package.json

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