ccgather 1.3.47 → 1.3.49

package/dist/index.js

@@ -40,13 +40,6 @@ function getConfig() {
   }
   return configInstance;
 }
-function resetConfig() {
-  const config = getConfig();
-  config.clear();
-  Object.entries(defaults).forEach(([key, value]) => {
-    config.set(key, value);
-  });
-}
 function isAuthenticated() {
   const config = getConfig();
   return !!config.get("apiToken");
@@ -75,7 +68,7 @@ function hyperlink(text, url) {
   return `\x1B]8;;${url}\x07${text}\x1B]8;;\x07`;
 }
 function centerText(text, width) {
-  const len = stripAnsi(text).length;
+  const len = getDisplayWidth(text);
   const pad = width - len;
   return " ".repeat(Math.max(0, Math.floor(pad / 2))) + text + " ".repeat(Math.max(0, pad - Math.floor(pad / 2)));
 }
@@ -85,13 +78,13 @@ function createProfessionalHeader() {
   const h = boxRound.horizontal;
   lines.push(colors.dim(`  ${boxRound.topLeft}${h.repeat(HEADER_WIDTH)}${boxRound.topRight}`));
   const logoLines = [
-    `  ${colors.primary("\u2584\u2588\u2580\u2580 \u2584\u2588\u2580\u2580")} ${colors.secondary("\u2584\u2588\u2580\u2580  \u2584\u2588\u2580\u2588\u2584 \u2580\u2588\u2580 \u2588  \u2588 \u2588\u2580\u2580 \u2588\u2580\u2588")}  `,
-    `  ${colors.primary("\u2588    \u2588   ")} ${colors.secondary("\u2588  \u2580\u2588 \u2588\u2580\u2580\u2588\u2580  \u2588  \u2588\u2580\u2580\u2588 \u2588\u2580\u2580 \u2588\u2588\u2580")}  `,
-    `  ${colors.primary("\u2580\u2588\u2584\u2584 \u2580\u2588\u2584\u2584")} ${colors.secondary("\u2580\u2588\u2584\u2584\u2580 \u2588  \u2588   \u2588  \u2588  \u2588 \u2588\u2584\u2584 \u2588 \u2588")}  `
+    `${colors.primary("\u2584\u2588\u2580\u2580 \u2584\u2588\u2580\u2580")} ${colors.secondary("\u2584\u2588\u2580\u2580  \u2584\u2588\u2580\u2588\u2584 \u2580\u2588\u2580 \u2588  \u2588 \u2588\u2580\u2580 \u2588\u2580\u2588")}`,
+    `${colors.primary("\u2588    \u2588   ")} ${colors.secondary("\u2588  \u2580\u2588 \u2588\u2580\u2580\u2588\u2580  \u2588  \u2588\u2580\u2580\u2588 \u2588\u2580\u2580 \u2588\u2588\u2580")}`,
+    `${colors.primary("\u2580\u2588\u2584\u2584 \u2580\u2588\u2584\u2584")} ${colors.secondary("\u2580\u2588\u2584\u2584\u2580 \u2588  \u2588   \u2588  \u2588  \u2588 \u2588\u2584\u2584 \u2588 \u2588")}`
   ];
   for (const l of logoLines) {
     lines.push(
-      colors.dim(`  ${v}`) + l + " ".repeat(Math.max(0, HEADER_WIDTH - stripAnsi(l).length)) + colors.dim(v)
+      colors.dim(`  ${v}`) + centerText(l, HEADER_WIDTH) + colors.dim(v)
     );
   }
   const versionStr = `v${VERSION}`;
@@ -118,7 +111,7 @@ function createProfessionalHeader() {
 }
 function createBox(lines, width = 47) {
   const paddedLines = lines.map((line) => {
-    const visibleLength = stripAnsi(line).length;
+    const visibleLength = getDisplayWidth(line);
     const padding = width - 2 - visibleLength;
     return `${box.vertical} ${line}${" ".repeat(Math.max(0, padding))} ${box.vertical}`;
   });
@@ -126,8 +119,14 @@ function createBox(lines, width = 47) {
   const bottom = colors.dim(`  ${box.bottomLeft}${box.horizontal.repeat(width)}${box.bottomRight}`);
   return [top, ...paddedLines.map((l) => colors.dim("  ") + l), bottom].join("\n");
 }
-function stripAnsi(str) {
-  return str.replace(/\x1B\[[0-9;]*[a-zA-Z]/g, "");
+function getDisplayWidth(str) {
+  let width = (0, import_string_width.default)(str);
+  const flagRegex = /[🇦-🇿][🇦-🇿]/gu;
+  const flags = str.match(flagRegex);
+  if (flags) {
+    width += flags.length * 2 * 2;
+  }
+  return width;
 }
 function header(title, icon = "") {
   const iconPart = icon ? `${icon} ` : "";
@@ -203,8 +202,7 @@ function getLevelProgress(tokens) {
 }
 function countryCodeToFlag(countryCode) {
   if (!countryCode || countryCode.length !== 2) return "\u{1F310}";
-  const codePoints = countryCode.toUpperCase().split("").map((char) => 127462 + char.charCodeAt(0) - 65);
-  return String.fromCodePoint(...codePoints);
+  return countryCode.toUpperCase();
 }
 function success(message) {
   return `${colors.success("\u2713")} ${message}`;
@@ -361,7 +359,7 @@ async function printAnimatedWelcomeBox(user) {
     const flag = countryCodeToFlag(user.countryCode);
     lines.push(`${flag} Country Rank: ${colors.primary(`#${user.countryRank}`)}`);
   }
-  const maxVisibleLength = Math.max(...lines.map((l) => stripAnsi(l).length));
+  const maxVisibleLength = Math.max(...lines.map((l) => getDisplayWidth(l)));
   const boxWidth = Math.max(maxVisibleLength + 4, 47);
   const top = colors.dim(`  ${box.topLeft}${box.horizontal.repeat(boxWidth)}${box.topRight}`);
   const bottom = colors.dim(
@@ -370,7 +368,7 @@ async function printAnimatedWelcomeBox(user) {
   console.log(top);
   await sleep(20);
   for (const line of lines) {
-    const visibleLength = stripAnsi(line).length;
+    const visibleLength = getDisplayWidth(line);
     const padding = boxWidth - 2 - visibleLength;
     const paddedLine = `${box.vertical} ${line}${" ".repeat(Math.max(0, padding))} ${box.vertical}`;
     console.log(colors.dim("  ") + paddedLine);
@@ -378,12 +376,13 @@ async function printAnimatedWelcomeBox(user) {
   }
   console.log(bottom);
 }
-var import_chalk, VERSION, colors, LOGO, LOGO_COMPACT, TAGLINE, SLOGAN, boxRound, box, HEADER_WIDTH, LEVELS;
+var import_chalk, import_string_width, VERSION, colors, LOGO, LOGO_COMPACT, TAGLINE, SLOGAN, boxRound, box, HEADER_WIDTH, LEVELS;
 var init_ui = __esm({
   "src/lib/ui.ts"() {
     "use strict";
     import_chalk = __toESM(require("chalk"));
-    VERSION = true ? "1.3.47" : "0.0.0";
+    import_string_width = __toESM(require("string-width"));
+    VERSION = true ? "1.3.48" : "0.0.0";
     colors = {
       primary: import_chalk.default.hex("#DA7756"),
       // Claude coral
@@ -1137,7 +1136,10 @@ async function submitToServer(data) {
         timestamp: (/* @__PURE__ */ new Date()).toISOString(),
         dailyUsage: data.dailyUsage,
         // Session fingerprint for duplicate prevention
-        sessionFingerprint: data.sessionFingerprint
+        sessionFingerprint: data.sessionFingerprint,
+        // League placement audit trail
+        leagueReason: data.leagueReason,
+        leagueReasonDetails: data.leagueReasonDetails
       })
     });
     if (!response.ok) {
@@ -1259,12 +1261,8 @@ async function submit(options) {
     }
     return;
   }
-  verifySpinner.succeed(colors.success("Authenticated"));
   const username = tokenCheck.username || config.get("username");
-  if (username) {
-    console.log(`
-  ${colors.muted("Logged in as:")} ${colors.white(username)}`);
-  }
+  verifySpinner.succeed(colors.success(`Authenticated as ${colors.white(username || "unknown")}`));
   const projectName = getCurrentProjectName();
   if (!hasProjectSessions()) {
     console.log(`
@@ -1364,6 +1362,9 @@ async function submit(options) {
     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);
@@ -1371,6 +1372,14 @@ async function submit(options) {
     }
   }
   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
@@ -1677,8 +1686,10 @@ async function showSettingsMenu() {
       name: "settingsAction",
       message: "Settings:",
       choices: [
-        { name: `\u{1F510}  ${colors.white("Re-authenticate")}`, value: "auth" },
-        { name: `\u{1F5D1}\uFE0F   ${colors.white("Disconnect from CCgather")}`, value: "disconnect" },
+        {
+          name: `\u{1F510}  ${colors.white("Re-authenticate")}  ${colors.dim("\u2013 switch account or fix login issues")}`,
+          value: "auth"
+        },
         { name: `\u2B05\uFE0F   ${import_chalk3.default.gray("Back")}`, value: "back" }
       ],
       loop: false
@@ -1690,48 +1701,11 @@ async function showSettingsMenu() {
       await auth2({});
       break;
     }
-    case "disconnect": {
-      await handleDisconnect();
-      break;
-    }
     case "back":
       await showMenuOnly();
       break;
   }
 }
-async function handleDisconnect() {
-  const { confirmFirst } = await import_inquirer3.default.prompt([
-    {
-      type: "confirm",
-      name: "confirmFirst",
-      message: import_chalk3.default.yellow("Are you sure you want to disconnect from CCgather?"),
-      default: false
-    }
-  ]);
-  if (!confirmFirst) {
-    console.log(colors.dim("\n  Cancelled.\n"));
-    await showSettingsMenu();
-    return;
-  }
-  const { confirmSecond } = await import_inquirer3.default.prompt([
-    {
-      type: "confirm",
-      name: "confirmSecond",
-      message: import_chalk3.default.red("This will remove all local settings. Are you really sure?"),
-      default: false
-    }
-  ]);
-  if (!confirmSecond) {
-    console.log(colors.dim("\n  Cancelled.\n"));
-    await showSettingsMenu();
-    return;
-  }
-  resetConfig();
-  console.log();
-  console.log(colors.success("  \u2713 Disconnected from CCgather"));
-  console.log(colors.dim("  Your CCgather settings have been removed."));
-  console.log(colors.dim("  Run npx ccgather to set up again.\n"));
-}
 program.action(async () => {
   await showMainMenu();
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccgather",
-  "version": "1.3.47",
+  "version": "1.3.49",
   "description": "CLI tool for syncing Claude Code usage data to CCgather leaderboard",
   "bin": {
     "ccgather": "dist/index.js",
@@ -31,6 +31,7 @@
     "inquirer": "^9.2.23",
     "open": "^10.1.0",
     "ora": "^8.1.0",
+    "string-width": "^7.2.0",
     "update-notifier": "^7.3.1"
   },
   "devDependencies": {