@usagefleet/cli 1.2.129 → 1.2.131

package/README.md

@@ -21,6 +21,25 @@ first report, not at login), sets the collector to start with your session and
 writes `~/.config/usagefleet/config.json` (mode `600`). The dashboard fills in
 within a minute.
 
+### One machine, several Claude accounts
+
+If you switch this machine between Claude accounts that belong to different
+fleets (a work subscription and a personal one), run `login` once per account,
+each time while signed into that account in Claude Code:
+
+```bash
+claude /login                  # sign into the work account
+usagefleet login uf_work       # token from the work fleet
+claude /login                  # sign into the personal account
+usagefleet login uf_personal   # token from your own fleet
+```
+
+`login` binds its token to the Claude account signed in at that moment, and
+the collector reports each account's usage and limits with its own token. An
+account without a binding uses the last token you logged in with. Without this,
+whatever you do on the personal account lands in the work fleet and vanishes
+from yours. `usagefleet status` shows which token the current account uses.
+
 `login` takes the token and nothing else. The collector reports to
 `usagefleet.com` and there is no way to redirect it: the request carries your
 device token and a log of what this machine is working on.

package/dist/config.js

@@ -21,6 +21,9 @@ export function loadConfig() {
     const parsedBatch = Math.floor(positiveNumber(process.env.USAGEFLEET_BATCH, file.batch) ?? 100);
     const batchSize = Number.isFinite(parsedBatch) && parsedBatch > 0 ? Math.min(parsedBatch, MAX_BATCH) : 100;
     return {
+        // Kept even when the env names a token: the service unit bakes the default
+        // one into USAGEFLEET_TOKEN, and bindings are what route around it.
+        accountTokens: file.accountTokens ?? {},
         batchSize,
         desktopDir: resolveOptionalDir(process.env.USAGEFLEET_DESKTOP, file.desktopDir, defaultDesktopSessionsDir()),
         piDirs: resolvePiDirs(process.env.USAGEFLEET_PI, file.piDir),
@@ -29,6 +32,12 @@ export function loadConfig() {
         token,
     };
 }
+/** The token that reports what `extId` (a Claude accountUuid) metered: the one
+ *  `login` bound to that account, else the default. Without this a machine that
+ *  switches Claude accounts files one account's usage in the other's fleet. */
+export function tokenFor(cfg, extId) {
+    return (extId && cfg.accountTokens[extId]) || cfg.token;
+}
 /** env → file → nothing, for the numeric knobs (intervals, batch): an env
  *  value wins when present (empty string counts as unset, same `||` rule as
  *  loadConfig), and a non-positive or non-numeric candidate is skipped rather

package/dist/guard.js

@@ -1,4 +1,5 @@
-import { ENDPOINT, loadConfig } from './config.js';
+import { detectClaudeAccount } from './claude-account.js';
+import { ENDPOINT, loadConfig, tokenFor } from './config.js';
 /** Hooks run on the interactive path — a slow/hung server must not stall a
  *  prompt for long. On timeout we fail open (see {@link runGuard}). */
 const TIMEOUT_MS = 5000;
@@ -39,7 +40,7 @@ export async function runGuard() {
     let view;
     try {
         const res = await fetch(`${ENDPOINT}/api/v1/limits`, {
-            headers: { 'x-api-key': cfg.token },
+            headers: { 'x-api-key': tokenFor(cfg, detectClaudeAccount()?.extId) },
             signal: AbortSignal.timeout(TIMEOUT_MS),
         });
         if (!res.ok) {

package/dist/index.js

@@ -1,15 +1,16 @@
 #!/usr/bin/env node
+import { detectClaudeAccount } from './claude-account.js';
 import { detectClaudeCreds } from './claude-creds.js';
 import { reportLimitsOnce, runOnce } from './collector.js';
 import { commands, completionScript, installCompletions, removeCompletions, shells, suggest } from './completion.js';
-import { ENDPOINT, loadConfig, positiveNumber } from './config.js';
+import { ENDPOINT, loadConfig, positiveNumber, tokenFor } from './config.js';
 import { runGuard } from './guard.js';
 import { loadNotifyConfig } from './notifier.js';
 import { sendNotification } from './notify.js';
 import { detectOs } from './os.js';
 import { RELEASE_VERSION } from './release.js';
 import { serviceStatus } from './service.js';
-import { readStore, storePath } from './store.js';
+import { readStore, storePath, updateStore } from './store.js';
 import { ago, bar, blue, dim, fail, green, header, hint, host, line, note, pct, row, state as stateLine, step, tilde, warn, yellow, } from './ui.js';
 import { checkForUpdate } from './update.js';
 function flag(name) {
@@ -185,7 +186,7 @@ async function cmdStatus() {
         : stateLine('warn', 'limits', `no reading yet ${dim('· run `usagefleet limits`')}`));
     console.log('');
     console.log(row('endpoint', host(ENDPOINT)));
-    console.log(row('device', `${state.deviceId} · token ${cfg.token.slice(0, 8)}…`));
+    console.log(row('device', `${state.deviceId} · token ${tokenFor(cfg, detectClaudeAccount()?.extId).slice(0, 8)}…`));
     const watching = [cfg.projectsDir, cfg.desktopDir, ...cfg.piDirs].filter((d) => !!d);
     for (const [i, dir] of watching.entries()) {
         console.log(row(i === 0 ? 'watching' : '', tilde(dir)));
@@ -222,6 +223,16 @@ async function cmdLogin() {
     const token = process.argv.slice(3).find(a => !a.startsWith('-')) ?? flag('token');
     if (token) {
         process.env.USAGEFLEET_TOKEN = token;
+        // Before install(), so the service it starts already routes this account here.
+        // Logging in once per Claude account is how a machine that switches between
+        // accounts in different fleets keeps each one's usage in its own fleet.
+        const account = detectClaudeAccount();
+        if (account) {
+            updateStore(storePath(), store => {
+                store.accountTokens = { ...store.accountTokens, [account.extId]: token };
+            });
+            console.log(step('claude account', `${account.email ?? account.extId} reports with this token`));
+        }
     }
     const { install } = await import('./service.js');
     install();

package/dist/release.js

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

package/dist/store.js

@@ -47,6 +47,7 @@ export function freshWindow() {
  *  `updateStore` silently erases it. */
 function normalize(raw) {
     return {
+        accountTokens: raw.accountTokens,
         batch: raw.batch,
         desktopDir: raw.desktopDir,
         hook: raw.hook,

package/dist/uploader.js

@@ -1,4 +1,4 @@
-import { ENDPOINT } from './config.js';
+import { ENDPOINT, tokenFor } from './config.js';
 const MAX_ATTEMPTS = 6;
 const REQUEST_TIMEOUT_MS = 15_000;
 function sleep(ms) {
@@ -19,7 +19,7 @@ export async function uploadBatch(payload, cfg) {
                 body: JSON.stringify(payload),
                 headers: {
                     'content-type': 'application/json',
-                    'x-api-key': cfg.token,
+                    'x-api-key': tokenFor(cfg, payload.accountExtId),
                 },
                 method: 'POST',
                 signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS),
@@ -90,7 +90,7 @@ export async function postLimits(report, cfg) {
             body: JSON.stringify(report),
             headers: {
                 'content-type': 'application/json',
-                'x-api-key': cfg.token,
+                'x-api-key': tokenFor(cfg, report.account?.extId),
             },
             method: 'POST',
             signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS),

package/package.json

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