@usagefleet/cli 1.2.171 → 1.2.172

package/dist/claude-account.js

@@ -46,6 +46,34 @@ export function activeJcodeToken(authPath) {
         return null;
     }
 }
+/** Every Claude subscription login saved in the agent CLI's `accounts.json` whose access
+ *  token has not expired; the agent refreshes a token only when it uses that account. */
+export function agentClaudeLogins(accountsPath) {
+    let accounts;
+    try {
+        accounts = JSON.parse(readFileSync(accountsPath, 'utf-8')).anthropic ?? [];
+    }
+    catch {
+        return [];
+    }
+    const logins = [];
+    for (const { type, name, access, accountId, expires } of accounts) {
+        if (type === 'oauth' &&
+            typeof access === 'string' &&
+            access !== '' &&
+            typeof accountId === 'string' &&
+            accountId !== '' &&
+            typeof expires === 'number' &&
+            expires > Date.now()) {
+            logins.push({
+                extId: accountId.slice(0, 100),
+                name: typeof name === 'string' ? name : accountId,
+                token: access,
+            });
+        }
+    }
+    return logins;
+}
 /** The accountUuid 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. */

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, detectClaudeAccount, tokenOwner } from './claude-account.js';
+import { activeJcodeToken, agentClaudeLogins, detectClaudeAccount, tokenOwner } from './claude-account.js';
 import { detectClaudeCreds, macKeychainDenied } from './claude-creds.js';
 import { fetchLimits } from './claude-limits.js';
 import { ENDPOINT } from './config.js';
@@ -324,29 +324,23 @@ function pruneMissingFiles(state, scanned) {
 function planWall() {
     return `device outside your plan's device limit · free a slot or upgrade at ${ENDPOINT}/fleet · nothing is lost, uploads resume once it fits`;
 }
-/** Report the Claude Code login's limits, then those of any other account jcode or pj has active. */
+/** Report the Claude Code login's limits, then those of every other account jcode, pj or the agent CLI is signed in to. */
 export async function reportLimitsOnce(cfg, log = () => {
     /* empty */
 }) {
     const report = await reportClaudeCodeLimits(cfg, log);
-    await reportJcodeLimits(cfg, report?.account?.extId, log);
+    await reportOtherLogins(cfg, report?.account?.extId, log);
     return report;
 }
 /**
- * jcode and pj keep their own Anthropic logins, so the account one of them has active
+ * jcode, pj and the agent CLI keep their own Anthropic logins, so the account they use
  * can differ from Claude Code's; with no reading of its own that account's limits go
  * stale on the server and its group stops blocking.
  */
-async function reportJcodeLimits(cfg, reportedExtId, log) {
+async function reportOtherLogins(cfg, reportedExtId, log) {
     const reported = new Set(reportedExtId ? [reportedExtId] : []);
-    for (const sessionsDir of [cfg.jcodeDir, cfg.pjDir]) {
-        if (!sessionsDir) {
-            continue;
-        }
-        // Never refreshed here: rotating the refresh token would sign jcode or pj out.
-        const token = activeJcodeToken(join(dirname(sessionsDir), 'auth.json'));
-        const extId = token ? await tokenOwner(token) : null;
-        if (!token || !extId || reported.has(extId)) {
+    for (const { extId, label, token } of await otherLogins(cfg)) {
+        if (reported.has(extId)) {
             continue;
         }
         reported.add(extId);
@@ -355,15 +349,36 @@ async function reportJcodeLimits(cfg, reportedExtId, log) {
             report = await fetchLimits({ source: 'sub', token });
         }
         catch (error) {
-            log('warn', `limits fetch failed for the ${tilde(dirname(sessionsDir))} login · ${error.message}`);
+            log('warn', `limits fetch failed for the ${label} login · ${error.message}`);
             continue;
         }
         const outcome = await postLimits({ ...report, account: { email: null, extId, org: null } }, cfg);
         if (outcome !== 'ok') {
-            log('warn', `limits upload failed for the ${tilde(dirname(sessionsDir))} login · ${outcome}`);
+            log('warn', `limits upload failed for the ${label} login · ${outcome}`);
         }
     }
 }
+// Never refreshed here: rotating a refresh token would sign jcode, pj or the agent out.
+async function otherLogins(cfg) {
+    const logins = [];
+    for (const sessionsDir of [cfg.jcodeDir, cfg.pjDir]) {
+        if (!sessionsDir) {
+            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 });
+        }
+    }
+    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}` });
+        }
+    }
+    return logins;
+}
 /**
  * Auto-detect the local Claude login, read the real 5h/weekly utilization
  * (oauth/usage for subscription logins, rate-limit headers for API keys), and
@@ -448,5 +463,5 @@ async function reportClaudeCodeLimits(cfg, log) {
             ? report
             : { ...report, fiveHourPct: groupLimits.sessionPct, sevenDayPct: groupLimits.weeklyPct }, undefined, log);
     }
-    return report;
+    return { ...report, account };
 }

package/dist/release.js

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

package/package.json

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