@usagefleet/cli 1.2.161 → 1.2.163

package/README.md

@@ -78,7 +78,8 @@ 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).
+  touch Claude limits), and the jcode agent (`~/.jcode/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`.
@@ -157,6 +158,7 @@ it (`usagefleet config` prints this same table):
 | `projectsDir` | `USAGEFLEET_PROJECTS` | override `~/.claude/projects` |
 | `desktopDir` | `USAGEFLEET_DESKTOP` | override the Claude Desktop sessions dir; `off` to skip it |
 | `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 |
 | `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) |
@@ -211,6 +213,9 @@ until you re-run `usagefleet login` under the new one.
   it holds your token.
 - **Linux** — a `systemd --user` unit, plus `loginctl enable-linger $USER` so it
   survives logout. If `systemctl` can't be driven it prints the manual steps.
+- **Linux without systemd** (a Docker container, WSL without it) — no service.
+  Run `usagefleet watch` as the container's command or under your own
+  supervisor, with a restart policy such as `restart: unless-stopped`.
 - **Windows** — a Scheduled Task (`usagefleet`) starting at logon, restarting on
   failure, running hidden through a `wscript` launcher in
   `%LOCALAPPDATA%\usagefleet` (which carries the env values set at install
@@ -231,6 +236,10 @@ restart the service on it. `usagefleet update` does the same on demand. npm is
 called through the absolute path next to the running `node`, because a
 launchd/systemd service gets a minimal PATH.
 
+A `watch` that is not the installed service (a container's command, a
+terminal) exits with code 75 after an update, so whatever runs it starts the
+new version.
+
 Every failure is a no-op — registry unreachable, non-semver version, npm
 missing or exiting non-zero, local `dev` builds — and the service is only
 restarted after npm reports success.

package/dist/collector.js

@@ -5,6 +5,7 @@ import { detectClaudeAccount, tokenOwner } from './claude-account.js';
 import { detectClaudeCreds, macKeychainDenied } from './claude-creds.js';
 import { fetchLimits } from './claude-limits.js';
 import { ENDPOINT } from './config.js';
+import { listJcodeSessions, readJcodeSession } from './jcode.js';
 import { maybeNotify } from './notifier.js';
 import { detectOs } from './os.js';
 import { RELEASE_VERSION } from './release.js';
@@ -21,9 +22,10 @@ const PROJECTS_SUBPATH = `${sep}.claude${sep}projects${sep}`;
 /** `status` shows the cached reading's age, so it stays within this of the last check. */
 const LIMITS_CACHE_REFRESH_MS = 10 * 60_000;
 /**
- * One full scan: tail every JSONL file from its stored offset, upload new usage
- * records (chunked to batchSize), and commit each file's offset only after all
- * its chunks are acknowledged (at-least-once; the server dedups on uuid).
+ * One full scan: tail every JSONL file from its stored offset and re-read every
+ * changed jcode session, upload new usage records (chunked to batchSize), and commit
+ * each source's progress only after all its chunks are acknowledged (at-least-once;
+ * the server dedups on uuid).
  */
 export async function runOnce(cfg, log = () => {
     /* empty */
@@ -50,12 +52,19 @@ export async function runOnce(cfg, log = () => {
             files.push({ fp, source: root.source });
         }
     }
+    const jcodeSessions = cfg.jcodeDir ? listJcodeSessions(cfg.jcodeDir) : [];
+    // Each source yields its new records and how to commit having sent them, so both
+    // share one upload path: offsets for appended JSONL, a watermark for jcode.
+    const reads = [
+        ...files.map(({ fp, source }) => ({ fp, read: () => tailPending(fp, source, state.files) })),
+        ...jcodeSessions.map(fp => ({ fp, read: () => jcodePending(fp, state.jcode) })),
+    ];
     const result = {
         accepted: 0,
         dropped: 0,
         duplicates: 0,
         failed: false,
-        files: files.length,
+        files: reads.length,
         sent: 0,
     };
     // Defensive: a bad batchSize must never stall the chunk loop.
@@ -64,35 +73,35 @@ export async function runOnce(cfg, log = () => {
     // A server that is down or unreachable fails every file for the same reason,
     // so the cycle reports one count instead of a screenful of identical lines.
     let transientFiles = 0;
-    for (const { fp, source } of files) {
-        let tail;
+    for (const { fp, read } of reads) {
+        let pending;
         try {
-            tail = tailFile(fp, state.files[fp], source);
+            pending = read();
         }
         catch (error) {
             // One unreadable/oversized file must not abort the whole cycle.
             log('warn', `skipped ${tilde(fp)} · ${error.message}`);
             continue;
         }
-        if (!tail || tail.consumedBytes === 0) {
+        if (!pending) {
             continue;
         }
-        if (tail.segments.length === 0) {
+        if (pending.segments.length === 0) {
             // Consumed only non-usage lines — safe to advance immediately.
-            state.files[fp] = tail.nextState;
+            pending.commit();
             advanced = true;
             continue;
         }
         // sendChunk absorbs "invalid" by bisecting, so only auth/plan/transient escape.
         let outcome = 'ok';
-        for (const chunk of chunks(tail.segments, step)) {
+        for (const chunk of chunks(pending.segments, step)) {
             outcome = await sendChunk(chunk.records, chunk.accountExtId, cfg, result, log);
             if (outcome !== 'ok') {
                 break;
             }
         }
         if (outcome === 'ok') {
-            state.files[fp] = tail.nextState;
+            pending.commit();
             advanced = true;
         }
         else if (outcome === 'auth') {
@@ -130,9 +139,12 @@ export async function runOnce(cfg, log = () => {
     // on every save, and a crash mid-cycle only costs a re-upload the server
     // dedups. Only our own section is replaced, so a token written by a
     // concurrent `usagefleet login` survives.
-    if (pruneMissingFiles(state, files) || advanced) {
+    const pruned = pruneMissingFiles(state, files);
+    const prunedJcode = pruneGoneSessions(state.jcode, jcodeSessions);
+    if (pruned || prunedJcode || advanced) {
         updateStore(cfg.storePath, store => {
             store.state.files = state.files;
+            store.state.jcode = state.jcode;
             store.state.updatedAt = new Date().toISOString();
         });
     }
@@ -200,6 +212,45 @@ function chunks(segments, step) {
     }
     return out;
 }
+function tailPending(fp, source, files) {
+    const tail = tailFile(fp, files[fp], source);
+    if (!tail || tail.consumedBytes === 0) {
+        return null;
+    }
+    return {
+        commit: () => {
+            files[fp] = tail.nextState;
+        },
+        segments: tail.segments,
+    };
+}
+function jcodePending(fp, sessions) {
+    const session = readJcodeSession(fp, sessions[fp]);
+    if (!session) {
+        return null;
+    }
+    return {
+        commit: () => {
+            sessions[fp] = session.nextState;
+        },
+        // shortcut: jcode keeps its own Anthropic logins and stamps none on a session, so its
+        // turns book on the device's Claude Code account; read jcode's active login if they differ.
+        segments: session.records.length > 0 ? [{ accountExtId: undefined, records: session.records }] : [],
+    };
+}
+/** Drop the progress of jcode sessions no longer on disk; returns whether anything went. */
+function pruneGoneSessions(sessions, listed) {
+    const kept = new Set(listed);
+    let removed = false;
+    for (const fp of Object.keys(sessions)) {
+        if (!kept.has(fp)) {
+            // oxlint-disable-next-line typescript/no-dynamic-delete -- state.jcode is a JSON blob keyed by path
+            delete sessions[fp];
+            removed = true;
+        }
+    }
+    return removed;
+}
 /**
  * Drop offsets for logs that no longer exist on disk, so a long-lived install
  * does not grow its state file by one entry per Claude session forever. Only

package/dist/config.js

@@ -1,4 +1,4 @@
-import { defaultDesktopSessionsDir, defaultPiSessionsDirs, defaultProjectsDir } from './paths.js';
+import { defaultDesktopSessionsDir, defaultJcodeSessionsDir, defaultPiSessionsDirs, defaultProjectsDir, } from './paths.js';
 import { readStore, storePath } from './store.js';
 /** Matches the server's BatchSchema `.max(1000)`. */
 const MAX_BATCH = 1000;
@@ -26,6 +26,7 @@ export function loadConfig() {
         accountTokens: file.accountTokens ?? {},
         batchSize,
         desktopDir: resolveOptionalDir(process.env.USAGEFLEET_DESKTOP, file.desktopDir, defaultDesktopSessionsDir()),
+        jcodeDir: resolveOptionalDir(process.env.USAGEFLEET_JCODE, file.jcodeDir, defaultJcodeSessionsDir()),
         piDirs: resolvePiDirs(process.env.USAGEFLEET_PI, file.piDir),
         projectsDir: process.env.USAGEFLEET_PROJECTS || file.projectsDir || defaultProjectsDir(),
         storePath: storePath(),
@@ -71,7 +72,7 @@ export function resolvePiDirs(env, fromFile) {
     }
     return [...new Set(raw.map(d => d.trim()).filter(d => d.length > 0))];
 }
-/** Optional scan root (USAGEFLEET_DESKTOP): env "off"/"0" disables, env or
+/** Optional scan root (USAGEFLEET_DESKTOP, USAGEFLEET_JCODE): env "off"/"0" disables, env or
  *  config-file path overrides, else the auto-detected default. */
 function resolveOptionalDir(env, fromFile, fallback) {
     if (env === '0' || env?.toLowerCase() === 'off') {

package/dist/index.js

@@ -9,7 +9,7 @@ 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 { isServiceProcess, serviceStatus } from './service.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';
@@ -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].filter((d) => !!d);
+    const watching = [cfg.projectsDir, cfg.desktopDir, ...cfg.piDirs, cfg.jcodeDir].filter((d) => !!d);
     console.log(header(`watching every ${interval / 1000}s`));
     console.log(hint(`${watching.map(tilde).join(' · ')} → ${host(ENDPOINT)}`));
     console.log('');
@@ -112,7 +112,13 @@ async function cmdWatch() {
             const nowMs = Date.now();
             if (nowMs - lastUpdateAt >= updateInterval) {
                 lastUpdateAt = nowMs;
-                await checkForUpdate((level, m) => line(level === 'ok' ? blue('↻') : yellow('!'), m));
+                const updated = await checkForUpdate((level, m) => line(level === 'ok' ? blue('↻') : yellow('!'), m));
+                // `login` restarts only the installed service. Any other watch (a container's command, a terminal)
+                // exits so its supervisor starts the new version; non-zero because `restart: on-failure` ignores 0.
+                if (updated && !isServiceProcess()) {
+                    line(blue('↻'), `exiting to restart on ${updated}`);
+                    process.exit(75);
+                }
             }
             if (nowMs - lastLimitsAt >= limitsInterval) {
                 lastLimitsAt = nowMs;
@@ -176,9 +182,7 @@ async function cmdStatus() {
     const creds = await detectClaudeCreds();
     console.log(header());
     console.log('');
-    console.log(svc.state === 'running'
-        ? stateLine('ok', 'service', `running${svc.pid ? dim(` · pid ${svc.pid}`) : ''}`)
-        : stateLine('bad', 'service', `${svc.state} ${dim(svc.state === 'stopped' ? '· check the log' : '· run `usagefleet login`')}`));
+    console.log(serviceLine(svc));
     console.log(creds
         ? stateLine('ok', 'claude', `${creds.source}${dim(creds.subscriptionType ? ` · ${creds.subscriptionType}` : '')}`)
         : stateLine('warn', 'claude', `no login ${dim('· sign in with `claude` or set ANTHROPIC_API_KEY')}`));
@@ -188,13 +192,22 @@ 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].filter((d) => !!d);
+    const watching = [cfg.projectsDir, cfg.desktopDir, ...cfg.piDirs, cfg.jcodeDir].filter((d) => !!d);
     for (const [i, dir] of watching.entries()) {
         console.log(row(i === 0 ? 'watching' : '', tilde(dir)));
     }
     console.log(row('tracked', `${tracked} file${tracked === 1 ? '' : 's'} · ${mb} MB read · synced ${ago(state.updatedAt)}`));
     console.log(row('config', tilde(cfg.storePath)));
 }
+function serviceLine(svc) {
+    if (svc.state === 'running') {
+        return stateLine('ok', 'service', `running${svc.pid ? dim(` · pid ${svc.pid}`) : ''}`);
+    }
+    if (svc.state === 'no autostart') {
+        return stateLine('warn', 'service', `no autostart here ${dim('· keep `usagefleet watch` running yourself')}`);
+    }
+    return stateLine('bad', 'service', `${svc.state} ${dim(svc.state === 'stopped' ? '· check the log' : '· run `usagefleet login`')}`);
+}
 /** Worst of the two windows decides the dot colour. */
 function limitHealth(fiveHour, sevenDay) {
     const worst = Math.max(fiveHour ?? 0, sevenDay ?? 0);
@@ -269,6 +282,7 @@ function cmdConfig() {
         ['projectsDir', 'USAGEFLEET_PROJECTS', 'override ~/.claude/projects'],
         ['desktopDir', 'USAGEFLEET_DESKTOP', 'override the Claude Desktop dir ("off" disables)'],
         ['piDir', 'USAGEFLEET_PI', 'pi session dirs · string or array; env comma-separated'],
+        ['jcodeDir', 'USAGEFLEET_JCODE', 'override ~/.jcode/sessions ("off" disables)'],
         ['interval', 'USAGEFLEET_INTERVAL', 'watch interval seconds (default 15)'],
         [
             'limitsInterval',

package/dist/jcode.js

@@ -0,0 +1,104 @@
+import { existsSync, readdirSync, readFileSync, statSync } from 'node:fs';
+import { join } from 'node:path';
+import { str } from './parser.js';
+// "claude" and "claude-oauth" run on the Claude subscription; "claude-api" is a billed API key.
+const SUBSCRIPTION_PROVIDERS = new Set(['claude', 'claude-oauth']);
+// Same reason as the scanner's QUIET_MS: a write right after a read can keep the read's mtime.
+const QUIET_MS = 10_000;
+export function listJcodeSessions(dir) {
+    if (!existsSync(dir)) {
+        return [];
+    }
+    return readdirSync(dir)
+        .filter(name => name.startsWith('session_') && name.endsWith('.json'))
+        .map(name => join(dir, name));
+}
+/**
+ * New subscription turns of one jcode session, or null when its files have not
+ * changed since `prev`. jcode keeps a session as `<id>.json`, rewritten whole, plus
+ * `<id>.journal.jsonl`, appended per turn and folded into the snapshot at checkpoints
+ * (an interrupted one leaves a turn in both). So both are read and turns key on their
+ * id, and anything at or before `prev.uploadedThrough` was already sent.
+ */
+export function readJcodeSession(snapshotPath, prev) {
+    const journalPath = snapshotPath.replace(/\.json$/, '.journal.jsonl');
+    const mtimeMs = Math.max(statSync(snapshotPath).mtimeMs, existsSync(journalPath) ? statSync(journalPath).mtimeMs : 0);
+    if (prev?.mtimeMs === mtimeMs) {
+        return null;
+    }
+    const snapshot = JSON.parse(readFileSync(snapshotPath, 'utf-8'));
+    // shortcut: snapshot turns take the session's current provider/model; a provider switch rewrites
+    // the snapshot, so a first backfill of such a session books older turns on the new provider.
+    const turns = (snapshot.messages ?? []).map(m => [m, snapshot]);
+    for (const line of readJournal(journalPath)) {
+        for (const m of line.append_messages ?? []) {
+            turns.push([m, line.meta ?? snapshot]);
+        }
+    }
+    const uploadedThrough = prev?.uploadedThrough ?? 0;
+    let newest = uploadedThrough;
+    const seen = new Set();
+    const records = [];
+    for (const [message, meta] of turns) {
+        const record = toRecord(message, meta, str(snapshot.id));
+        if (!record || seen.has(record.uuid) || Date.parse(record.timestamp) <= uploadedThrough) {
+            continue;
+        }
+        seen.add(record.uuid);
+        records.push(record);
+        newest = Math.max(newest, Date.parse(record.timestamp));
+    }
+    return {
+        nextState: { mtimeMs: Date.now() - mtimeMs > QUIET_MS ? mtimeMs : 0, uploadedThrough: newest },
+        records,
+    };
+}
+function readJournal(path) {
+    if (!existsSync(path)) {
+        return [];
+    }
+    const lines = [];
+    for (const text of readFileSync(path, 'utf-8').split('\n')) {
+        try {
+            lines.push(JSON.parse(text));
+        }
+        catch {
+            // The empty tail after the last newline, or the line jcode is still writing.
+        }
+    }
+    return lines;
+}
+/** jcode's `token_usage` is Anthropic's usage block (`prompt_tokens` is their sum, left out). */
+function toRecord(m, meta, sessionId) {
+    const u = m.token_usage;
+    const id = str(m.id);
+    const timestamp = str(m.timestamp);
+    if (m.role !== 'assistant' ||
+        !u ||
+        !id ||
+        !timestamp ||
+        Number.isNaN(Date.parse(timestamp)) ||
+        !SUBSCRIPTION_PROVIDERS.has(str(meta.provider_key) ?? '')) {
+        return null;
+    }
+    return {
+        // jcode does not log the cache-write TTL; the server prices it by the user's setting.
+        cacheCreation1h: null,
+        cacheCreation5m: null,
+        cacheCreationTokens: u.cache_creation_input_tokens ?? 0,
+        cacheReadTokens: u.cache_read_input_tokens ?? 0,
+        cwd: str(meta.working_dir),
+        gitBranch: null,
+        inputTokens: u.input_tokens ?? 0,
+        messageId: id,
+        model: str(meta.model),
+        outputTokens: u.output_tokens ?? 0,
+        requestId: null,
+        serviceTier: null,
+        sessionId,
+        source: 'jcode',
+        timestamp,
+        uuid: `jcode:${id}`,
+        version: null,
+    };
+}

package/dist/parser.js

@@ -1,5 +1,5 @@
 /** Only accept genuine strings; ignores numbers/objects that would later break. */
-function str(v) {
+export function str(v) {
     return typeof v === 'string' && v.length > 0 ? v : null;
 }
 /** A valid ISO-ish timestamp string, else the current time (never an invalid one). */

package/dist/paths.js

@@ -63,6 +63,11 @@ function realDir(dir) {
         return dir;
     }
 }
+/** jcode keeps every session flat in `~/.jcode/sessions`. JCODE_HOME moves it, but a
+ *  service never inherits the user's shell env, so a moved one is set via USAGEFLEET_JCODE. */
+export function defaultJcodeSessionsDir() {
+    return join(homedir(), '.jcode', '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.161";
+export const RELEASE_VERSION = "1.2.163";

package/dist/service.js

@@ -129,6 +129,10 @@ function macPlistPath() {
 function systemdUnitPath() {
     return join(homedir(), '.config', 'systemd', 'user', 'usagefleet.service');
 }
+/** sd_booted(3): without systemd as init (a Docker container, WSL without it) a unit would never start. */
+function systemdBooted() {
+    return existsSync('/run/systemd/system');
+}
 /** Env vars that are actually set, for baking into the unit so the service
  *  behaves like the install shell. Derived from the USAGEFLEET_ prefix rather
  *  than a hand-kept allowlist: that list had already drifted, silently dropping
@@ -373,7 +377,7 @@ ${envXml}
         console.log(row('logs', tilde(macLogDir())));
         return collectingNow();
     }
-    if (process.platform === 'linux') {
+    if (process.platform === 'linux' && systemdBooted()) {
         // systemd: quote values, escape backslash/quote, reject newlines.
         const envLines = env
             .filter(([, v]) => !/[\r\n]/.test(v))
@@ -505,7 +509,7 @@ export function serviceStatus() {
         const pid = out?.match(/\bpid = (\d+)/)?.[1];
         return pid ? { pid: Number(pid), state: 'running' } : { state: 'stopped' };
     }
-    if (process.platform === 'linux') {
+    if (process.platform === 'linux' && systemdBooted()) {
         if (!existsSync(systemdUnitPath())) {
             return { state: 'not installed' };
         }
@@ -523,7 +527,13 @@ export function serviceStatus() {
         }
         return { state: /Status:\s*Running/i.test(out) ? 'running' : 'stopped' };
     }
-    return { state: 'not installed' };
+    return { state: 'no autostart' };
+}
+/** Whether this process is the one the installed service runs, i.e. the one `login` restarts.
+ *  Windows reports no pid, so a running task counts as this process, as it did before. */
+export function isServiceProcess() {
+    const svc = serviceStatus();
+    return svc.state === 'running' && (svc.pid === undefined || svc.pid === process.pid);
 }
 /** Best-effort removal of the ~60 MB binary copy that pre-npm releases parked in
  *  the app-support dir (plus the `.old` file a Windows in-place update left).

package/dist/store.js

@@ -52,6 +52,7 @@ function normalize(raw) {
         desktopDir: raw.desktopDir,
         hook: raw.hook,
         interval: raw.interval,
+        jcodeDir: raw.jcodeDir,
         limits: raw.limits,
         limitsInterval: raw.limitsInterval,
         notifications: raw.notifications,
@@ -65,6 +66,7 @@ function normalize(raw) {
         state: {
             deviceId: raw.state?.deviceId || randomUUID(),
             files: raw.state?.files ?? {},
+            jcode: raw.state?.jcode ?? {},
             updatedAt: raw.state?.updatedAt ?? new Date().toISOString(),
         },
         token: raw.token,

package/package.json

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