ccgather 1.5.0 → 2.0.0

package/dist/index.js

@@ -208,60 +208,9 @@ function success(message) {
 function error(message) {
   return `${colors.error("\u2717")} ${message}`;
 }
-function warning(message) {
-  return `${colors.warning("\u26A0")} ${message}`;
-}
 function link(url) {
   return hyperlink(colors.cyan.underline(url), url);
 }
-function planDetectionSection(title, icon = "\u{1F50D}") {
-  return `
-${colors.dim("\u2500".repeat(50))}
-  ${icon} ${colors.white.bold(title)}
-${colors.dim("\u2500".repeat(50))}`;
-}
-function maxVerifiedMessage(opusModels) {
-  const modelList = opusModels.length > 2 ? `${opusModels.slice(0, 2).join(", ")} +${opusModels.length - 2} more` : opusModels.join(", ");
-  return [
-    ``,
-    `  ${success("Max plan verified")}`,
-    ``,
-    `    ${colors.muted("\u{1F4A1} Reason:")} Opus model usage detected`,
-    `       ${colors.dim("Models:")} ${colors.cyan(modelList)}`,
-    ``,
-    `    ${colors.dim("All data will be recorded under Max league.")}`,
-    ``
-  ];
-}
-function pastDataWarningMessage(oldestDate, daysSince) {
-  return [
-    ``,
-    `  ${warning(`Data older than 30 days detected`)}`,
-    ``,
-    `    ${colors.muted("Oldest record:")} ${colors.white(oldestDate)} ${colors.dim(`(${daysSince} days ago)`)}`,
-    `    ${colors.muted("Opus usage:")} ${colors.dim("Not found")}`,
-    ``,
-    `    ${colors.dim("\u2192 Max plan cannot be verified automatically.")}`,
-    ``
-  ];
-}
-function trustMessage() {
-  return [
-    `  ${colors.muted("\u{1F4A1} For fair league placement, we trust your choice.")}`,
-    `     ${colors.dim("Tip: Submit regularly for accurate tracking!")}`,
-    ``
-  ];
-}
-function currentPlanMessage(plan) {
-  const planColor = plan === "max" ? colors.max : plan === "pro" ? colors.pro : colors.free;
-  const planBadge = plan === "max" ? "\u{1F680} MAX" : plan === "pro" ? "\u26A1 PRO" : "\u26AA FREE";
-  return [
-    ``,
-    `  ${colors.muted("\u{1F4CB} Plan:")} ${planColor(planBadge)}`,
-    `    ${colors.dim("Current plan from credentials will be used.")}`,
-    ``
-  ];
-}
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -380,7 +329,7 @@ var init_ui = __esm({
     "use strict";
     import_chalk = __toESM(require("chalk"));
     import_string_width = __toESM(require("string-width"));
-    VERSION = true ? "1.5.0" : "0.0.0";
+    VERSION = true ? "2.0.0" : "0.0.0";
     colors = {
       primary: import_chalk.default.hex("#DA7756"),
       // Claude coral
@@ -772,22 +721,6 @@ function hasOpusUsageInProject(dailyUsage) {
     opusDates
   };
 }
-function hasOldData(dailyUsage, days = 30) {
-  if (dailyUsage.length === 0) {
-    return { hasOldData: false, oldestDate: null, daysSinceOldest: 0 };
-  }
-  const sortedDates = dailyUsage.map((d) => d.date).sort((a, b) => a.localeCompare(b));
-  const oldestDate = sortedDates[0];
-  const oldestDateObj = new Date(oldestDate);
-  const now = /* @__PURE__ */ new Date();
-  const diffTime = now.getTime() - oldestDateObj.getTime();
-  const daysSinceOldest = Math.floor(diffTime / (1e3 * 60 * 60 * 24));
-  return {
-    hasOldData: daysSinceOldest > days,
-    oldestDate,
-    daysSinceOldest
-  };
-}
 var CCGATHER_JSON_VERSION = "1.2.0";
 function extractProjectName(filePath) {
   const parts = filePath.split(/[/\\]/);
@@ -856,55 +789,6 @@ function encodePathLikeClaude(inputPath) {
     return "-";
   }).join("");
 }
-function getCurrentProjectDir() {
-  const projectsDirs = getClaudeProjectsDirs();
-  if (projectsDirs.length === 0) {
-    debugLog("No project directories found");
-    return null;
-  }
-  const cwd = process.cwd();
-  const projectName = path2.basename(cwd);
-  const encodedCwd = encodePathLikeClaude(cwd);
-  debugLog("Looking for project:", projectName);
-  debugLog("Encoded CWD:", encodedCwd);
-  for (const projectsDir of projectsDirs) {
-    try {
-      const entries = fs2.readdirSync(projectsDir, { withFileTypes: true });
-      debugLog(`Scanning ${projectsDir}: ${entries.length} entries`);
-      for (const entry of entries) {
-        if (!entry.isDirectory()) continue;
-        const folderName = entry.name;
-        const folderNameLower = folderName.toLowerCase();
-        const projectNameLower = projectName.toLowerCase();
-        const encodedCwdLower = encodedCwd.toLowerCase();
-        if (folderName === encodedCwd || folderNameLower === encodedCwdLower) {
-          debugLog("Match found (exact):", folderName);
-          return path2.join(projectsDir, entry.name);
-        }
-        if (folderNameLower.includes(projectNameLower)) {
-          debugLog("Match found (contains project name):", folderName);
-          return path2.join(projectsDir, entry.name);
-        }
-        const projectNameHyphenated = projectNameLower.replace(/_/g, "-");
-        if (folderNameLower.includes(projectNameHyphenated)) {
-          debugLog("Match found (hyphenated project name):", folderName);
-          return path2.join(projectsDir, entry.name);
-        }
-        const projectNamePattern = projectNameLower.replace(/[^a-z0-9]/g, "");
-        const folderNamePattern = folderNameLower.replace(/[^a-z0-9]/g, "");
-        if (folderNamePattern.endsWith(projectNamePattern) && projectNamePattern.length > 3) {
-          debugLog("Match found (ends with pattern):", folderName);
-          return path2.join(projectsDir, entry.name);
-        }
-      }
-    } catch (err) {
-      debugLog("Error scanning directory:", err);
-      continue;
-    }
-  }
-  debugLog("No matching project directory found");
-  return null;
-}
 function findJsonlFiles(dir) {
   const files = [];
   try {
@@ -969,44 +853,53 @@ function generateSessionFingerprint(sessionFiles) {
     sessionCount: sessionHashes.length
   };
 }
-function hasProjectSessions() {
-  return getCurrentProjectDir() !== null;
-}
-function getProjectPath() {
-  return getCurrentProjectDir();
-}
-function getCurrentProjectName() {
+function getSessionPathDebugInfo() {
+  const home = os2.homedir();
   const cwd = process.cwd();
-  return path2.basename(cwd);
-}
-function getAllProjectFolders() {
-  const projectsDirs = getClaudeProjectsDirs();
-  const projects = [];
-  for (const projectsDir of projectsDirs) {
-    try {
-      const entries = fs2.readdirSync(projectsDir, { withFileTypes: true });
-      for (const entry of entries) {
-        if (!entry.isDirectory()) continue;
-        if (entry.name.startsWith(".")) continue;
-        const fullPath = path2.join(projectsDir, entry.name);
-        const hasJsonl = findJsonlFiles(fullPath).length > 0;
-        if (!hasJsonl) continue;
-        const parts = entry.name.split("-").filter((p) => p.length > 0);
-        const displayName = parts.length > 0 ? parts[parts.length - 1] : entry.name;
-        projects.push({
-          folderName: entry.name,
-          fullPath,
-          displayName
-        });
+  const encodedCwd = encodePathLikeClaude(cwd);
+  const pathsToCheck = [
+    path2.join(home, ".config", "claude", "projects"),
+    path2.join(home, ".claude", "projects")
+  ];
+  const configDir = process.env.CLAUDE_CONFIG_DIR;
+  if (configDir) {
+    pathsToCheck.unshift(path2.join(configDir, "projects"));
+  }
+  if (process.platform === "win32" && process.env.APPDATA) {
+    pathsToCheck.unshift(path2.join(process.env.APPDATA, "claude", "projects"));
+  }
+  const searchedPaths = pathsToCheck.map((p) => {
+    const exists = fs2.existsSync(p);
+    let matchingDirs;
+    if (exists) {
+      try {
+        const entries = fs2.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));
+        }).slice(0, 5);
+      } catch {
+        matchingDirs = void 0;
       }
-    } catch {
-      continue;
     }
-  }
-  return projects;
+    return { path: p, exists, matchingDirs };
+  });
+  return {
+    cwd,
+    encodedCwd,
+    searchedPaths,
+    platform: process.platform,
+    home
+  };
 }
-function scanUsageDataFromPath(projectPath, options = {}) {
-  const days = options.days ?? 30;
+function scanAllProjects(options = {}) {
+  const projectsDirs = getClaudeProjectsDirs();
+  if (projectsDirs.length === 0) {
+    debugLog("No project directories found");
+    return null;
+  }
+  const days = options.days ?? 0;
   let cutoffDate = null;
   if (days > 0) {
     const cutoff = /* @__PURE__ */ new Date();
@@ -1026,13 +919,31 @@ function scanUsageDataFromPath(projectPath, options = {}) {
   const dailyData = {};
   let firstTimestamp = null;
   let lastTimestamp = null;
-  const jsonlFiles = findJsonlFiles(projectPath);
-  sessionsCount = jsonlFiles.length;
+  const allJsonlFiles = [];
+  for (const projectsDir of projectsDirs) {
+    try {
+      const entries = fs2.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 jsonlFiles = findJsonlFiles(projectPath);
+        allJsonlFiles.push(...jsonlFiles);
+      }
+    } catch {
+      continue;
+    }
+  }
+  if (allJsonlFiles.length === 0) {
+    debugLog("No JSONL files found in any project");
+    return null;
+  }
+  sessionsCount = allJsonlFiles.length;
   const { onProgress } = options;
-  for (let i = 0; i < jsonlFiles.length; i++) {
-    const filePath = jsonlFiles[i];
+  for (let i = 0; i < allJsonlFiles.length; i++) {
+    const filePath = allJsonlFiles[i];
     if (onProgress) {
-      onProgress(i + 1, jsonlFiles.length);
+      onProgress(i + 1, allJsonlFiles.length);
     }
     const projectName = extractProjectName(filePath);
     if (!projects[projectName]) {
@@ -1133,7 +1044,7 @@ function scanUsageDataFromPath(projectPath, options = {}) {
     models: data.models
   })).sort((a, b) => a.date.localeCompare(b.date));
   const credentials = readCredentials();
-  const sessionFingerprint = generateSessionFingerprint(jsonlFiles);
+  const sessionFingerprint = generateSessionFingerprint(allJsonlFiles);
   return {
     version: CCGATHER_JSON_VERSION,
     lastUpdated: (/* @__PURE__ */ new Date()).toISOString(),
@@ -1164,87 +1075,32 @@ function scanUsageDataFromPath(projectPath, options = {}) {
     sessionFingerprint
   };
 }
-function getSessionPathDebugInfo() {
-  const home = os2.homedir();
-  const cwd = process.cwd();
-  const encodedCwd = encodePathLikeClaude(cwd);
-  const pathsToCheck = [
-    path2.join(home, ".config", "claude", "projects"),
-    path2.join(home, ".claude", "projects")
-  ];
-  const configDir = process.env.CLAUDE_CONFIG_DIR;
-  if (configDir) {
-    pathsToCheck.unshift(path2.join(configDir, "projects"));
-  }
-  if (process.platform === "win32" && process.env.APPDATA) {
-    pathsToCheck.unshift(path2.join(process.env.APPDATA, "claude", "projects"));
-  }
-  const searchedPaths = pathsToCheck.map((p) => {
-    const exists = fs2.existsSync(p);
-    let matchingDirs;
-    if (exists) {
-      try {
-        const entries = fs2.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));
-        }).slice(0, 5);
-      } catch {
-        matchingDirs = void 0;
+function getAllSessionsCount() {
+  const projectsDirs = getClaudeProjectsDirs();
+  let count = 0;
+  for (const projectsDir of projectsDirs) {
+    try {
+      const entries = fs2.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);
+        count += findJsonlFiles(projectPath).length;
       }
+    } catch {
+      continue;
     }
-    return { path: p, exists, matchingDirs };
-  });
-  return {
-    cwd,
-    encodedCwd,
-    searchedPaths,
-    platform: process.platform,
-    home
-  };
-}
-var CCGATHER_FILE = ".ccgather";
-function getCcgatherFilePath() {
-  return path2.join(process.cwd(), CCGATHER_FILE);
-}
-function loadProjectLink() {
-  try {
-    const filePath = getCcgatherFilePath();
-    if (!fs2.existsSync(filePath)) {
-      return null;
-    }
-    const content = fs2.readFileSync(filePath, "utf-8");
-    const data = JSON.parse(content);
-    if (!data.claudeProjectPath || !data.folderName) {
-      return null;
-    }
-    if (!fs2.existsSync(data.claudeProjectPath)) {
-      return null;
-    }
-    return data;
-  } catch {
-    return null;
   }
+  return count;
 }
-function saveProjectLink(claudeProjectPath, folderName) {
-  try {
-    const filePath = getCcgatherFilePath();
-    const data = {
-      claudeProjectPath,
-      folderName,
-      linkedAt: (/* @__PURE__ */ new Date()).toISOString()
-    };
-    fs2.writeFileSync(filePath, JSON.stringify(data, null, 2), "utf-8");
-    return true;
-  } catch {
-    return false;
-  }
+function hasAnySessions() {
+  return getAllSessionsCount() > 0;
 }
 
 // src/commands/submit.ts
 init_ui();
 function ccgatherToUsageData(data) {
+  const opusCheck = hasOpusUsageInProject(data.dailyUsage);
   return {
     totalTokens: data.usage.totalTokens,
     totalCost: data.usage.totalCost,
@@ -1260,7 +1116,9 @@ function ccgatherToUsageData(data) {
     authMethod: data.account?.authMethod || "unknown",
     rawSubscriptionType: data.account?.rawSubscriptionType || null,
     dailyUsage: data.dailyUsage || [],
-    sessionFingerprint: data.sessionFingerprint
+    sessionFingerprint: data.sessionFingerprint,
+    hasOpusUsage: opusCheck.detected,
+    opusModels: opusCheck.opusModels
   };
 }
 async function submitToServer(data) {
@@ -1285,6 +1143,7 @@ async function submitToServer(data) {
         cacheReadTokens: data.cacheReadTokens,
         cacheWriteTokens: data.cacheWriteTokens,
         daysTracked: data.daysTracked,
+        // Plan info for badge display (not league placement)
         ccplan: data.ccplan,
         rateLimitTier: data.rateLimitTier,
         authMethod: data.authMethod,
@@ -1293,9 +1152,9 @@ async function submitToServer(data) {
         dailyUsage: data.dailyUsage,
         // Session fingerprint for duplicate prevention
         sessionFingerprint: data.sessionFingerprint,
-        // League placement audit trail
-        leagueReason: data.leagueReason,
-        leagueReasonDetails: data.leagueReasonDetails
+        // Opus info for badge display
+        hasOpusUsage: data.hasOpusUsage,
+        opusModels: data.opusModels
       })
     });
     if (!response.ok) {
@@ -1385,6 +1244,20 @@ async function verifyToken() {
     return { valid: false };
   }
 }
+function getPlanColor(plan) {
+  switch (plan.toLowerCase()) {
+    case "max":
+      return colors.max;
+    case "pro":
+      return colors.pro;
+    case "team":
+      return colors.team;
+    case "enterprise":
+      return colors.team;
+    default:
+      return colors.free;
+  }
+}
 async function submit(options) {
   console.log(header("Submit Usage Data", "\u{1F4E4}"));
   const config = getConfig();
@@ -1419,205 +1292,48 @@ async function submit(options) {
   }
   const username = tokenCheck.username || config.get("username");
   verifySpinner.succeed(colors.success(`Authenticated as ${colors.white(username || "unknown")}`));
-  const projectName = getCurrentProjectName();
-  let selectedProjectPath = null;
-  let selectedFolderName = null;
-  let linkSource = null;
-  const savedLink = loadProjectLink();
-  if (savedLink) {
-    selectedProjectPath = savedLink.claudeProjectPath;
-    selectedFolderName = savedLink.folderName;
-    linkSource = "saved";
+  if (!hasAnySessions()) {
     console.log(`
-  ${colors.success("\u2713")} ${colors.muted("Using saved project link:")}`);
-    console.log(`    ${colors.dim(savedLink.folderName)}`);
-  }
-  if (!selectedProjectPath && hasProjectSessions()) {
-    const autoMatchedPath = getProjectPath();
-    if (autoMatchedPath) {
-      selectedProjectPath = autoMatchedPath;
-      selectedFolderName = autoMatchedPath.split(/[/\\]/).pop() || null;
-      linkSource = "auto";
-      console.log(`
-  ${colors.success("\u2713")} ${colors.muted("Auto-matched project:")}`);
-      console.log(`    ${colors.dim(selectedFolderName || projectName)}`);
-      if (selectedFolderName) {
-        saveProjectLink(selectedProjectPath, selectedFolderName);
-        console.log(`    ${colors.dim("(saved to .ccgather)")}`);
-      }
-    }
-  }
-  if (!selectedProjectPath) {
-    const availableProjects = getAllProjectFolders();
-    if (availableProjects.length === 0) {
-      console.log(`
   ${error("No Claude Code sessions found.")}`);
-      console.log();
-      console.log(`  ${colors.muted("This usually means:")}`);
-      console.log(`  ${colors.muted("  \u2022 You haven't used Claude Code yet, or")}`);
-      console.log(`  ${colors.muted("  \u2022 You ran Claude Code but didn't send any messages")}`);
-      console.log();
-      console.log(
-        `  ${colors.warning("\u{1F4A1} Tip:")} ${colors.muted("Sessions are only created after you")}`
-      );
-      console.log(`  ${colors.muted("   send at least one message in Claude Code.")}`);
-      console.log();
-      const debugInfo = getSessionPathDebugInfo();
-      console.log(`  ${colors.dim("\u2500".repeat(40))}`);
-      console.log(`  ${colors.muted("Searched paths:")}`);
-      for (const pathInfo of debugInfo.searchedPaths) {
-        const status = pathInfo.exists ? colors.success("\u2713") : colors.error("\u2717");
-        console.log(`    ${status} ${pathInfo.path}`);
-      }
-      console.log();
-      process.exit(1);
-    }
-    console.log(
-      `
-  ${colors.warning("\u26A0")} ${colors.muted("No session found for current directory:")}`
-    );
-    console.log(`  ${colors.dim(projectName)}`);
+    console.log();
+    console.log(`  ${colors.muted("This usually means:")}`);
+    console.log(`  ${colors.muted("  \u2022 You haven't used Claude Code yet, or")}`);
+    console.log(`  ${colors.muted("  \u2022 You ran Claude Code but didn't send any messages")}`);
     console.log();
     console.log(
-      `  ${colors.muted("Found")} ${colors.white(availableProjects.length.toString())} ${colors.muted("project(s) with Claude Code sessions:")}`
+      `  ${colors.warning("\u{1F4A1} Tip:")} ${colors.muted("Sessions are only created after you")}`
     );
+    console.log(`  ${colors.muted("   send at least one message in Claude Code.")}`);
     console.log();
-    const choices = availableProjects.map((p) => ({
-      name: `${colors.white(p.displayName)} ${colors.dim(`(${p.folderName.slice(0, 40)}${p.folderName.length > 40 ? "..." : ""})`)}`,
-      value: p.fullPath,
-      short: p.displayName
-    }));
-    choices.push({
-      name: colors.dim("Cancel"),
-      value: "__cancel__",
-      short: "Cancel"
-    });
-    const { selectedProject } = await import_inquirer2.default.prompt([
-      {
-        type: "list",
-        name: "selectedProject",
-        message: "Select a project to link with this folder:",
-        choices,
-        loop: false
-      }
-    ]);
-    if (selectedProject === "__cancel__") {
-      console.log(`
-  ${colors.muted("Cancelled.")}
-`);
-      process.exit(0);
-    }
-    selectedProjectPath = selectedProject;
-    const selected = availableProjects.find((p) => p.fullPath === selectedProject);
-    selectedFolderName = selected?.folderName || null;
-    linkSource = "manual";
-    if (selected && selectedProjectPath) {
-      saveProjectLink(selectedProjectPath, selected.folderName);
-      console.log(`
-  ${success(`Linked: ${selected.displayName}`)}`);
-      console.log(`  ${colors.dim("(saved to .ccgather - will auto-use next time)")}`);
+    const debugInfo = getSessionPathDebugInfo();
+    console.log(`  ${colors.dim("\u2500".repeat(40))}`);
+    console.log(`  ${colors.muted("Searched paths:")}`);
+    for (const pathInfo of debugInfo.searchedPaths) {
+      const status = pathInfo.exists ? colors.success("\u2713") : colors.error("\u2717");
+      console.log(`    ${status} ${pathInfo.path}`);
     }
+    console.log();
+    process.exit(1);
   }
-  let usageData = null;
-  const allProjects = getAllProjectFolders();
-  const selectedInfo = allProjects.find((p) => p.fullPath === selectedProjectPath);
-  const displayProjectName = selectedInfo?.displayName || selectedFolderName || projectName;
   console.log(`
-  ${colors.muted("Project:")} ${colors.white(displayProjectName)}`);
-  console.log(`  ${colors.muted("Scanning sessions...")}`);
-  const scannedData = scanUsageDataFromPath(selectedProjectPath, {
+  ${colors.muted("Scanning all Claude Code sessions...")}`);
+  const totalSessions = getAllSessionsCount();
+  console.log(`  ${colors.dim(`Found ${totalSessions} session file(s)`)}`);
+  const scannedData = scanAllProjects({
     onProgress: (current, total) => {
       progressBar(current, total, "Scanning");
     }
   });
   await sleep(200);
-  if (scannedData) {
-    usageData = ccgatherToUsageData(scannedData);
-    console.log(`  ${success("Scan complete!")}`);
-  }
-  if (!usageData) {
+  if (!scannedData) {
     console.log(`
   ${error("No usage data found.")}`);
     console.log(`  ${colors.muted("Make sure you have used Claude Code at least once.")}
 `);
     process.exit(1);
   }
-  const opusCheck = hasOpusUsageInProject(usageData.dailyUsage);
-  const oldDataCheck = hasOldData(usageData.dailyUsage, 30);
-  let finalPlan = usageData.ccplan || "free";
-  let planDetectionReason = "current";
-  if (opusCheck.detected) {
-    finalPlan = "max";
-    planDetectionReason = "opus";
-    console.log(planDetectionSection("Plan Detection", "\u{1F680}"));
-    for (const line of maxVerifiedMessage(opusCheck.opusModels)) {
-      console.log(line);
-    }
-  } else if (oldDataCheck.hasOldData) {
-    planDetectionReason = "user_choice";
-    console.log(planDetectionSection("Past Data Detected", "\u{1F4C5}"));
-    for (const line of pastDataWarningMessage(
-      oldDataCheck.oldestDate || "",
-      oldDataCheck.daysSinceOldest
-    )) {
-      console.log(line);
-    }
-    for (const line of trustMessage()) {
-      console.log(line);
-    }
-    const planChoices = [
-      {
-        name: `${colors.pro("\u26A1")} Pro plan`,
-        value: "pro",
-        short: "Pro"
-      },
-      {
-        name: `${colors.free("\u26AA")} Free plan`,
-        value: "free",
-        short: "Free"
-      },
-      {
-        name: `${colors.dim("?")} Can't remember ${colors.dim("(submit as Free)")}`,
-        value: "free_default",
-        short: "Free (default)"
-      }
-    ];
-    const { selectedPlan } = await import_inquirer2.default.prompt([
-      {
-        type: "list",
-        name: "selectedPlan",
-        message: "Which plan were you using at that time?",
-        choices: planChoices,
-        default: 0
-      }
-    ]);
-    finalPlan = selectedPlan === "free_default" ? "free" : selectedPlan;
-    console.log();
-    console.log(`  ${success(`Selected: ${finalPlan.toUpperCase()}`)}`);
-  } else {
-    planDetectionReason = "current";
-    console.log(
-      `  ${colors.dim("\u{1F4CB} League: reading plan info only (subscriptionType, rateLimitTier)")}`
-    );
-    if (usageData.ccplan) {
-      for (const line of currentPlanMessage(usageData.ccplan)) {
-        console.log(line);
-      }
-    }
-  }
-  usageData.ccplan = finalPlan;
-  usageData.leagueReason = planDetectionReason === "opus" ? "opus" : planDetectionReason === "user_choice" ? "user_choice" : "credential";
-  if (planDetectionReason === "opus") {
-    usageData.leagueReasonDetails = `Opus verified: ${opusCheck.opusModels.join(", ")}`;
-  } else if (planDetectionReason === "user_choice") {
-    usageData.leagueReasonDetails = `User selected: ${finalPlan} (data >${oldDataCheck.daysSinceOldest}d old)`;
-  } else {
-    usageData.leagueReasonDetails = `Credential: ${usageData.ccplan || "free"}`;
-  }
-  usageData.dailyUsage = usageData.dailyUsage.map((daily) => ({
-    ...daily,
-    ccplan: finalPlan
-  }));
+  const usageData = ccgatherToUsageData(scannedData);
+  console.log(`  ${success("Scan complete!")}`);
   console.log();
   const formatDate = (dateStr) => {
     if (!dateStr) return "------";
@@ -1629,21 +1345,31 @@ async function submit(options) {
   };
   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 levelProgress = getLevelProgress(usageData.totalTokens);
+  const currentLevel = levelProgress.current;
   const summaryLines = [
     `${colors.muted("Total Cost")}     ${colors.success(formatCost(usageData.totalCost))}`,
     `${colors.muted("Total Tokens")}   ${colors.primary(formatNumber(usageData.totalTokens))}`,
-    `${colors.muted("Period")}         ${colors.warning(daysTrackedDisplay)}`
+    `${colors.muted("Period")}         ${colors.warning(daysTrackedDisplay)}`,
+    `${colors.muted("Level")}          ${currentLevel.icon} ${currentLevel.color(`${currentLevel.name}`)}`
   ];
   if (usageData.ccplan) {
+    const planColor = getPlanColor(usageData.ccplan);
+    summaryLines.push(
+      `${colors.muted("Plan")}           ${planColor(usageData.ccplan.toUpperCase())} ${colors.dim("(badge)")}`
+    );
+  }
+  if (usageData.hasOpusUsage) {
     summaryLines.push(
-      `${colors.muted("CCplan")}         ${colors.cyan(usageData.ccplan.toUpperCase())}`
+      `${colors.muted("Models")}         ${colors.max("\u2726")} ${colors.max("Opus User")}`
     );
   }
   console.log(createBox(summaryLines));
   console.log();
-  if (usageData.dailyUsage.length > 0) {
-    console.log(`  ${colors.dim(`Daily records: ${usageData.dailyUsage.length} days`)}`);
-  }
+  const projectCount = Object.keys(scannedData.projects).length;
+  console.log(
+    `  ${colors.dim(`Scanned ${projectCount} project(s), ${usageData.dailyUsage.length} day(s) of data`)}`
+  );
   const { confirmSubmit } = await import_inquirer2.default.prompt([
     {
       type: "confirm",
@@ -1687,8 +1413,6 @@ async function submit(options) {
     console.log();
     console.log(sectionHeader("\u2B06\uFE0F", "Level Progress"));
     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)}`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccgather",
-  "version": "1.5.0",
+  "version": "2.0.0",
   "description": "CLI tool for syncing Claude Code usage data to CCgather leaderboard",
   "bin": {
     "ccgather": "dist/index.js",
@@ -12,7 +12,9 @@
     "build": "tsup",
     "dev": "tsup --watch",
     "start": "node dist/index.js",
-    "typecheck": "tsc --noEmit"
+    "typecheck": "tsc --noEmit",
+    "test": "vitest run",
+    "test:watch": "vitest"
   },
   "keywords": [
     "claude",
@@ -39,7 +41,8 @@
     "@types/node": "^22.10.2",
     "@types/update-notifier": "^6.0.8",
     "tsup": "^8.3.5",
-    "typescript": "^5.7.2"
+    "typescript": "^5.7.2",
+    "vitest": "^3.0.0"
   },
   "engines": {
     "node": ">=18"