@efoo/ccprofile 0.3.0 → 0.4.0

package/dist/commands/usage.js

@@ -4,7 +4,32 @@ import { parseArgs } from "node:util";
 import { assertDarwin } from "../lib/keychain.js";
 import { chromeUserAgent, chromeUserDataDir, parseProfiles, readSessionCookies, safeStorageKey, } from "../lib/chrome.js";
 import { fetchAccountUsage, NOT_SIGNED_IN, } from "../lib/claudeai.js";
-import { bold, dim, fail, red, table, warn, yellow } from "../lib/format.js";
+import { loadConfig } from "../lib/config.js";
+import { bold, cyan, dim, fail, red, table, warn, yellow } from "../lib/format.js";
+/**
+ * Maps a claude.ai account email to the ccprofile name registered for it, so a
+ * signed-in Chrome account that matches a stored profile is labelled with that
+ * profile's name. Matching is case-insensitive.
+ */
+function profileNamesByEmail() {
+    const byEmail = new Map();
+    try {
+        for (const [name, entry] of Object.entries(loadConfig().profiles)) {
+            if (entry.email)
+                byEmail.set(entry.email.toLowerCase(), name);
+        }
+    }
+    catch {
+        // A malformed/unsupported config.json shouldn't sink the usage table;
+        // profile labelling is auxiliary, so degrade to unlabelled accounts.
+    }
+    return byEmail;
+}
+function matchedProfileName(email, byEmail) {
+    if (email === null)
+        return null;
+    return byEmail.get(email.toLowerCase()) ?? null;
+}
 export async function usageCommand(argv) {
     const { values } = parseArgs({
         args: argv,
@@ -32,11 +57,12 @@ export async function usageCommand(argv) {
         : startSpinner(`querying claude.ai for ${profiles.length} Chrome profile(s)…`);
     const results = await Promise.all(profiles.map((profile) => loadUsage(profile, userDataDir, key, userAgent)));
     spinner.stop();
+    const byEmail = profileNamesByEmail();
     if (values.json) {
-        console.log(JSON.stringify(results.map(toJson), null, 2));
+        console.log(JSON.stringify(results.map((r) => toJson(r, byEmail)), null, 2));
         return hasRealFailure(results) ? 1 : 0;
     }
-    return render(results);
+    return render(results, byEmail);
 }
 /**
  * A profile that was never signed in is expected and not a failure; anything
@@ -57,19 +83,12 @@ async function loadUsage(profile, userDataDir, key, userAgent) {
         return { profile, usage: { ok: false, status: 0, detail } };
     }
 }
-function render(results) {
-    const header = ["ACCOUNT", "CHROME", "5-HOUR", "WEEK · ALL", "FABLE · WEEK"].map(bold);
-    const rows = [header];
+function render(results, byEmail) {
+    const signedIn = [];
     const problems = [];
     for (const { profile, usage } of results) {
         if (usage.ok) {
-            rows.push([
-                usage.email ?? dim("(unknown)"),
-                dim(profile.name),
-                windowCell(usage.report.session),
-                windowCell(usage.report.weeklyAll),
-                windowCell(usage.report.fable),
-            ]);
+            signedIn.push({ profile, usage });
         }
         else if (usage.detail !== NOT_SIGNED_IN) {
             // A missing session is expected for stray Chrome profiles; only real
@@ -77,6 +96,19 @@ function render(results) {
             problems.push(warn(`${profile.name}: ${usage.detail}`));
         }
     }
+    const header = ["PROFILE", "ACCOUNT", "CHROME", "5-HOUR", "WEEK · ALL", "FABLE · WEEK"].map(bold);
+    const rows = [header];
+    for (const { profile, usage } of sortByWeeklyReset(signedIn)) {
+        const name = matchedProfileName(usage.email, byEmail);
+        rows.push([
+            name === null ? dim("-") : cyan(name),
+            usage.email ?? dim("(unknown)"),
+            dim(profile.name),
+            windowCell(usage.report.session),
+            windowCell(usage.report.weeklyAll),
+            windowCell(usage.report.fable),
+        ]);
+    }
     if (rows.length === 1 && problems.length === 0) {
         console.log(dim("No claude.ai sessions found in Chrome. Sign in at https://claude.ai and retry."));
         return 0;
@@ -87,6 +119,15 @@ function render(results) {
         console.log(problem);
     return problems.length > 0 ? 1 : 0;
 }
+/**
+ * Orders accounts by how soon their weekly (all-models) limit resets — the
+ * nearest reset first, the furthest last. Accounts with no weekly window sort
+ * to the end so a resolved figure never sits below a blank one.
+ */
+function sortByWeeklyReset(results) {
+    const resetKey = (r) => r.usage.report.weeklyAll?.resetsAt?.getTime() ?? Number.MAX_SAFE_INTEGER;
+    return [...results].sort((a, b) => resetKey(a) - resetKey(b));
+}
 function windowCell(window) {
     if (window === null)
         return dim("-");
@@ -111,12 +152,14 @@ function formatReset(date) {
     const md = `${date.getMonth() + 1}/${date.getDate()}`.padStart(5, " ");
     return `${md} ${pad(date.getHours())}:${pad(date.getMinutes())}`;
 }
-function toJson(result) {
+function toJson(result, byEmail) {
     const { profile, usage } = result;
+    const email = usage.ok ? usage.email : null;
     return {
+        profile: matchedProfileName(email, byEmail),
         chromeProfile: profile.name,
         chromeDir: profile.dir,
-        email: usage.ok ? usage.email : null,
+        email,
         error: usage.ok ? null : usage.detail,
         usage: usage.ok ? serializeReport(usage.report) : null,
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@efoo/ccprofile",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Per-directory Claude Code account routing via ANTHROPIC_AUTH_TOKEN, direnv, and macOS Keychain",
   "type": "module",
   "packageManager": "pnpm@10.33.4",