@usagefleet/cli 1.2.181 → 1.2.183

package/dist/claude-account.js

@@ -86,10 +86,10 @@ export function agentClaudeLogins(accountsPath) {
     }
     return logins;
 }
-/** The accountUuid Anthropic says owns this OAuth token, or null when it cannot
+/** The account Anthropic says owns this OAuth token, or null when it cannot
  *  say. Null fails open to the file's identity: the endpoint is undocumented, and
  *  losing it must not stop every collector from reporting limits. */
-export async function tokenOwner(token) {
+export async function tokenAccount(token) {
     try {
         const res = await fetch(OAUTH_PROFILE_URL, {
             headers: {
@@ -103,8 +103,13 @@ export async function tokenOwner(token) {
             return null;
         }
         const body = (await res.json());
-        const uuid = body?.account?.uuid;
-        return typeof uuid === 'string' && uuid !== '' ? uuid.slice(0, 100) : null;
+        return parseClaudeAccount({
+            oauthAccount: {
+                accountUuid: body?.account?.uuid,
+                emailAddress: body?.account?.email,
+                organizationName: body?.organization?.name,
+            },
+        });
     }
     catch {
         return null;

package/dist/claude-limits.js

@@ -198,9 +198,31 @@ export function oauthLimitsReport(body) {
     if (account.fiveHourPct == null && account.sevenDayPct == null) {
         return null;
     }
-    const report = { ...account, modelLimits: parseOauthUsage(body), source: 'sub' };
+    const surfaces = parseSurfaces(body);
+    const report = {
+        ...account,
+        modelLimits: parseOauthUsage(body),
+        source: 'sub',
+        ...(surfaces.length > 0 && { surfaces }),
+    };
     return account.fiveHourPct == null && listsNoSessionLimit(body) ? { ...report, noFiveHourWindow: true } : report;
 }
+export function parseSurfaces(body) {
+    const rows = body?.seven_day_breakdown?.rows;
+    if (!Array.isArray(rows)) {
+        return [];
+    }
+    const out = [];
+    for (const row of rows) {
+        const pct = typeof row?.percent === 'number' ? clampPct(row.percent) : null;
+        if (typeof row?.key === 'string' && row.key !== '' && pct !== null) {
+            const label = typeof row.display_name === 'string' && row.display_name !== '' ? row.display_name : row.key;
+            // Cut to the server's ceilings: an over-long row would get the whole limits post rejected.
+            out.push({ key: row.key.slice(0, 64), label: label.slice(0, 64), pct });
+        }
+    }
+    return out.slice(0, 16);
+}
 // Ultra plans have no 5h window. Max lists a `kind: "session"` entry in limits[];
 // a payload without limits[] says nothing either way.
 function listsNoSessionLimit(body) {

package/dist/collector.js

@@ -1,7 +1,7 @@
 import { existsSync } from 'node:fs';
 import { hostname } from 'node:os';
 import { dirname, join, sep } from 'node:path';
-import { activeJcodeToken, agentClaudeLogins, detectClaudeAccount, piClaudeToken, tokenOwner, } from './claude-account.js';
+import { activeJcodeToken, agentClaudeLogins, detectClaudeAccount, piClaudeToken, tokenAccount, } from './claude-account.js';
 import { detectClaudeCreds, macKeychainDenied } from './claude-creds.js';
 import { fetchLimits } from './claude-limits.js';
 import { ENDPOINT } from './config.js';
@@ -276,7 +276,7 @@ async function jcodeAccount(sessionsDir, owners) {
     if (cached) {
         return cached;
     }
-    const owner = await tokenOwner(token);
+    const owner = (await tokenAccount(token))?.extId;
     if (!owner) {
         return undefined;
     }
@@ -340,11 +340,11 @@ export async function reportLimitsOnce(cfg, log = () => {
  */
 async function reportOtherLogins(cfg, logins, reportedExtId, log) {
     const reported = new Set(reportedExtId ? [reportedExtId] : []);
-    for (const { extId, label, token } of logins) {
-        if (reported.has(extId)) {
+    for (const { account, label, token } of logins) {
+        if (reported.has(account.extId)) {
             continue;
         }
-        reported.add(extId);
+        reported.add(account.extId);
         let report;
         try {
             report = await fetchLimits({ source: 'sub', token });
@@ -353,7 +353,7 @@ async function reportOtherLogins(cfg, logins, reportedExtId, log) {
             log('warn', `limits fetch failed for the ${label} login · ${error.message}`);
             continue;
         }
-        const outcome = await postLimits({ ...report, account: { email: null, extId, org: null } }, cfg);
+        const outcome = await postLimits({ ...report, account }, cfg);
         if (outcome !== 'ok') {
             log('warn', `limits upload failed for the ${label} login · ${outcome}`);
         }
@@ -367,22 +367,25 @@ async function otherLogins(cfg) {
             continue;
         }
         const token = activeJcodeToken(join(dirname(sessionsDir), 'auth.json'));
-        const extId = token ? await tokenOwner(token) : null;
-        if (token && extId) {
-            logins.push({ extId, label: tilde(dirname(sessionsDir)), token });
+        const account = token ? await tokenAccount(token) : null;
+        if (token && account) {
+            logins.push({ account, label: tilde(dirname(sessionsDir)), token });
         }
     }
     for (const piDir of new Set(cfg.piDirs.map(dir => dirname(dir)))) {
         const token = piClaudeToken(join(piDir, 'auth.json'));
-        const extId = token ? await tokenOwner(token) : null;
-        if (token && extId) {
-            logins.push({ extId, label: tilde(piDir), token });
+        const account = token ? await tokenAccount(token) : null;
+        if (token && account) {
+            logins.push({ account, label: tilde(piDir), token });
         }
     }
     if (cfg.agentDir) {
         const accountsPath = join(dirname(cfg.agentDir), 'accounts.json');
-        for (const login of agentClaudeLogins(accountsPath)) {
-            logins.push({ ...login, label: `${tilde(dirname(cfg.agentDir))} ${login.name}` });
+        for (const { extId, name, token } of agentClaudeLogins(accountsPath)) {
+            // accounts.json has no email; the profile adds it when it agrees on the account.
+            const profile = await tokenAccount(token);
+            const account = profile?.extId === extId ? profile : { email: null, extId, org: null };
+            logins.push({ account, label: `${tilde(dirname(cfg.agentDir))} ${name}`, token });
         }
     }
     return logins;
@@ -429,7 +432,7 @@ async function reportClaudeCodeLimits(cfg, hasOtherLogin, log) {
     const account = report.source === 'sub' ? detectClaudeAccount() : null;
     // Mid-/login the token and ~/.claude.json name two accounts; see docs/collector.md.
     // ponytail: one profile call per limits cycle, cache it per token if Anthropic starts 429ing.
-    const owner = account ? await tokenOwner(creds.token) : null;
+    const owner = account ? ((await tokenAccount(creds.token))?.extId ?? null) : null;
     if (account && owner !== null && owner !== account.extId) {
         log('warn', 'limits skipped · claude login is mid-switch between accounts · retrying next cycle');
         return null;

package/dist/release.js

@@ -1,2 +1,2 @@
 // Generated by .github/workflows/release.yml.
-export const RELEASE_VERSION = "1.2.181";
+export const RELEASE_VERSION = "1.2.183";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@usagefleet/cli",
-	"version": "1.2.181",
+	"version": "1.2.183",
 	"description": "Tails Claude Code, Claude Desktop, and pi agent JSONL logs and reports token usage to a UsageFleet server.",
 	"keywords": [
 		"claude",