@usagefleet/cli 1.2.169 → 1.2.170

package/README.md

@@ -78,8 +78,9 @@ shell once. `uninstall` removes both again, and self-update keeps them current.
   Desktop agent-mode (Cowork) sessions, and the
   [pi](https://github.com/badlogic/pi-mono) agent (`~/.pi/agent/sessions`,
   `anthropic` and `claude-bridge` provider records only; other providers don't
-  touch Claude limits), and the jcode agent (`~/.jcode/sessions`) and its pj fork
-  (`~/.pj/sessions`), Claude subscription turns only.
+  touch Claude limits), the jcode agent (`~/.jcode/sessions`) and its pj fork
+  (`~/.pj/sessions`), and the agent CLI (`~/.agents/sessions`), Claude
+  subscription turns only.
   A per-file byte offset in the config file means each line is sent once;
   rotation and truncation are handled and partial lines are never sent. Delivery
   is at-least-once — the server dedups on `uuid`.
@@ -160,6 +161,7 @@ it (`usagefleet config` prints this same table):
 | `piDir` | `USAGEFLEET_PI` | pi sessions dirs — string or array in the file, comma-separated in env; `off` to skip |
 | `jcodeDir` | `USAGEFLEET_JCODE` | override the jcode sessions dir (`~/.jcode/sessions`); `off` to skip it |
 | `pjDir` | `USAGEFLEET_PJ` | override the pj sessions dir (`~/.pj/sessions`); `off` to skip it |
+| `agentDir` | `USAGEFLEET_AGENT` | override the agent CLI sessions dir (`~/.agents/sessions`); `off` to skip it |
 | `interval` | `USAGEFLEET_INTERVAL` | watch poll seconds (default 15) |
 | `limitsInterval` | `USAGEFLEET_LIMITS_INTERVAL` | seconds between limit reports (default 60; 300 on API keys, where each report costs a 1-token ping) |
 | `notifications` | `USAGEFLEET_NOTIFY` | desktop notifications, on by default (`false`/`0` disables) |

package/dist/collector.js

@@ -43,6 +43,9 @@ export async function runOnce(cfg, log = () => {
     for (const dir of cfg.piDirs) {
         roots.push({ dir, onlyProjects: false, source: 'pi' });
     }
+    if (cfg.agentDir) {
+        roots.push({ dir: cfg.agentDir, onlyProjects: false, source: 'agent' });
+    }
     const files = [];
     for (const root of roots) {
         for (const fp of listJsonlFiles(root.dir, dirCache)) {

package/dist/config.js

@@ -1,4 +1,4 @@
-import { defaultDesktopSessionsDir, defaultJcodeSessionsDir, defaultPiSessionsDirs, defaultPjSessionsDir, defaultProjectsDir, } from './paths.js';
+import { defaultAgentSessionsDir, defaultDesktopSessionsDir, defaultJcodeSessionsDir, defaultPiSessionsDirs, defaultPjSessionsDir, defaultProjectsDir, } from './paths.js';
 import { readStore, storePath } from './store.js';
 /** Matches the server's BatchSchema `.max(1000)`. */
 const MAX_BATCH = 1000;
@@ -24,6 +24,7 @@ export function loadConfig() {
         // 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 ?? {},
+        agentDir: resolveOptionalDir(process.env.USAGEFLEET_AGENT, file.agentDir, defaultAgentSessionsDir()),
         batchSize,
         desktopDir: resolveOptionalDir(process.env.USAGEFLEET_DESKTOP, file.desktopDir, defaultDesktopSessionsDir()),
         jcodeDir: resolveOptionalDir(process.env.USAGEFLEET_JCODE, file.jcodeDir, defaultJcodeSessionsDir()),

package/dist/index.js

@@ -89,7 +89,7 @@ async function cmdWatch() {
     const rawUpdate = positiveNumber(process.env.USAGEFLEET_UPDATE_INTERVAL, settings.updateInterval) ?? 6 * 60 * 60;
     const updateInterval = Math.max(60, rawUpdate) * 1000;
     let lastUpdateAt = 0;
-    const watching = [cfg.projectsDir, cfg.desktopDir, ...cfg.piDirs, cfg.jcodeDir, cfg.pjDir].filter((d) => !!d);
+    const watching = [cfg.projectsDir, cfg.desktopDir, ...cfg.piDirs, cfg.jcodeDir, cfg.pjDir, cfg.agentDir].filter((d) => !!d);
     console.log(header(`watching every ${interval / 1000}s`));
     console.log(hint(`${watching.map(tilde).join(' · ')} → ${host(ENDPOINT)}`));
     console.log('');
@@ -193,7 +193,7 @@ async function cmdStatus() {
     console.log('');
     console.log(row('endpoint', host(ENDPOINT)));
     console.log(row('device', `${state.deviceId} · token ${tokenFor(cfg, detectClaudeAccount()?.extId).slice(0, 8)}…`));
-    const watching = [cfg.projectsDir, cfg.desktopDir, ...cfg.piDirs, cfg.jcodeDir, cfg.pjDir].filter((d) => !!d);
+    const watching = [cfg.projectsDir, cfg.desktopDir, ...cfg.piDirs, cfg.jcodeDir, cfg.pjDir, cfg.agentDir].filter((d) => !!d);
     for (const [i, dir] of watching.entries()) {
         console.log(row(i === 0 ? 'watching' : '', tilde(dir)));
     }
@@ -285,6 +285,7 @@ function cmdConfig() {
         ['piDir', 'USAGEFLEET_PI', 'pi session dirs · string or array; env comma-separated'],
         ['jcodeDir', 'USAGEFLEET_JCODE', 'override ~/.jcode/sessions ("off" disables)'],
         ['pjDir', 'USAGEFLEET_PJ', 'override ~/.pj/sessions ("off" disables)'],
+        ['agentDir', 'USAGEFLEET_AGENT', 'override ~/.agents/sessions ("off" disables)'],
         ['interval', 'USAGEFLEET_INTERVAL', 'watch interval seconds (default 15)'],
         [
             'limitsInterval',

package/dist/parser.js

@@ -71,6 +71,57 @@ function parsePiLine(o, sessionCwd) {
         version: null,
     };
 }
+/** agent CLI session line: `{type:"usage", id, provider, account, model, timestamp,
+ *  input, output, cache_read, cache_write}`, one per request, `timestamp` in epoch ms.
+ *  Only provider "anthropic" with an `account` (the Claude account uuid; API keys
+ *  have none) ran on a subscription, and each line books on its own account because
+ *  the agent switches accounts between requests. Lines from agents that predate
+ *  `id` and `account` cannot be told apart from API-key requests and are skipped.
+ *  /clone and /worktree copy these lines into a new session, so `id` (the API's
+ *  response id) is the dedup key, not anything per file. */
+export function parseAgentLine(line, sessionCwd, sessionId) {
+    let parsed;
+    try {
+        parsed = JSON.parse(line);
+    }
+    catch {
+        return null;
+    }
+    if (typeof parsed !== 'object' || parsed === null) {
+        return null;
+    }
+    const o = parsed;
+    const id = str(o.id);
+    const account = str(o.account);
+    const at = new Date(typeof o.timestamp === 'number' ? o.timestamp : Number.NaN);
+    if (o.type !== 'usage' || o.provider !== 'anthropic' || !id || !account || Number.isNaN(at.getTime())) {
+        return null;
+    }
+    const tokens = (v) => (typeof v === 'number' ? v : 0);
+    return {
+        accountExtId: account,
+        record: {
+            // The agent does not log the cache-write TTL; the server prices it by the user's setting.
+            cacheCreation1h: null,
+            cacheCreation5m: null,
+            cacheCreationTokens: tokens(o.cache_write),
+            cacheReadTokens: tokens(o.cache_read),
+            cwd: sessionCwd,
+            gitBranch: null,
+            inputTokens: tokens(o.input),
+            messageId: id,
+            model: str(o.model),
+            outputTokens: tokens(o.output),
+            requestId: null,
+            serviceTier: null,
+            sessionId,
+            source: 'agent',
+            timestamp: at.toISOString(),
+            uuid: `agent:${id}`,
+            version: null,
+        },
+    };
+}
 /**
  * Parse a single JSONL line. Returns a UsageRecord only for assistant messages
  * that carry a usage object; everything else (user/system/summary/tool/…) → null.

package/dist/paths.js

@@ -72,6 +72,10 @@ export function defaultJcodeSessionsDir() {
 export function defaultPjSessionsDir() {
     return join(homedir(), '.pj', 'sessions');
 }
+/** The agent CLI keeps every session flat in `~/.agents/sessions`. */
+export function defaultAgentSessionsDir() {
+    return join(homedir(), '.agents', 'sessions');
+}
 /** pi's agent dir, the root for its sessions and extensions.
  *  PI_CODING_AGENT_DIR is pi's own relocation knob; unlike the service-side
  *  scan above, the guard installer runs from the user's shell where that env

package/dist/release.js

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

package/dist/store.js

@@ -48,6 +48,7 @@ export function freshWindow() {
 function normalize(raw) {
     return {
         accountTokens: raw.accountTokens,
+        agentDir: raw.agentDir,
         batch: raw.batch,
         desktopDir: raw.desktopDir,
         hook: raw.hook,

package/dist/tailer.js

@@ -1,5 +1,6 @@
 import { closeSync, openSync, readSync, statSync } from 'node:fs';
-import { parseLine } from './parser.js';
+import { basename } from 'node:path';
+import { parseAgentLine, parseLine } from './parser.js';
 import { dim, line, tilde, yellow } from './ui.js';
 /** Max bytes read from a single file per cycle (bounds memory on huge backlogs). */
 const MAX_READ = 16 * 1024 * 1024;
@@ -8,7 +9,7 @@ const USAGE_KEY = Buffer.from('"usage"');
 // Unescaped quotes: the same text quoted inside a message is `\"customType\"` and never matches.
 const ACCOUNT_KEY = Buffer.from('"customType":"claude-account"');
 /**
- * The working directory of a pi session, read from the file's first line
+ * The working directory of a pi or agent session, read from the file's first line
  * (`{"type":"session",…,"cwd":"/path"}`). pi's message lines carry no cwd, and
  * tailing usually resumes past the header, so it is re-read per cycle rather
  * than remembered. The session dir name encodes the same path but lossily
@@ -68,7 +69,7 @@ export function tailFile(filePath, prev, source = 'cli') {
     let sessionCwd = null;
     try {
         readSync(fd, buf, 0, length, start);
-        if (source === 'pi') {
+        if (source === 'pi' || source === 'agent') {
             sessionCwd = piSessionCwd(fd);
         }
     }
@@ -106,6 +107,12 @@ export function tailFile(filePath, prev, source = 'cli') {
         if (isAccountLine) {
             account = piSessionAccount(text);
         }
+        else if (source === 'agent') {
+            const usage = parseAgentLine(text, sessionCwd, basename(filePath, '.jsonl'));
+            if (usage) {
+                addRecord(segments, usage.accountExtId, usage.record);
+            }
+        }
         else {
             const rec = parseLine(text, source, sessionCwd);
             if (rec) {

package/package.json

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