ccgather 1.2.0 → 1.3.0

package/dist/index.js

@@ -61,7 +61,7 @@ var init_config = __esm({
     "use strict";
     import_conf = __toESM(require("conf"));
     defaults = {
-      apiUrl: "https://ccgather.dev/api",
+      apiUrl: "https://ccgather.com/api",
       autoSync: false,
       syncInterval: 60,
       verbose: false
@@ -106,26 +106,6 @@ async function syncUsage(payload) {
 async function getStatus() {
   return fetchApi("/cli/status");
 }
-async function verifyToken(token) {
-  try {
-    const apiUrl = getApiUrl();
-    const response = await fetch(`${apiUrl}/cli/verify`, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        Authorization: `Bearer ${token}`
-      }
-    });
-    const data = await response.json();
-    if (!response.ok) {
-      return { success: false, error: data.error || "Invalid token" };
-    }
-    return { success: true, data };
-  } catch (error2) {
-    const message = error2 instanceof Error ? error2.message : "Unknown error";
-    return { success: false, error: message };
-  }
-}
 var init_api = __esm({
   "src/lib/api.ts"() {
     "use strict";
@@ -436,7 +416,7 @@ __export(auth_exports, {
 });
 async function auth(options) {
   const config = getConfig();
-  console.log(import_chalk5.default.bold("\n\u{1F310} CCgather Authentication\n"));
+  console.log(import_chalk5.default.bold("\n\u{1F510} CCgather Authentication\n"));
   const existingToken = config.get("apiToken");
   if (existingToken) {
     const { overwrite } = await import_inquirer2.default.prompt([
@@ -452,50 +432,122 @@ async function auth(options) {
       return;
     }
   }
-  let token = options.token;
-  if (!token) {
-    console.log(import_chalk5.default.gray("Get your API token from: https://ccgather.dev/settings/api\n"));
-    const answers = await import_inquirer2.default.prompt([
-      {
-        type: "password",
-        name: "token",
-        message: "Enter your API token:",
-        mask: "*",
-        validate: (input) => {
-          if (!input || input.length < 10) {
-            return "Please enter a valid API token";
-          }
-          return true;
+  if (options.token) {
+    await authenticateWithToken(options.token);
+    return;
+  }
+  const apiUrl = getApiUrl();
+  const spinner = (0, import_ora7.default)("Initializing authentication...").start();
+  try {
+    const response = await fetch(`${apiUrl}/cli/auth/device`, {
+      method: "POST"
+    });
+    if (!response.ok) {
+      spinner.fail(import_chalk5.default.red("Failed to initialize authentication"));
+      console.log(import_chalk5.default.red("\nPlease check your internet connection and try again."));
+      process.exit(1);
+    }
+    const deviceData = await response.json();
+    spinner.stop();
+    console.log(import_chalk5.default.gray("  Opening browser for authentication...\n"));
+    console.log(import_chalk5.default.gray("  If browser doesn't open, visit:"));
+    console.log(`  \u{1F517} ${import_chalk5.default.cyan.underline(deviceData.verification_uri_complete)}`);
+    console.log();
+    try {
+      await (0, import_open.default)(deviceData.verification_uri_complete);
+    } catch {
+      console.log(import_chalk5.default.yellow("  Could not open browser automatically."));
+      console.log(import_chalk5.default.yellow("  Please open the URL above manually."));
+    }
+    const pollSpinner = (0, import_ora7.default)("Waiting for authorization...").start();
+    const startTime = Date.now();
+    const expiresAt = startTime + deviceData.expires_in * 1e3;
+    const pollInterval = Math.max(deviceData.interval * 1e3, 5e3);
+    while (Date.now() < expiresAt) {
+      await sleep(pollInterval);
+      try {
+        const pollResponse = await fetch(
+          `${apiUrl}/cli/auth/device/poll?device_code=${deviceData.device_code}`
+        );
+        const pollData = await pollResponse.json();
+        if (pollData.status === "authorized" && pollData.token) {
+          pollSpinner.succeed(import_chalk5.default.green("Authentication successful!"));
+          config.set("apiToken", pollData.token);
+          config.set("userId", pollData.userId);
+          config.set("username", pollData.username);
+          console.log(import_chalk5.default.gray(`
+Welcome, ${import_chalk5.default.white(pollData.username)}!`));
+          console.log(import_chalk5.default.gray("\nYou can now submit your usage data:"));
+          console.log(import_chalk5.default.cyan("  npx ccgather submit\n"));
+          return;
+        }
+        if (pollData.status === "expired" || pollData.status === "used") {
+          pollSpinner.fail(import_chalk5.default.red("Authentication expired or already used"));
+          console.log(import_chalk5.default.gray('\nPlease run "ccgather auth" to try again.\n'));
+          process.exit(1);
         }
+        const remaining = Math.ceil((expiresAt - Date.now()) / 1e3);
+        pollSpinner.text = `Waiting for authorization... (${remaining}s remaining)`;
+      } catch {
       }
-    ]);
-    token = answers.token;
+    }
+    pollSpinner.fail(import_chalk5.default.red("Authentication timed out"));
+    console.log(import_chalk5.default.gray('\nPlease run "ccgather auth" to try again.\n'));
+    process.exit(1);
+  } catch (error2) {
+    spinner.fail(import_chalk5.default.red("Authentication failed"));
+    console.log(import_chalk5.default.red(`
+Error: ${error2 instanceof Error ? error2.message : "Unknown error"}`));
+    process.exit(1);
   }
+}
+async function authenticateWithToken(token) {
+  const config = getConfig();
+  const apiUrl = getApiUrl();
   const spinner = (0, import_ora7.default)("Verifying token...").start();
-  const result = await verifyToken(token);
-  if (!result.success) {
+  try {
+    const response = await fetch(`${apiUrl}/cli/verify`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${token}`
+      }
+    });
+    if (!response.ok) {
+      spinner.fail(import_chalk5.default.red("Authentication failed"));
+      const errorData = await response.json().catch(() => ({}));
+      console.log(import_chalk5.default.red(`Error: ${errorData.error || "Invalid token"}`));
+      console.log(import_chalk5.default.gray("\nMake sure your token is correct and try again."));
+      process.exit(1);
+    }
+    const data = await response.json();
+    config.set("apiToken", token);
+    config.set("userId", data.userId);
+    config.set("username", data.username);
+    spinner.succeed(import_chalk5.default.green("Authentication successful!"));
+    console.log(import_chalk5.default.gray(`
+Welcome, ${import_chalk5.default.white(data.username)}!`));
+    console.log(import_chalk5.default.gray("\nNext step: Submit your usage data:"));
+    console.log(import_chalk5.default.cyan("  npx ccgather submit\n"));
+  } catch (error2) {
     spinner.fail(import_chalk5.default.red("Authentication failed"));
-    console.log(import_chalk5.default.red(`Error: ${result.error}`));
-    console.log(import_chalk5.default.gray("\nMake sure your token is correct and try again."));
+    console.log(import_chalk5.default.red(`
+Error: ${error2 instanceof Error ? error2.message : "Unknown error"}`));
     process.exit(1);
   }
-  config.set("apiToken", token);
-  config.set("userId", result.data?.userId);
-  spinner.succeed(import_chalk5.default.green("Authentication successful!"));
-  console.log(import_chalk5.default.gray(`
-Welcome, ${import_chalk5.default.white(result.data?.username)}!`));
-  console.log(import_chalk5.default.gray("\nNext step: Sync your usage data:"));
-  console.log(import_chalk5.default.cyan("  npx ccgather sync\n"));
 }
-var import_chalk5, import_ora7, import_inquirer2;
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+var import_chalk5, import_ora7, import_inquirer2, import_open;
 var init_auth = __esm({
   "src/commands/auth.ts"() {
     "use strict";
     import_chalk5 = __toESM(require("chalk"));
     import_ora7 = __toESM(require("ora"));
     import_inquirer2 = __toESM(require("inquirer"));
+    import_open = __toESM(require("open"));
     init_config();
-    init_api();
   }
 });
 
@@ -531,13 +583,13 @@ function mapSubscriptionToCCPlan(subscriptionType) {
   if (type === "max" || type.includes("max")) {
     return "max";
   }
-  if (type === "team" || type === "enterprise") {
-    return "team";
-  }
   if (type === "pro") {
     return "pro";
   }
-  return "free";
+  if (type === "free") {
+    return "free";
+  }
+  return type;
 }
 function readCredentials() {
   const credentialsPath = getCredentialsPath();
@@ -624,11 +676,19 @@ function estimateCost(model, inputTokens, outputTokens) {
   const outputCost = outputTokens / 1e6 * price.output;
   return Math.round((inputCost + outputCost) * 100) / 100;
 }
-function scanUsageData() {
+function scanUsageData(options = {}) {
   const projectsDir = getClaudeProjectsDir();
   if (!fs2.existsSync(projectsDir)) {
     return null;
   }
+  const days = options.days ?? 30;
+  let cutoffDate = null;
+  if (days > 0) {
+    const cutoff = /* @__PURE__ */ new Date();
+    cutoff.setDate(cutoff.getDate() - days);
+    cutoff.setHours(0, 0, 0, 0);
+    cutoffDate = cutoff.toISOString();
+  }
   let totalInputTokens = 0;
   let totalOutputTokens = 0;
   let totalCacheRead = 0;
@@ -661,6 +721,9 @@ function scanUsageData() {
         try {
           const event = JSON.parse(line);
           if (event.type === "assistant" && event.message?.usage) {
+            if (cutoffDate && event.timestamp && event.timestamp < cutoffDate) {
+              continue;
+            }
             const usage = event.message.usage;
             const model = event.message.model || "unknown";
             const inputTokens = usage.input_tokens || 0;
@@ -773,8 +836,8 @@ function writeCCGatherJson(data) {
   }
   fs2.writeFileSync(jsonPath, JSON.stringify(data, null, 2));
 }
-function scanAndSave() {
-  const data = scanUsageData();
+function scanAndSave(options = {}) {
+  const data = scanUsageData(options);
   if (data) {
     writeCCGatherJson(data);
   }
@@ -876,10 +939,10 @@ function getRankMedal(rank) {
 function getCCplanBadge(ccplan) {
   if (!ccplan) return "";
   const badges = {
-    max: `${colors.max("\u{1F947} MAX")}`,
-    pro: `${colors.pro("\u{1F948} PRO")}`,
-    team: `${colors.team("\u{1F3E2} TEAM")}`,
-    free: `${colors.free("\u2B50 FREE")}`
+    max: `${colors.max("\u{1F680} MAX")}`,
+    pro: `${colors.pro("\u26A1 PRO")}`,
+    team: `${colors.team("\u{1F465} TEAM")}`,
+    free: `${colors.free("\u26AA FREE")}`
   };
   return badges[ccplan.toLowerCase()] || "";
 }
@@ -904,9 +967,7 @@ function getLevelInfo(tokens) {
 function createWelcomeBox(user) {
   const levelInfo = user.level && user.levelName && user.levelIcon ? `${user.levelIcon} Level ${user.level} \u2022 ${user.levelName}` : "";
   const ccplanBadge = user.ccplan ? getCCplanBadge(user.ccplan) : "";
-  const lines = [
-    `\u{1F44B} ${colors.white.bold(`Welcome back, ${user.username}!`)}`
-  ];
+  const lines = [`\u{1F44B} ${colors.white.bold(`Welcome back, ${user.username}!`)}`];
   if (levelInfo || ccplanBadge) {
     lines.push(`${levelInfo}${ccplanBadge ? `  ${ccplanBadge}` : ""}`);
   }
@@ -1001,34 +1062,21 @@ function calculateDaysTracked(data) {
   }
   return 1;
 }
-async function detectGitHubUsername() {
-  try {
-    const { execSync } = await import("child_process");
-    try {
-      const username = execSync("git config --get user.name", { encoding: "utf-8" }).trim();
-      if (username) return username;
-    } catch {
-    }
-    try {
-      const remote = execSync("git remote get-url origin", { encoding: "utf-8" }).trim();
-      const match = remote.match(/github\.com[:/]([^/]+)/);
-      if (match) return match[1];
-    } catch {
-    }
-  } catch {
-  }
-  return null;
-}
-async function submitToServer(username, data) {
+async function submitToServer(data) {
   const apiUrl = getApiUrl();
+  const config = getConfig();
+  const apiToken = config.get("apiToken");
+  if (!apiToken) {
+    return { success: false, error: "Not authenticated. Please run 'ccgather auth' first." };
+  }
   try {
     const response = await fetch(`${apiUrl}/cli/submit`, {
       method: "POST",
       headers: {
-        "Content-Type": "application/json"
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${apiToken}`
       },
       body: JSON.stringify({
-        username,
         totalTokens: data.totalTokens,
         totalSpent: data.totalCost,
         inputTokens: data.inputTokens,
@@ -1052,29 +1100,21 @@ async function submitToServer(username, data) {
   }
 }
 async function submit(options) {
-  printCompactHeader("1.2.0");
+  printCompactHeader("1.2.1");
   console.log(header("Submit Usage Data", "\u{1F4E4}"));
-  const spinner = (0, import_ora.default)({
-    text: "Detecting GitHub username...",
-    color: "cyan"
-  }).start();
-  let username = await detectGitHubUsername();
-  spinner.stop();
+  if (!isAuthenticated()) {
+    console.log(`
+  ${error("Not authenticated.")}`);
+    console.log(`  ${colors.muted("Please run:")} ${colors.white("npx ccgather auth")}
+`);
+    process.exit(1);
+  }
+  const config = getConfig();
+  const username = config.get("username");
   if (username) {
     console.log(`
-  ${colors.muted("Detected:")} ${colors.white(username)}`);
+  ${colors.muted("Logged in as:")} ${colors.white(username)}`);
   }
-  const inquirer4 = await import("inquirer");
-  const { confirmedUsername } = await inquirer4.default.prompt([
-    {
-      type: "input",
-      name: "confirmedUsername",
-      message: colors.muted("GitHub username:"),
-      default: username || "",
-      validate: (input) => input.trim().length > 0 || "Username is required"
-    }
-  ]);
-  username = confirmedUsername.trim();
   let usageData = null;
   let dataSource = "";
   const ccgatherData = readCCGatherJson();
@@ -1083,7 +1123,9 @@ async function submit(options) {
     dataSource = "ccgather.json";
     console.log(`
   ${success(`Found ${dataSource}`)}`);
-    console.log(`  ${colors.dim(`Last scanned: ${new Date(ccgatherData.lastScanned).toLocaleString()}`)}`);
+    console.log(
+      `  ${colors.dim(`Last scanned: ${new Date(ccgatherData.lastScanned).toLocaleString()}`)}`
+    );
     if (usageData.ccplan) {
       console.log(`  ${colors.dim("CCplan:")} ${colors.primary(usageData.ccplan.toUpperCase())}`);
     }
@@ -1091,6 +1133,7 @@ async function submit(options) {
   if (!usageData) {
     const ccJsonPath = findCcJson();
     if (ccJsonPath) {
+      const inquirer4 = await import("inquirer");
       const { useCcJson } = await inquirer4.default.prompt([
         {
           type: "confirm",
@@ -1132,6 +1175,25 @@ async function submit(options) {
     console.log(`
   ${success(`Using ${dataSource}`)}`);
   }
+  if (!usageData.ccplan) {
+    const inquirer4 = await import("inquirer");
+    const { selectedCCplan } = await inquirer4.default.prompt([
+      {
+        type: "list",
+        name: "selectedCCplan",
+        message: colors.muted("Select your Claude plan:"),
+        choices: [
+          { name: "\u{1F680} Max", value: "max" },
+          { name: "\u26A1 Pro", value: "pro" },
+          { name: "\u26AA Free", value: "free" },
+          { name: "\u{1F465} Team / Enterprise", value: "team" },
+          { name: "\u23ED\uFE0F  Skip", value: null }
+        ],
+        default: "free"
+      }
+    ]);
+    usageData.ccplan = selectedCCplan;
+  }
   console.log();
   const summaryLines = [
     `${colors.muted("Total Cost")}     ${colors.success(formatCost(usageData.totalCost))}`,
@@ -1139,11 +1201,14 @@ async function submit(options) {
     `${colors.muted("Days Tracked")}   ${colors.warning(usageData.daysTracked.toString())}`
   ];
   if (usageData.ccplan) {
-    summaryLines.push(`${colors.muted("CCplan")}         ${colors.cyan(usageData.ccplan.toUpperCase())}`);
+    summaryLines.push(
+      `${colors.muted("CCplan")}         ${colors.cyan(usageData.ccplan.toUpperCase())}`
+    );
   }
   console.log(createBox(summaryLines));
   console.log();
   if (!options.yes) {
+    const inquirer4 = await import("inquirer");
     const { confirmSubmit } = await inquirer4.default.prompt([
       {
         type: "confirm",
@@ -1163,27 +1228,31 @@ async function submit(options) {
     text: "Submitting to CCgather...",
     color: "cyan"
   }).start();
-  const result = await submitToServer(username, usageData);
+  const result = await submitToServer(usageData);
   if (result.success) {
     submitSpinner.succeed(colors.success("Successfully submitted to CCgather!"));
     console.log();
     const successLines = [
       `${colors.success("\u2713")} ${colors.white.bold("Submission Complete!")}`,
       "",
-      `${colors.muted("Profile:")} ${link(result.profileUrl || `https://ccgather.dev/u/${username}`)}`
+      `${colors.muted("Profile:")} ${link(result.profileUrl || `https://ccgather.com/u/${username}`)}`
     ];
     if (result.rank) {
       successLines.push(`${colors.muted("Rank:")}    ${colors.warning(`#${result.rank}`)}`);
     }
     console.log(createBox(successLines));
     console.log();
-    console.log(`  ${colors.dim("View leaderboard:")} ${link("https://ccgather.dev/leaderboard")}`);
+    console.log(`  ${colors.dim("View leaderboard:")} ${link("https://ccgather.com/leaderboard")}`);
     console.log();
   } else {
     submitSpinner.fail(colors.error("Failed to submit"));
     console.log(`
-  ${error(result.error || "Unknown error")}
-`);
+  ${error(result.error || "Unknown error")}`);
+    if (result.error?.includes("auth") || result.error?.includes("token")) {
+      console.log(`
+  ${colors.muted("Try running:")} ${colors.white("npx ccgather auth")}`);
+    }
+    console.log();
     process.exit(1);
   }
 }
@@ -1226,7 +1295,7 @@ async function status(options) {
     return;
   }
   spinner?.succeed(colors.success("Status retrieved"));
-  printCompactHeader("1.2.0");
+  printCompactHeader("1.2.1");
   console.log(header("Your CCgather Stats", "\u{1F4CA}"));
   const levelInfo = getLevelInfo(stats.totalTokens);
   const medal = getRankMedal(stats.rank);
@@ -1234,7 +1303,9 @@ async function status(options) {
   console.log(`  ${medal} ${colors.white.bold(`Rank #${stats.rank}`)}`);
   console.log(`  ${colors.dim(`Top ${stats.percentile.toFixed(1)}% of all users`)}`);
   console.log();
-  console.log(`  ${levelInfo.icon} ${levelInfo.color(`Level ${levelInfo.level} \u2022 ${levelInfo.name}`)}`);
+  console.log(
+    `  ${levelInfo.icon} ${levelInfo.color(`Level ${levelInfo.level} \u2022 ${levelInfo.name}`)}`
+  );
   if (stats.tier) {
     const badge = getCCplanBadge(stats.tier);
     if (badge) {
@@ -1273,8 +1344,8 @@ function getClaudeSettingsDir2() {
   return path5.join(os5.homedir(), ".claude");
 }
 async function openBrowser(url) {
-  const { default: open } = await import("open");
-  await open(url);
+  const { default: open2 } = await import("open");
+  await open2(url);
 }
 function createCallbackServer() {
   return new Promise((resolve, reject) => {
@@ -1655,8 +1726,12 @@ function displayResults(data) {
     `${colors.muted("Output Tokens")}   ${colors.white(formatNumber(data.usage.outputTokens))}`
   ];
   if (data.usage.cacheReadTokens > 0 || data.usage.cacheWriteTokens > 0) {
-    usageLines.push(`${colors.muted("Cache Read")}      ${colors.dim(formatNumber(data.usage.cacheReadTokens))}`);
-    usageLines.push(`${colors.muted("Cache Write")}     ${colors.dim(formatNumber(data.usage.cacheWriteTokens))}`);
+    usageLines.push(
+      `${colors.muted("Cache Read")}      ${colors.dim(formatNumber(data.usage.cacheReadTokens))}`
+    );
+    usageLines.push(
+      `${colors.muted("Cache Write")}     ${colors.dim(formatNumber(data.usage.cacheWriteTokens))}`
+    );
   }
   console.log(createBox(usageLines));
   console.log();
@@ -1684,7 +1759,9 @@ function displayResults(data) {
     const sortedModels = Object.entries(data.models).sort(([, a], [, b]) => b - a).slice(0, 5);
     for (const [model, tokens] of sortedModels) {
       const shortModel = model.replace("claude-", "").substring(0, 20);
-      console.log(`  ${colors.dim("\u2022")} ${colors.white(shortModel.padEnd(22))} ${colors.primary(formatNumber(tokens))}`);
+      console.log(
+        `  ${colors.dim("\u2022")} ${colors.white(shortModel.padEnd(22))} ${colors.primary(formatNumber(tokens))}`
+      );
     }
     if (Object.keys(data.models).length > 5) {
       console.log(`  ${colors.dim(`... and ${Object.keys(data.models).length - 5} more models`)}`);
@@ -1702,7 +1779,9 @@ function displayResults(data) {
       );
     }
     if (Object.keys(data.projects).length > 5) {
-      console.log(`  ${colors.dim(`... and ${Object.keys(data.projects).length - 5} more projects`)}`);
+      console.log(
+        `  ${colors.dim(`... and ${Object.keys(data.projects).length - 5} more projects`)}`
+      );
     }
   }
   console.log();
@@ -1710,14 +1789,28 @@ function displayResults(data) {
   console.log(`  ${colors.muted("Saved to:")} ${colors.dim(getCCGatherJsonPath())}`);
   console.log();
 }
-async function scan() {
-  printCompactHeader("1.2.0");
+async function scan(options = {}) {
+  printCompactHeader("1.2.1");
   console.log(header("Scan Claude Code Usage", "\u{1F50D}"));
+  let days;
+  if (options.all) {
+    days = 0;
+    console.log(`  ${colors.muted("Mode:")} ${colors.primary("All time")} (no date limit)
+`);
+  } else if (options.days) {
+    days = options.days;
+    console.log(`  ${colors.muted("Mode:")} ${colors.primary(`Last ${days} days`)}
+`);
+  } else {
+    days = 30;
+    console.log(`  ${colors.muted("Mode:")} ${colors.primary("Last 30 days")} (default)
+`);
+  }
   const spinner = (0, import_ora5.default)({
     text: "Scanning JSONL files...",
     color: "cyan"
   }).start();
-  const data = scanAndSave();
+  const data = scanAndSave({ days });
   if (!data) {
     spinner.fail(colors.error("No usage data found"));
     console.log();
@@ -1732,15 +1825,20 @@ async function scan() {
   displayResults(data);
   console.log(`  ${colors.muted("Next:")} Run ${colors.white("npx ccgather")} to submit your data`);
   console.log();
+  console.log(colors.dim("  \u2500".repeat(25)));
+  console.log(
+    `  ${colors.muted("Tip:")} Use ${colors.white("--all")} for all-time data or ${colors.white("--days <n>")} for custom range`
+  );
+  console.log();
 }
 
 // src/index.ts
 init_config();
 init_api();
-var VERSION = "1.2.0";
+var VERSION = "1.2.1";
 var program = new import_commander.Command();
 program.name("ccgather").description("Submit your Claude Code usage to the CCgather leaderboard").version(VERSION).option("-y, --yes", "Skip confirmation prompt").option("--auto", "Enable automatic sync on session end").option("--manual", "Disable automatic sync").option("--no-menu", "Skip interactive menu (direct submit)");
-program.command("scan").description("Scan Claude Code usage and create ccgather.json").action(scan);
+program.command("scan").description("Scan Claude Code usage and create ccgather.json").option("-a, --all", "Scan all-time usage (no date limit)").option("-d, --days <number>", "Number of days to scan (default: 30)", parseInt).action((opts) => scan(opts));
 program.command("rank").description("View your current rank and stats").action(() => status({ json: false }));
 program.command("status").description("View your current rank and stats").option("--json", "Output as JSON").action((opts) => status(opts));
 program.command("sync").description("Sync usage data to CCgather").action(async () => {
@@ -1757,6 +1855,25 @@ program.command("reset").description("Remove auto-sync hook and clear config").a
 });
 async function showInteractiveMenu() {
   printHeader(VERSION);
+  if (!isAuthenticated()) {
+    console.log(colors.warning("\n  \u{1F510} Authentication required\n"));
+    console.log(colors.dim("  To submit your Claude Code usage, you need to log in first.\n"));
+    const { startAuth } = await import_inquirer3.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();
+    } else {
+      console.log(colors.dim("\n  You can authenticate later by running: npx ccgather auth\n"));
+    }
+  }
   if (isAuthenticated()) {
     try {
       const result = await getStatus();
@@ -1776,8 +1893,6 @@ async function showInteractiveMenu() {
       }
     } catch {
     }
-  } else {
-    console.log(colors.dim('  Not logged in. Run "ccgather auth" to authenticate.\n'));
   }
   const { action } = await import_inquirer3.default.prompt([
     {
@@ -1891,10 +2006,18 @@ async function showSettingsMenu() {
       console.log();
       console.log(colors.muted("  Current Configuration:"));
       console.log(colors.dim("  \u2500".repeat(25)));
-      console.log(`  ${colors.muted("Username:")}    ${config.get("username") || colors.dim("(not set)")}`);
-      console.log(`  ${colors.muted("API Token:")}   ${config.get("apiToken") ? colors.success("\u2713 Set") : colors.error("\u2717 Not set")}`);
-      console.log(`  ${colors.muted("Auto-sync:")}   ${config.get("autoSync") ? colors.success("Enabled") : colors.dim("Disabled")}`);
-      console.log(`  ${colors.muted("Last Sync:")}   ${config.get("lastSync") || colors.dim("Never")}`);
+      console.log(
+        `  ${colors.muted("Username:")}    ${config.get("username") || colors.dim("(not set)")}`
+      );
+      console.log(
+        `  ${colors.muted("API Token:")}   ${config.get("apiToken") ? colors.success("\u2713 Set") : colors.error("\u2717 Not set")}`
+      );
+      console.log(
+        `  ${colors.muted("Auto-sync:")}   ${config.get("autoSync") ? colors.success("Enabled") : colors.dim("Disabled")}`
+      );
+      console.log(
+        `  ${colors.muted("Last Sync:")}   ${config.get("lastSync") || colors.dim("Never")}`
+      );
       console.log();
       await promptContinue();
       await showSettingsMenu();
@@ -1908,22 +2031,30 @@ function showHelp() {
   console.log(colors.primary.bold("  CCgather CLI Commands"));
   console.log(colors.dim("  \u2500".repeat(25)));
   console.log();
-  console.log(`  ${colors.white("npx ccgather")}          Interactive menu (default)`);
-  console.log(`  ${colors.white("npx ccgather scan")}     Scan local Claude Code usage`);
-  console.log(`  ${colors.white("npx ccgather rank")}     View your current rank`);
-  console.log(`  ${colors.white("npx ccgather sync")}     Sync usage data`);
-  console.log(`  ${colors.white("npx ccgather auth")}     Authenticate with CCgather`);
-  console.log(`  ${colors.white("npx ccgather reset")}    Reset all settings`);
+  console.log(`  ${colors.white("npx ccgather")}              Interactive menu (default)`);
+  console.log(
+    `  ${colors.white("npx ccgather scan")}         Scan local Claude Code usage (last 30 days)`
+  );
+  console.log(`  ${colors.white("npx ccgather scan --all")}   Scan all-time usage (no date limit)`);
+  console.log(`  ${colors.white("npx ccgather scan -d 90")}   Scan last 90 days of usage`);
+  console.log(`  ${colors.white("npx ccgather rank")}         View your current rank`);
+  console.log(`  ${colors.white("npx ccgather sync")}         Sync usage data`);
+  console.log(`  ${colors.white("npx ccgather auth")}         Authenticate with CCgather`);
+  console.log(`  ${colors.white("npx ccgather reset")}        Reset all settings`);
   console.log();
   console.log(colors.dim("  \u2500".repeat(25)));
-  console.log(`  ${colors.muted("Options:")}`);
+  console.log(`  ${colors.muted("Scan Options:")}`);
+  console.log(`  ${colors.white("-a, --all")}             Scan all-time usage (no date limit)`);
+  console.log(`  ${colors.white("-d, --days <n>")}        Scan last N days (default: 30)`);
+  console.log();
+  console.log(`  ${colors.muted("General Options:")}`);
   console.log(`  ${colors.white("-y, --yes")}             Skip confirmation prompts`);
   console.log(`  ${colors.white("--auto")}                Enable auto-sync`);
   console.log(`  ${colors.white("--manual")}              Disable auto-sync`);
   console.log(`  ${colors.white("--no-menu")}             Skip interactive menu`);
   console.log();
-  console.log(`  ${colors.muted("Documentation:")} ${link("https://ccgather.dev/docs")}`);
-  console.log(`  ${colors.muted("Leaderboard:")}   ${link("https://ccgather.dev/leaderboard")}`);
+  console.log(`  ${colors.muted("Documentation:")} ${link("https://ccgather.com/docs")}`);
+  console.log(`  ${colors.muted("Leaderboard:")}   ${link("https://ccgather.com/leaderboard")}`);
   console.log();
 }
 async function promptContinue() {

package/package.json

@@ -1,51 +1,51 @@
-{
-  "name": "ccgather",
-  "version": "1.2.0",
-  "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 src/index.ts --format cjs --dts",
-    "dev": "tsup src/index.ts --format cjs --dts --watch",
-    "start": "node dist/index.js",
-    "typecheck": "tsc --noEmit"
-  },
-  "keywords": [
-    "claude",
-    "anthropic",
-    "claude-code",
-    "ccgather",
-    "leaderboard",
-    "cli"
-  ],
-  "author": "",
-  "license": "MIT",
-  "dependencies": {
-    "chalk": "^5.3.0",
-    "commander": "^12.1.0",
-    "conf": "^13.0.1",
-    "inquirer": "^10.2.2",
-    "open": "^10.1.0",
-    "ora": "^8.1.0"
-  },
-  "devDependencies": {
-    "@types/inquirer": "^9.0.7",
-    "@types/node": "^22.10.2",
-    "tsup": "^8.3.5",
-    "typescript": "^5.7.2"
-  },
-  "engines": {
-    "node": ">=18"
-  },
-  "files": [
-    "dist"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/DHxYoon/CCgather"
-  }
-}
+{
+  "name": "ccgather",
+  "version": "1.3.0",
+  "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 src/index.ts --format cjs --dts",
+    "dev": "tsup src/index.ts --format cjs --dts --watch",
+    "start": "node dist/index.js",
+    "typecheck": "tsc --noEmit"
+  },
+  "keywords": [
+    "claude",
+    "anthropic",
+    "claude-code",
+    "ccgather",
+    "leaderboard",
+    "cli"
+  ],
+  "author": "",
+  "license": "MIT",
+  "dependencies": {
+    "chalk": "^5.3.0",
+    "commander": "^12.1.0",
+    "conf": "^13.0.1",
+    "inquirer": "^10.2.2",
+    "open": "^10.1.0",
+    "ora": "^8.1.0"
+  },
+  "devDependencies": {
+    "@types/inquirer": "^9.0.7",
+    "@types/node": "^22.10.2",
+    "tsup": "^8.3.5",
+    "typescript": "^5.7.2"
+  },
+  "engines": {
+    "node": ">=18"
+  },
+  "files": [
+    "dist"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/DHxYoon/CCgather.git"
+  }
+}