@usagefleet/cli 1.2.59 → 1.2.70

package/dist/release.js

@@ -1,8 +1,2 @@
-// Overwritten by .github/workflows/release.yml with the version being published
-// to npm. "dev" means "built locally", which disables self-update — a dev build
-// must never be replaced by a published one behind your back.
-// The annotation is load-bearing: without it the literal type would be 'dev'
-// here and '1.2.3' in CI, so every `=== '1.2.59'` check compiles locally and
-// fails the release build as a comparison with no overlap.
-// oxlint-disable-next-line typescript/no-inferrable-types -- see above
-export const RELEASE_VERSION = '1.2.59';
+// Generated by .github/workflows/release.yml.
+export const RELEASE_VERSION = "1.2.70";

package/dist/service.js

@@ -2,9 +2,10 @@ import { execFileSync } from 'node:child_process';
 import { chmodSync, existsSync, mkdirSync, realpathSync, rmSync, writeFileSync } from 'node:fs';
 import { homedir, tmpdir } from 'node:os';
 import { delimiter, join } from 'node:path';
+import { DEFAULT_ENDPOINT, loadConfig } from './config.js';
 import { installPromptHook, uninstallPromptHook } from './hook.js';
-import { readStore } from './store.js';
-import { row, step } from './ui.js';
+import { readStore, storePath, updateStore } from './store.js';
+import { fail, header, hint, host, row, step, tilde, warn } from './ui.js';
 const LABEL = 'dev.usagefleet.collector';
 /** Scheduled Task name on Windows (mirrors the launchd label / systemd unit). */
 const TASK = 'usagefleet';
@@ -215,18 +216,40 @@ function xml(s) {
         .replaceAll("'", ''');
 }
 export function install() {
-    // Pre-flight: refuse to install a service that can't resolve an endpoint+token,
-    // otherwise the baked `watch` process throws on every launch and the service
-    // manager crash-loops it invisibly (only the log file shows it). Use the same
-    // env-OR-file precedence loadConfig() uses so a prior `init` is honored.
-    const file = readStore();
-    const endpoint = process.env.USAGEFLEET_ENDPOINT || file.endpoint || '';
-    const token = process.env.USAGEFLEET_TOKEN || file.token || '';
-    if (!endpoint || !token) {
-        console.error('No endpoint/token resolved. Run `usagefleet init --endpoint <url> --token <t>` ' +
-            '(or set USAGEFLEET_ENDPOINT and USAGEFLEET_TOKEN) before installing.');
-        process.exit(1);
+    // Pre-flight: refuse to install a service whose baked `watch` would throw on
+    // every launch, because the service manager crash-loops it invisibly (only the
+    // log file shows it). Resolving through loadConfig() is what makes this a real
+    // pre-flight rather than a lookalike: it is the same call `watch` makes, so a
+    // missing token or a non-https endpoint fails here or not at all.
+    let cfg;
+    try {
+        cfg = loadConfig();
+    }
+    catch (error) {
+        console.error(fail('config', error.message));
+        console.error(hint('  usagefleet install --endpoint <url> --token <device-token>'));
+        return process.exit(1);
+    }
+    // Config that only ever lived in this shell's env is lost to every later
+    // invocation: `usagefleet guard` runs from Claude Code's environment, which
+    // carries no USAGEFLEET_* vars (hook.ts bakes the command, not the env). The
+    // endpoint would fall back to the hosted default and send this device's token
+    // there; the token would be missing outright and the guard would fail open. So
+    // pin both to disk. The default endpoint is stored as absent rather than
+    // written out, so it can still move under an existing install.
+    const desiredEndpoint = cfg.endpoint === DEFAULT_ENDPOINT ? undefined : cfg.endpoint;
+    const stored = readStore();
+    if (stored.token !== cfg.token || stored.endpoint !== desiredEndpoint) {
+        // Only on a real change: `update` re-runs install every six hours, and this
+        // file is shared with the running collector's offset writes.
+        updateStore(storePath(), store => {
+            store.token = cfg.token;
+            store.endpoint = desiredEndpoint;
+        });
     }
+    console.log(header());
+    console.log('');
+    console.log(step('configured', host(cfg.endpoint)));
     // Windows: stop a running task first, or `schtasks /run` below is ignored (the
     // task is IgnoreNew) — leaving the OLD version resident after an "update".
     if (process.platform === 'win32') {
@@ -238,8 +261,7 @@ export function install() {
     const prog = programArgs();
     const shadow = shadowingBinary(process.env.PATH, process.argv[1] ?? process.execPath);
     if (shadow) {
-        console.warn(`Another usagefleet is earlier on your PATH (${shadow}). The service below runs this one, ` +
-            `but your shell keeps running that one — delete it: rm ${shadow}`);
+        console.log(warn('path', `another usagefleet runs first · rm ${tilde(shadow)}`));
     }
     const env = presentEnv();
     // Same binary, different entry point: the service watches, the hook enforces.
@@ -276,7 +298,7 @@ ${envXml}
         mkdirSync(join(homedir(), 'Library', 'LaunchAgents'), { recursive: true });
         mkdirSync(macLogDir(), { recursive: true });
         // 0600: this file carries USAGEFLEET_TOKEN and ANTHROPIC_API_KEY, the same
-        // secrets `init` deliberately writes at 0600.
+        // secrets the config file deliberately holds at 0600.
         writeFileSync(path, plist, { encoding: 'utf-8', mode: 0o600 });
         chmodSync(path, 0o600); // writeFileSync's mode does not apply to an existing file
         const domain = `gui/${process.getuid?.()}`;
@@ -313,7 +335,8 @@ ${envXml}
             /* best-effort */
         }
         console.log(step('service', 'launchd · starts at login'));
-        return;
+        console.log(row('logs', tilde(macLogDir())));
+        return collectingNow();
     }
     if (process.platform === 'linux') {
         // systemd: quote values, escape backslash/quote, reject newlines.
@@ -378,13 +401,12 @@ WantedBy=default.target
                 }
             }
             console.log(step('service', 'systemd · starts at login'));
+            return collectingNow();
         }
-        else {
-            console.log('Could not drive systemctl automatically. Enable it manually:');
-            console.log('  systemctl --user daemon-reload');
-            console.log('  systemctl --user enable --now usagefleet');
-            console.log('  loginctl enable-linger $USER   # keep running after logout');
-        }
+        console.log(warn('service', 'systemctl not driveable · enable it manually'));
+        console.log(hint('  systemctl --user daemon-reload'));
+        console.log(hint('  systemctl --user enable --now usagefleet'));
+        console.log(hint('  loginctl enable-linger $USER    keep running after logout'));
         return;
     }
     if (process.platform === 'win32') {
@@ -405,18 +427,26 @@ WantedBy=default.target
             schtasks('/create', '/tn', TASK, '/sc', 'onlogon', '/f', '/tr', `wscript.exe //B //Nologo "${vbsPath}"`);
         rmSync(xmlPath, { force: true });
         if (!created) {
-            console.error('Could not register the scheduled task. Register it manually:\n' +
-                `  schtasks /create /tn ${TASK} /sc onlogon /tr "wscript.exe //B //Nologo \\"${vbsPath}\\""`);
+            console.error(fail('service', 'scheduled task rejected · register it manually'));
+            console.error(hint(`  schtasks /create /tn ${TASK} /sc onlogon /tr "wscript.exe //B //Nologo \\"${vbsPath}\\""`));
             process.exit(1);
         }
         // Start now so install/update takes effect immediately, not at next logon.
         schtasks('/run', '/tn', TASK);
         console.log(step('service', 'scheduled task · starts at logon'));
-        console.log(row('logs', windowsLogPath()));
-        return;
+        console.log(row('logs', tilde(windowsLogPath())));
+        return collectingNow();
     }
-    console.log(`Unsupported platform for service install: ${process.platform}.`);
-    console.log(`Run it yourself with: ${prog.join(' ')}`);
+    console.log(warn('service', `no autostart on ${process.platform} · run it yourself`));
+    console.log(hint(`  ${prog.join(' ')}`));
+}
+/** Closing lines of a successful install: what is happening, and the two
+ *  commands worth knowing next. */
+function collectingNow() {
+    console.log('');
+    console.log(hint('collecting now.'));
+    console.log(hint('  usagefleet status    current state'));
+    console.log(hint('  usagefleet watch     foreground, live log'));
 }
 /** Is the background service actually up? This is the one question `status`
  *  has to answer, so every probe is best-effort: an unreadable or unparseable
@@ -491,7 +521,8 @@ export function uninstall() {
             }
         }
         removeStableBin();
-        console.log(`Removed launchd agent (delete ${path} to fully clean up).`);
+        console.log(step('removed', 'launchd agent'));
+        console.log(row('leftover', `${tilde(path)} · delete to fully clean up`));
         return;
     }
     if (process.platform === 'linux') {
@@ -504,7 +535,8 @@ export function uninstall() {
             /* ignore */
         }
         removeStableBin();
-        console.log(`Disabled systemd unit (delete ${systemdUnitPath()} to fully clean up).`);
+        console.log(step('removed', 'systemd unit'));
+        console.log(row('leftover', `${tilde(systemdUnitPath())} · delete to fully clean up`));
         return;
     }
     if (process.platform === 'win32') {
@@ -517,8 +549,8 @@ export function uninstall() {
             /* ignore */
         }
         removeStableBin();
-        console.log(deleted ? `Removed scheduled task "${TASK}".` : `No scheduled task "${TASK}" found.`);
+        console.log(deleted ? step('removed', `scheduled task ${TASK}`) : row('service', `no task ${TASK} found`));
         return;
     }
-    console.log(`Nothing to uninstall on ${process.platform}.`);
+    console.log(row('service', `nothing to uninstall on ${process.platform}`));
 }

package/dist/store.js

@@ -86,7 +86,7 @@ export function readStore(path = storePath()) {
 }
 /**
  * Read-modify-write the store atomically. Re-reading inside the call is what
- * lets `usagefleet init` change the token while the service is mid-cycle: the
+ * lets `usagefleet install` change the token while the service is mid-cycle: the
  * service's next save picks up the new token instead of overwriting it with the
  * copy it loaded minutes ago.
  *

package/dist/tailer.js

@@ -1,5 +1,6 @@
 import { closeSync, openSync, readSync, statSync } from 'node:fs';
 import { 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;
 /**
@@ -38,7 +39,7 @@ export function tailFile(filePath, prev, source = 'cli') {
         // No newline in a full MAX_READ window = one pathologically long line.
         // Skip past it so the file can't stall forever.
         if (length >= MAX_READ) {
-            console.warn(`usagefleet: skipping a line > ${MAX_READ} bytes in ${filePath} at offset ${start}`);
+            line(yellow('!'), `skipped a line > ${MAX_READ} bytes ${dim(`· ${tilde(filePath)} at ${start}`)}`);
             return {
                 consumedBytes: length,
                 nextState: { ...base, offset: start + length },

package/dist/ui.js

@@ -1,35 +1,92 @@
 /**
- * Terminal output helpers, "quiet" style: one accent colour, detail in gray,
- * a padded label column so lines align.
+ * The CLI's only output surface, "quiet" style: lowercase labels, one accent
+ * colour, detail in gray, a padded label column so lines align. Every command
+ * — install, status, watch, the collector's own stream — prints through these
+ * helpers, so a TTY and a service log read the same.
  *
  * Colour is dropped when stdout is not a TTY (service logs, CI, pipes) or when
- * NO_COLOR is set. Bars are plain characters, so a log file still shows them.
+ * NO_COLOR is set. Glyphs and bars are plain characters, so a log file still
+ * shows them.
  */
+import { homedir } from 'node:os';
+import { detectOs } from './os.js';
+import { RELEASE_VERSION } from './release.js';
 const useColor = process.stdout.isTTY === true && !process.env.NO_COLOR;
 function paint(code) {
     return s => (useColor ? `\u001B[${code}m${s}\u001B[0m` : s);
 }
 export const dim = paint('90');
+/** One step below `dim`: timestamps, which are structure rather than content. */
+export const dimmer = paint('2;90');
 export const green = paint('32');
 export const yellow = paint('33');
 export const red = paint('31');
 export const blue = paint('34');
 export const bold = paint('1');
-/** Width of the label column shared by `step` and `row`. */
-const LABEL = 10;
-/** "✓ installed   ~/.local/bin/usagefleet" — a completed step. */
+/** Width of the label column shared by every labelled line. */
+const LABEL = 12;
+/** "usagefleet 1.2.55  mac-arm64" — the banner an interactive command opens
+ *  with. `detail` replaces the platform when a command has something better to
+ *  say about itself (watch states its interval). */
+export function header(detail = `${detectOs()}-${process.arch}`) {
+    const build = RELEASE_VERSION === 'dev' ? ' · local build, self-update off' : '';
+    return `${blue('usagefleet')} ${dim(`${RELEASE_VERSION}${build}  ${detail}`)}`;
+}
+/** Server without its scheme: the host is the part worth reading. */
+export function host(endpoint) {
+    return endpoint.replace(/^https?:\/\//, '').replace(/\/$/, '');
+}
+/** "✓ installed    ~/.local/bin/usagefleet" — a completed step. */
 export function step(label, detail = '') {
     return `${green('✓')} ${label.padEnd(LABEL)} ${dim(detail)}`;
 }
-/** "● service     running" — state with a health-coloured dot. */
+/** "✗ verify failed  expected 4f8c…" — a step that did not happen. */
+export function fail(label, detail = '') {
+    return `${red('✗')} ${label.padEnd(LABEL)} ${dim(detail)}`;
+}
+/** "! service      systemctl unavailable" — worked, but not fully. */
+export function warn(label, detail = '') {
+    return `${yellow('!')} ${label.padEnd(LABEL)} ${dim(detail)}`;
+}
+/** "● service      running" — state with a health-coloured dot. */
 export function state(health, label, detail) {
     const dot = health === 'ok' ? green('●') : health === 'warn' ? yellow('●') : red('●');
     return `${dot} ${label.padEnd(LABEL)} ${detail}`;
 }
-/** "  config      ~/.config/usagefleet/config.json" — a plain detail line. */
+/** "  config       ~/.config/usagefleet/config.json" — a plain detail line. */
 export function row(label, detail) {
     return `  ${label.padEnd(LABEL)} ${dim(detail)}`;
 }
+/** A closing suggestion, or any line that is context rather than result. */
+export function hint(text) {
+    return dim(text);
+}
+/** Home-relative path, because `~/.claude/projects` reads and wraps better than
+ *  the absolute one — and hides the user's account name in a pasted terminal. */
+export function tilde(path) {
+    const home = homedir();
+    return home && path.startsWith(home) ? `~${path.slice(home.length)}` : path;
+}
+/** Day of the last printed stream line. The date is stated on rollover only:
+ *  HH:MM:SS alone is unreadable in a service log that spans a week, while a
+ *  one-shot command is already dated by the shell that ran it. */
+let lastDay = '';
+/**
+ * One line of the live stream: "09:14:02 ↑ 12 sent · 12 accepted".
+ * Used by `watch`, `run` and every message the collector emits, so the service
+ * log is the same stream a foreground run shows.
+ */
+export function line(glyph, text) {
+    const now = new Date();
+    const day = now.toLocaleDateString('en-CA');
+    if (lastDay && day !== lastDay) {
+        console.log(dimmer(`── ${day}`));
+    }
+    lastDay = day;
+    console.log(`${dimmer(now.toTimeString().slice(0, 8))} ${glyph} ${text}`);
+}
+/** Neutral stream glyph, for messages that are neither good nor bad news. */
+export const note = dim('·');
 /** Percentage as a fixed-width string, so successive log lines line up. */
 export function pct(value) {
     return `${value ?? '?'}%`.padStart(4);

package/dist/update.js

@@ -37,11 +37,14 @@ function run(cmd, args) {
  * install is worse than one that skips a release. `force` is the manual
  * `usagefleet update`, which ignores USAGEFLEET_UPDATE=0 but still refuses to
  * touch a dev build.
+ *
+ * `log` carries the level so the caller can pick the right glyph: the CLI
+ * renders progress as a step and every dead end as a warning.
  */
 export async function checkForUpdate(log, force = false) {
     if (RELEASE_VERSION === 'dev') {
         if (force) {
-            log('update: this is a dev build — install the published package first.');
+            log('warn', 'dev build · install the published package first');
         }
         return null;
     }
@@ -62,7 +65,7 @@ export async function checkForUpdate(log, force = false) {
         const res = await fetch(`${REGISTRY}/${PACKAGE}/latest`, { signal: AbortSignal.timeout(15_000) });
         if (!res.ok) {
             if (force) {
-                log(`update: registry has no release info (${res.status}).`);
+                log('warn', `registry has no release info (${res.status})`);
             }
             return null;
         }
@@ -70,7 +73,7 @@ export async function checkForUpdate(log, force = false) {
     }
     catch (error) {
         if (force) {
-            log(`update: cannot reach the npm registry (${error.message}).`);
+            log('warn', `npm registry unreachable · ${error.message}`);
         }
         return null;
     }
@@ -79,22 +82,22 @@ export async function checkForUpdate(log, force = false) {
     }
     if (latest === RELEASE_VERSION) {
         if (force) {
-            log(`update: already on ${RELEASE_VERSION}.`);
+            log('ok', `already current · ${RELEASE_VERSION}`);
         }
         return null;
     }
-    log(`update: ${RELEASE_VERSION} → ${latest}, installing ${PACKAGE}…`);
+    log('ok', `${RELEASE_VERSION} → ${latest} · installing ${PACKAGE}…`);
     const code = await run(npmCommand(), ['install', '--global', `${PACKAGE}@${latest}`]);
     if (code !== 0) {
-        log(code === null
-            ? 'update: npm is not available — reinstall with `npm i -g @usagefleet/cli`.'
-            : `update: npm install failed (exit ${code}) — if the global prefix needs root, run it yourself.`);
+        log('warn', code === null
+            ? 'npm not available · reinstall with `npm i -g @usagefleet/cli`'
+            : `npm install failed (exit ${code}) · if the global prefix needs root, run it yourself`);
         return null;
     }
     // Detached: `install` rewrites the service definition and restarts it, which
     // kills this process tree. npm replaced the file behind `self`, so this is
     // already the new version.
     spawn(process.execPath, [self, 'install'], { detached: true, stdio: 'ignore' }).unref();
-    log(`update: installed ${latest}, restarting service.`);
+    log('ok', `installed ${latest} · restarting service`);
     return latest;
 }

package/dist/uploader.js

@@ -44,7 +44,9 @@ export async function uploadBatch(payload, cfg) {
     }
     return { fatal: 'transient', ok: false };
 }
-/** Map a 4xx (never 429, the caller filters it) to a failure kind. */
+/** Map a non-OK status to a failure kind. uploadBatch only ever passes a 4xx it
+ *  has already decided not to retry; postLimits passes anything, and the 5xx/429
+ *  fall-through to 'transient' is the answer it wants. */
 function classifyClientError(status) {
     if (status === 401 || status === 403) {
         return 'auth';
@@ -52,7 +54,10 @@ function classifyClientError(status) {
     if (status === 400 || status === 422) {
         return 'invalid';
     }
-    return 'transient'; // 402 outside plan, 404, 408, 413, … — the data is fine
+    if (status === 402) {
+        return 'plan';
+    }
+    return 'transient'; // 404, 408, 413, … — the data is fine
 }
 /** Parse a Retry-After header (delta-seconds OR HTTP-date), clamped to [0, 60s]. */
 function retryAfterMs(header, fallback) {
@@ -73,7 +78,11 @@ function retryAfterMs(header, fallback) {
     }
     return Math.min(Math.max(wait, 0), 60_000) + Math.floor(Math.random() * 500);
 }
-/** Report the account's real limit utilization to the server. */
+/** Report the account's real limit utilization to the server. Shares uploadBatch's
+ *  failure vocabulary so a plan wall reads as one on this leg too: it runs every
+ *  cycle even when no usage records moved, so collapsing 402 to a bare failure
+ *  would log an unactionable warning forever. Single-shot by design — a stale
+ *  reading is worth less than the next cycle's fresh one. */
 export async function postLimits(report, cfg) {
     try {
         const res = await fetch(`${cfg.endpoint}/api/v1/limits`, {
@@ -85,9 +94,9 @@ export async function postLimits(report, cfg) {
             method: 'POST',
             signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS),
         });
-        return res.ok;
+        return res.ok ? 'ok' : classifyClientError(res.status);
     }
     catch {
-        return false;
+        return 'transient';
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@usagefleet/cli",
-	"version": "1.2.59",
+	"version": "1.2.70",
 	"description": "Tails Claude Code, Claude Desktop, and pi agent JSONL logs and reports token usage to a UsageFleet server.",
 	"keywords": [
 		"claude",
@@ -10,7 +10,12 @@
 		"usage"
 	],
 	"homepage": "https://usagefleet.com",
-	"license": "MIT",
+	"license": "GPL-3.0-or-later",
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/rokartur/usagefleet.git",
+		"directory": "apps/cli"
+	},
 	"bin": {
 		"usagefleet": "dist/index.js"
 	},