@usagefleet/cli 1.2.174 → 1.2.176

package/dist/jcode.js

@@ -1,6 +1,6 @@
 import { existsSync, readdirSync, readFileSync, statSync } from 'node:fs';
-import { join } from 'node:path';
-import { str } from './parser.js';
+import { dirname, join } from 'node:path';
+import { cacheSplit, 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.
@@ -26,6 +26,7 @@ export function readJcodeSession(snapshotPath, source, prev) {
     if (prev?.mtimeMs === mtimeMs) {
         return null;
     }
+    const cacheTtl1h = readsCacheTtl1h(join(dirname(dirname(snapshotPath)), 'config.toml'));
     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.
@@ -40,7 +41,7 @@ export function readJcodeSession(snapshotPath, source, prev) {
     const seen = new Set();
     const records = [];
     for (const [message, meta] of turns) {
-        const record = toRecord(message, meta, str(snapshot.id), source);
+        const record = toRecord(message, meta, str(snapshot.id), source, cacheTtl1h);
         if (!record || seen.has(record.uuid) || Date.parse(record.timestamp) <= uploadedThrough) {
             continue;
         }
@@ -68,8 +69,16 @@ function readJournal(path) {
     }
     return lines;
 }
+/** jcode caches every breakpoint with one TTL: `[provider] anthropic_cache_ttl_1h`, default true, which its
+ *  /cache command rewrites. shortcut: past turns take today's setting, exact once jcode logs the split per turn. */
+function readsCacheTtl1h(configPath) {
+    if (!existsSync(configPath)) {
+        return true;
+    }
+    return !/^\s*anthropic_cache_ttl_1h\s*=\s*false\b/m.test(readFileSync(configPath, 'utf-8'));
+}
 /** jcode's `token_usage` is Anthropic's usage block (`prompt_tokens` is their sum, left out). */
-function toRecord(m, meta, sessionId, source) {
+function toRecord(m, meta, sessionId, source, cacheTtl1h) {
     const u = m.token_usage;
     const id = str(m.id);
     const timestamp = str(m.timestamp);
@@ -81,11 +90,10 @@ function toRecord(m, meta, sessionId, source) {
         !SUBSCRIPTION_PROVIDERS.has(str(meta.provider_key) ?? '')) {
         return null;
     }
+    const cacheWrite = u.cache_creation_input_tokens ?? 0;
     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,
+        ...cacheSplit(cacheWrite, cacheTtl1h ? cacheWrite : 0),
+        cacheCreationTokens: cacheWrite,
         cacheReadTokens: u.cache_read_input_tokens ?? 0,
         cwd: str(meta.working_dir),
         gitBranch: null,

package/dist/parser.js

@@ -19,8 +19,16 @@ function cacheCreation(u) {
     const total = typeof u.cache_creation_input_tokens === 'number' ? u.cache_creation_input_tokens : (five ?? 0) + (oneHour ?? 0);
     return { five, oneHour, total };
 }
+/** The 5m/1h split of a cache write for logs that name only its 1h part; unknown when they do not. */
+export function cacheSplit(total, oneHour) {
+    if (typeof oneHour !== 'number') {
+        return { cacheCreation1h: null, cacheCreation5m: null };
+    }
+    const capped = Math.min(Math.max(oneHour, 0), total);
+    return { cacheCreation1h: capped, cacheCreation5m: total - capped };
+}
 /** pi agent session line: `{type:"message", id, timestamp, message:{role:"assistant",
- *  provider, model, responseId, usage:{input, output, cacheRead, cacheWrite}}}`.
+ *  provider, model, responseId, usage:{input, output, cacheRead, cacheWrite, cacheWrite1h?}}}`.
  *  Only requests that land on the user's Claude subscription count: provider
  *  "anthropic" (pi's own client) and "claude-bridge" (the extension that routes
  *  through Claude Code's OAuth login, so it burns the same limits — and writes no
@@ -50,10 +58,8 @@ function parsePiLine(o, sessionCwd) {
         return null;
     }
     return {
-        // pi's usage line does not say which TTL the cache write used — leave the
-        // breakdown unknown so the server prices it by the user's TTL setting.
-        cacheCreation1h: null,
-        cacheCreation5m: null,
+        // Older pi lines lack cacheWrite1h; the server prices those at 5m.
+        ...cacheSplit(u.cacheWrite ?? 0, u.cacheWrite1h),
         cacheCreationTokens: u.cacheWrite ?? 0,
         cacheReadTokens: u.cacheRead ?? 0,
         cwd: sessionCwd,
@@ -72,7 +78,7 @@ function parsePiLine(o, sessionCwd) {
     };
 }
 /** agent CLI session line: `{type:"usage", id, provider, account, model, timestamp,
- *  input, output, cache_read, cache_write}`, one per request, `timestamp` in epoch ms.
+ *  input, output, cache_read, cache_write, cache_write_1h?}`, 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
@@ -101,9 +107,8 @@ export function parseAgentLine(line, sessionCwd, sessionId) {
     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,
+            // Lines from agents before cache_write_1h are priced at 5m by the server.
+            ...cacheSplit(tokens(o.cache_write), o.cache_write_1h),
             cacheCreationTokens: tokens(o.cache_write),
             cacheReadTokens: tokens(o.cache_read),
             cwd: sessionCwd,

package/dist/release.js

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

package/package.json

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