npm - tokentracker-cli - Versions diffs - 0.90.2 → 0.91.3 - Mend

tokentracker-cli 0.90.2 → 0.91.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (117) hide show

package/dashboard/dist/llms.txt CHANGED Viewed

@@ -1,7 +1,7 @@
 # Token Tracker LLMs Index
 Token Tracker is a free, open-source, local-first AI coding usage and cost
-tracker for 31 tools. Its distinctive desktop experience includes a pixel pet
+tracker for 32 tools. Its distinctive desktop experience includes a pixel pet
 powered by real token activity, four desktop widgets, and achievements. The
 same data powers a cross-platform CLI, a native macOS menu bar app, a native
 Windows system tray app, and a dashboard. It records token counts and
@@ -23,7 +23,7 @@ timestamps, never prompts, responses, or source code.
 - [npm package](https://www.npmjs.com/package/tokentracker-cli)
 - [Latest release](https://github.com/xiufengsun/TokenTracker/releases/latest)
-## Supported AI coding tools (31)
+## Supported AI coding tools (33)
 - Claude Code
 - Codex CLI
 - Cursor
@@ -41,6 +41,7 @@ timestamps, never prompts, responses, or source code.
 - Grok Build
 - oh-my-pi
 - pi
+- Prime Agent
 - Craft Agents
 - Reasonix
 - Kilo CLI
@@ -55,6 +56,7 @@ timestamps, never prompts, responses, or source code.
 - AnythingLLM Desktop
 - Claude Science
 - DeepSeek Harness
+- TRAE Work CN
 ## Capabilities
 - Desktop pet that reacts to real token burn, streaks, and rest

package/dashboard/dist/share.html CHANGED Viewed

@@ -75,7 +75,7 @@
         "description": "Shareable Token Tracker dashboard snapshot."
       }
     </script>
-    <script type="module" crossorigin src="/assets/__vite-browser-external-CRvi_9hb.js"></script>
+    <script type="module" crossorigin src="/assets/__vite-browser-external-C6_BtvDo.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/__vite-browser-external-CRYifSM4.css">
   </head>
   <body>

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "tokentracker-cli",
-  "version": "0.90.2",
-  "description": "Local-first AI coding token usage and cost tracker for 31 tools, with a dashboard, desktop pet, widgets, achievements, and native macOS/Windows apps.",
+  "version": "0.91.3",
+  "description": "Local-first AI coding token usage and cost tracker for 33 tools, with a dashboard, desktop pet, widgets, achievements, and native macOS/Windows apps.",
   "main": "src/cli.js",
   "bin": {
     "tokentracker-cli": "bin/tracker.js",

package/src/commands/init.js CHANGED Viewed

@@ -65,6 +65,7 @@ const {
   resolveOmpAgentDir,
   resolvePiAgentDir,
   piAgentDirCollidesWithOmp,
+  resolvePrimeAgentDir,
   resolveAnythingllmDbPath,
   resolveReasonixHome,
   resolveTraeStoragePath,
@@ -102,7 +103,7 @@ const DIVIDER = "----------------------------------------------";
 const DEFAULT_DASHBOARD_URL = "https://www.tokentracker.cc";
 // Single source of truth for the welcome screen's provider count + sample list.
-// test/discovery-metadata.test.js keeps this aligned with public 27-tool copy.
+// test/discovery-metadata.test.js keeps this aligned with public 32-tool copy.
 const SUPPORTED_PROVIDERS = [
   "Claude Code",
   "Codex CLI",
@@ -121,6 +122,7 @@ const SUPPORTED_PROVIDERS = [
   "Grok Build",
   "oh-my-pi",
   "pi",
+  "Prime Agent",
   "Craft Agents",
   "Reasonix",
   "Kilo CLI",
@@ -135,6 +137,7 @@ const SUPPORTED_PROVIDERS = [
   "AnythingLLM Desktop",
   "Claude Science",
   "DeepSeek Harness",
+  "TRAE Work CN",
 ];
 async function cmdInit(argv) {
@@ -710,6 +713,14 @@ async function applyIntegrationSetup({
     }
   }
+  // Prime Agent: metadata-only passive reader — no hook installation needed.
+  {
+    const primeAgentDir = resolvePrimeAgentDir(process.env);
+    if (primeAgentDir && fssync.existsSync(path.join(primeAgentDir, "sessions"))) {
+      summary.push({ label: "Prime Agent", status: "detected", detail: "Passive usage reader (no hook needed)" });
+    }
+  }
   // Craft Agents: passive reader — no hook installation needed.
   // TokenTracker reads ~/.craft-agent/workspaces/<id>/sessions/**/session.jsonl
   // (and any user-relocated workspace listed in ~/.craft-agent/config.json).

package/src/commands/status.js CHANGED Viewed

@@ -60,6 +60,8 @@ const {
   resolvePiSessionFiles,
   resolvePiAgentDir,
   piAgentDirCollidesWithOmp,
+  resolvePrimeAgentSessionFiles,
+  resolvePrimeAgentDir,
   resolveCraftSessionFiles,
   resolveCraftConfigDir,
   resolveReasonixHome,
@@ -87,6 +89,13 @@ const {
   resolveCopilotAppDbPaths,
   probeWslDistros,
 } = require("../lib/rollout");
+const {
+  TRAE_CN_USAGE_ENV,
+  isTraeCnUsageEnabled,
+  resolveTraeCnStoragePath,
+  readTraeCnAuthFromStorage,
+  extractTraeCnToken,
+} = require("../lib/trae-cn-config");
 const wsl = require("../lib/wsl-probe");
 const { getWslMode, isInvalidWslMode, shouldProbeWsl, discoverWslHome } = wsl;
 const { resolveInstallPaths, resolveZcodeNativeDbPath } = require("../lib/install-resolver");
@@ -427,6 +436,11 @@ async function cmdStatus(argv = []) {
   const piInstalled = !piCollides && Boolean(piAgentDir) && fssync.existsSync(path.join(piAgentDir, "sessions"));
   const piFiles = piInstalled ? resolvePiSessionFiles(process.env) : [];
+  // Prime Agent — passive scan only (no hooks).
+  const primeAgentDir = resolvePrimeAgentDir(process.env);
+  const primeAgentInstalled = Boolean(primeAgentDir) && fssync.existsSync(path.join(primeAgentDir, "sessions"));
+  const primeAgentFiles = primeAgentInstalled ? resolvePrimeAgentSessionFiles(process.env) : [];
   // Craft Agents — passive scan only (no hooks).
   const craftConfigDir = resolveCraftConfigDir(process.env);
   const craftInstalled = Boolean(craftConfigDir && fssync.existsSync(craftConfigDir));
@@ -635,6 +649,34 @@ async function cmdStatus(argv = []) {
     ? readTraeEntitlementFromStorage(traeStoragePath)
     : null;
+  // Trae SOLO CN — opt-in usage-API reader. Unlike the passive entitlement
+  // reader above, this source sends the locally stored sign-in JWT to TRAE's
+  // official API, so status surfaces the opt-in flag, the resolved storage
+  // path, and whether the auth blob decrypts — the three inputs a "why is my
+  // TRAE CN data missing" diagnosis needs.
+  // A resolvable default path does NOT mean the app is installed - the macOS
+  // resolver always derives one. Match the sync path semantics exactly:
+  // installed iff the storage file actually exists on disk.
+  const traeCnStoragePath = resolveTraeCnStoragePath({ env: process.env, home });
+  const traeCnInstalled = Boolean(
+    traeCnStoragePath && fssync.existsSync(traeCnStoragePath),
+  );
+  let traeCnAuthState = "not-signed-in";
+  if (traeCnInstalled) {
+    try {
+      const traeCnAuth = readTraeCnAuthFromStorage({ env: process.env, home, platform: process.platform });
+      if (traeCnAuth) {
+        extractTraeCnToken(traeCnAuth);
+        traeCnAuthState = "readable";
+      }
+    } catch (error) {
+      // Distinguish a real IO failure (unreadable) from present-but-bad
+      // data (malformed); neither ever carries storage contents.
+      traeCnAuthState = error?.code === "TRAE_CN_STORAGE_UNREADABLE" ? "unreadable" : "malformed";
+    }
+  }
+  const traeCnUsageOptIn = isTraeCnUsageEnabled(process.env);
   // Grok Build (xAI TUI)
   const grokHookState = await probeGrokHookState({ home, trackerDir, env: process.env });
   const grokSessions = grokHookState.hasGrokInstall || grokHookState.sessionsDir
@@ -873,6 +915,9 @@ async function cmdStatus(argv = []) {
         pi: piInstalled
           ? { installed: true, files: piFiles.length }
           : { installed: false },
+        prime_agent: primeAgentInstalled
+          ? { installed: true, files: primeAgentFiles.length }
+          : { installed: false },
         craft: craftInstalled
           ? { installed: true, files: craftFiles.length }
           : { installed: false },
@@ -923,6 +968,14 @@ async function cmdStatus(argv = []) {
               ...(traeEntitlement ? { entitlement: traeEntitlement } : {}),
             }
           : { installed: false },
+        "trae-cn": traeCnInstalled
+          ? {
+              installed: true,
+              detail: traeCnStoragePath,
+              auth: traeCnAuthState,
+              usage_opt_in: traeCnUsageOptIn,
+            }
+          : { installed: false },
         grok_build: grokInstalled
           ? {
               installed: true,
@@ -1014,6 +1067,9 @@ async function cmdStatus(argv = []) {
       piInstalled
         ? `- pi: passive reader (${piFiles.length} session jsonl file${piFiles.length !== 1 ? "s" : ""} found)`
         : null,
+      primeAgentInstalled
+        ? `- Prime Agent: passive reader (${primeAgentFiles.length} session jsonl file${primeAgentFiles.length !== 1 ? "s" : ""} found)`
+        : null,
       craftInstalled
         ? `- Craft Agents: passive reader (${craftFiles.length} session jsonl file${craftFiles.length !== 1 ? "s" : ""} found)`
         : null,
@@ -1092,6 +1148,9 @@ async function cmdStatus(argv = []) {
       traeEntitlement
         ? `- Trae SOLO plan: ${formatTraeEntitlementLine(traeEntitlement)}`
         : null,
+      traeCnInstalled
+        ? `- Trae SOLO CN: usage sync ${traeCnUsageOptIn ? "opted in" : `off (set ${TRAE_CN_USAGE_ENV}=1 to enable)`}, auth ${traeCnAuthState} (${traeCnStoragePath})`
+        : null,
       ...(() => {
         if (!hermesInstalled) return [];
         return [`- Hermes Agent: state.db found (${hermesPath})`];

package/src/commands/sync.js CHANGED Viewed

@@ -78,6 +78,8 @@ const {
   resolvePiSessionFiles,
   parsePiIncremental,
   piAgentDirCollidesWithOmp,
+  resolvePrimeAgentSessionFiles,
+  parsePrimeAgentIncremental,
   resolveCraftSessionFiles,
   parseCraftIncremental,
   resolveReasonixTelemetryFiles,
@@ -110,6 +112,7 @@ const {
   resolveDroidModel,
   resolveDshSessionFiles,
   parseDshIncremental,
+  parseTraeCnApiIncremental,
   bucketKey,
   toUtcHalfHourStart,
   totalsKey,
@@ -132,6 +135,11 @@ const {
   parseCursorCsv,
 } = require("../lib/cursor-config");
 const { purgeProjectUsage } = require("../lib/project-usage-purge");
+const {
+  fetchTraeCnUsageWithAuth,
+  resolveTraeCnStoragePath,
+  isTraeCnUsageEnabled,
+} = require("../lib/trae-cn-config");
 const {
   isCodexSessionCursorPath,
   isCursorStoreRetry,
@@ -289,6 +297,7 @@ const AUTO_SYNC_SOURCES = new Set([
   "qoder-cn",
   "reasonix",
   "roocode",
+  "trae-cn",
   "workbuddy",
   "zcode",
   "zed",
@@ -450,6 +459,15 @@ async function cmdSync(argv, context = {}) {
   const lockWaitOptions = context && typeof context === "object"
     ? context.lockWaitOptions
     : undefined;
+  // Narrow test-only seam for TRAE Work CN: deterministic injected fetch + a
+  // fixed "now" for the rolling range. Production keeps the global fetch and
+  // current time; no public CLI flag/config is introduced.
+  const traeCnFetchImpl = context && typeof context === "object"
+    ? context.traeCnFetchImpl
+    : undefined;
+  const traeCnNowMs = context && typeof context === "object"
+    ? context.traeCnNowMs
+    : undefined;
   const syncDiagnostics = diagnostics && typeof diagnostics === "object" ? diagnostics : null;
   const home = os.homedir();
   const { trackerDir } = await resolveTrackerPaths({ home });
@@ -1661,6 +1679,93 @@ async function cmdSync(argv, context = {}) {
       }
     }
+    // ── Trae Work CN (国内版) — account-level usage API ──
+    // A simple explicit rolling 30-day window captured once per sync (no
+    // cursor checkpoints / full-history import / page retries / background
+    // requests). Runs only when the user has opted in via
+    // TOKENTRACKER_TRAE_CN_USAGE=1 (the read transmits the locally stored
+    // sign-in JWT to TRAE's official endpoint, so it is never default-on),
+    // the sync is non-lightweight, the source is allowed, and the CN storage
+    // file exists — which excludes both ordinary background and `--auto
+    // --background --all-local-sources`. Fetching goes through the
+    // storage-backed helper so its single 401/403 reread/retry is used; an
+    // empty response is a successful no-op; each window is bounded to 100
+    // pages/2,000 rows and an over-capacity window is split into staggered
+    // sub-windows (still over capacity at the finest allowed granularity, or
+    // any other fetch/page/schema/auth failure) skips the parser and leaves
+    // prior data untouched while unrelated providers continue.
+    let traeCnResult = { recordsProcessed: 0, eventsAggregated: 0, bucketsQueued: 0 };
+    if (
+      !isBackgroundLightweightSync &&
+      isTraeCnUsageEnabled(process.env) &&
+      sourceAllowed("trae-cn")
+    ) {
+      const nowMs = Number.isFinite(traeCnNowMs) ? traeCnNowMs : Date.now();
+      const fetchImpl = typeof traeCnFetchImpl === "function" ? traeCnFetchImpl : fetch;
+      const endTime = Math.floor(nowMs / 1000);
+      // Align the REAL fetch start down to a half-hour boundary so the API
+      // range fully contains every bucket it can touch (a raw 08:37 start
+      // would only partially cover the 08:30 bucket) - session bucket floors
+      // never straddle the queried range.
+      const HALF_HOUR_SEC = 30 * 60;
+      const startTime = Math.max(
+        1,
+        Math.floor((endTime - 30 * 24 * 60 * 60) / HALF_HOUR_SEC) * HALF_HOUR_SEC,
+      );
+      try {
+        // Absent storage means "not signed in" — a silent skip, not an error.
+        const traeCnStoragePath = resolveTraeCnStoragePath({ env: process.env, home });
+        if (traeCnStoragePath && fssync.existsSync(traeCnStoragePath)) {
+          if (progress?.enabled) {
+            progress.start(`Fetching TRAE Work CN usage...`);
+          }
+          const traeCnUsage = await fetchTraeCnUsageWithAuth({
+            start_time: startTime,
+            end_time: endTime,
+            fetchImpl,
+            env: process.env,
+            home,
+          });
+          const traeCnSessions = Array.isArray(traeCnUsage?.sessions) ? traeCnUsage.sessions : [];
+          // An empty payload parses as a pure no-op: the TRAE absence
+          // contract is NOT PROVEN (no evidence that a missing session means
+          // deleted/zero), so an empty response asserts nothing - no usage
+          // mutation and no session states. Non-empty snapshots append one
+          // canonical session-state observation per CHANGED session (the
+          // cloud LWW upsert reconciles cross-device versions).
+          {
+            if (progress?.enabled && traeCnSessions.length > 0) {
+              progress.start(
+                `Parsing TRAE Work CN ${renderBar(0)} 0/${formatNumber(
+                  traeCnSessions.length,
+                )} records | buckets 0`,
+              );
+            }
+            traeCnResult = await parseTraeCnApiIncremental({
+              sessions: traeCnSessions,
+              cursors,
+              queuePath,
+              onProgress: makeProviderProgress("TRAE Work CN"),
+              windowStartMs: startTime * 1000,
+              windowEndMs: endTime * 1000,
+              // The LOGICAL fetch stamp carried into every session state's
+              // snapshot_verified_at: the same clock that produced the query
+              // range, not the later enqueue moment (append-only queue
+              // replays it verbatim, so transport retries never fake
+              // freshness).
+              snapshotVerifiedAtMs: nowMs,
+            });
+            // A partially malformed snapshot throws inside the parser (fail
+            // closed - it must not become the authoritative window state);
+            // warnProviderParseFailure below reports it without sensitive
+            // data while unrelated providers continue.
+          }
+        }
+      } catch (err) {
+        warnProviderParseFailure("TRAE Work CN", err, opts);
+      }
+    }
     // ── Kiro (SQLite-based, with JSONL fallback; dual-install aware) ──
     let kiroResult = { recordsProcessed: 0, eventsAggregated: 0, bucketsQueued: 0 };
     if (sourceAllowed("kiro")) {
@@ -2079,6 +2184,34 @@ async function cmdSync(argv, context = {}) {
       }
     }
+    // ── Prime Agent — passive ~/.prime/agent/sessions/*.jsonl usage reader ──
+    let primeAgentResult = { recordsProcessed: 0, eventsAggregated: 0, bucketsQueued: 0 };
+    const primeAgentFiles = sourceAllowed("prime-agent")
+      ? mergeBothFileSources({ resolveFiles: resolvePrimeAgentSessionFiles, env: process.env })
+      : [];
+    if (primeAgentFiles.length > 0) {
+      if (progress?.enabled) {
+        progress.start(`Parsing Prime Agent ${renderBar(0)} | buckets 0`);
+      }
+      try {
+        primeAgentResult = await parsePrimeAgentIncremental({
+          sessionFiles: primeAgentFiles,
+          cursors,
+          queuePath,
+          env: process.env,
+          onProgress: (p) => {
+            if (!progress?.enabled) return;
+            const pct = p.total > 0 ? p.index / p.total : 1;
+            progress.update(
+              `Parsing Prime Agent ${renderBar(pct)} ${formatNumber(p.index)}/${formatNumber(p.total)} files | buckets ${formatNumber(p.bucketsQueued)}`,
+            );
+          },
+        });
+      } catch (err) {
+        warnProviderParseFailure("Prime Agent", err, opts);
+      }
+    }
     // ── Craft Agents (passive ~/.craft-agent + workspaces session.jsonl reader) ──
     let craftResult = { recordsProcessed: 0, eventsAggregated: 0, bucketsQueued: 0 };
     const craftFiles = sourceAllowed("craft")
@@ -2127,7 +2260,12 @@ async function cmdSync(argv, context = {}) {
     }
     // ── Grok Build (xAI) ──
-    let grokResult = { recordsProcessed: 0, eventsAggregated: 0, bucketsQueued: 0 };
+    let grokResult = {
+      recordsProcessed: 0,
+      eventsAggregated: 0,
+      bucketsQueued: 0,
+      projectBucketsQueued: 0,
+    };
     // Full passive scan of all Grok sessions (historical + any not covered by hook)
     const grokSessions = sourceAllowed("grok") ? resolveGrokBuildSessions(process.env) : [];
     const grokSessionInputs = [...grokSessions];
@@ -2149,6 +2287,11 @@ async function cmdSync(argv, context = {}) {
           sessionId: hookSessionId,
           sessionDir:
             typeof grokHookSignal.sessionDir === "string" ? grokHookSignal.sessionDir : undefined,
+          cwd: typeof grokHookSignal.cwd === "string" ? grokHookSignal.cwd : undefined,
+          encodedCwd:
+            typeof grokHookSignal.sessionDir === "string" && grokHookSignal.sessionDir
+              ? path.basename(path.dirname(grokHookSignal.sessionDir))
+              : undefined,
           updatesPath:
             typeof grokHookSignal.updatesPath === "string" ? grokHookSignal.updatesPath : undefined,
           signalsPath:
@@ -2178,6 +2321,7 @@ async function cmdSync(argv, context = {}) {
           sessions: grokSessionInputs,
           cursors,
           queuePath,
+          projectQueuePath,
           env: process.env,
           onProgress: (p) => {
             if (!progress?.enabled) return;
@@ -2194,6 +2338,8 @@ async function cmdSync(argv, context = {}) {
         recordsProcessed: grokResult.recordsProcessed + grokScanResult.recordsProcessed,
         eventsAggregated: grokResult.eventsAggregated + grokScanResult.eventsAggregated,
         bucketsQueued: grokResult.bucketsQueued + grokScanResult.bucketsQueued,
+        projectBucketsQueued:
+          (grokResult.projectBucketsQueued || 0) + (grokScanResult.projectBucketsQueued || 0),
       };
     }
     if (isFullSourceScan && opts.repairGrok) {
@@ -2554,6 +2700,7 @@ async function cmdSync(argv, context = {}) {
       qoderCnResult.recordsProcessed +
       claudeScienceResult.recordsProcessed +
       cursorResult.recordsProcessed +
+      traeCnResult.recordsProcessed +
       kiroResult.recordsProcessed +
       kiroCliResult.recordsProcessed +
       hermesResult.recordsProcessed +
@@ -2563,6 +2710,7 @@ async function cmdSync(argv, context = {}) {
       workbuddyResult.recordsProcessed +
       ompResult.recordsProcessed +
       piResult.recordsProcessed +
+      primeAgentResult.recordsProcessed +
       craftResult.recordsProcessed +
       reasonixResult.recordsProcessed +
       grokResult.recordsProcessed +
@@ -2588,6 +2736,7 @@ async function cmdSync(argv, context = {}) {
       qoderCnResult.bucketsQueued +
       claudeScienceResult.bucketsQueued +
       cursorResult.bucketsQueued +
+      traeCnResult.bucketsQueued +
       kiroResult.bucketsQueued +
       kiroCliResult.bucketsQueued +
       hermesResult.bucketsQueued +
@@ -2597,6 +2746,7 @@ async function cmdSync(argv, context = {}) {
       workbuddyResult.bucketsQueued +
       ompResult.bucketsQueued +
       piResult.bucketsQueued +
+      primeAgentResult.bucketsQueued +
       craftResult.bucketsQueued +
       reasonixResult.bucketsQueued +
       grokResult.bucketsQueued +
@@ -2618,6 +2768,7 @@ async function cmdSync(argv, context = {}) {
       cursorStore.requiresCommit !== true &&
       totalParsed === 0 &&
       totalBuckets === 0 &&
+      !(grokResult.projectBucketsQueued > 0) &&
       !codexColdAuditDue &&
       !codexFallbackRetryRan &&
       !grokHookSignalConsumed &&
@@ -2940,6 +3091,8 @@ function recordCodexColdScanAudit(
 module.exports = {
   cmdSync,
   acquireSyncLock,
+  readQueueBatch,
+  drainQueueToCloud,
   migrateCursorUnknownBuckets,
   migrateRolloutCumulativeDeltaBuckets,
   repairCodebuddyLogJsonlOverlap,
@@ -3440,7 +3593,10 @@ async function drainQueueToCloud({ baseUrl, deviceToken, queuePath, queueStatePa
   for (let batch = 0; batch < maxBatches; batch++) {
     if (offset >= queueSize) break;
     const result = await readQueueBatch(queuePath, offset, limit);
-    if (result.buckets.length === 0) break;
+    // A states-only tail (e.g. a retry batch whose bucket rows already
+    // uploaded) is still a meaningful upload: it advances the canonical
+    // session corrections cloud-side.
+    if (result.buckets.length === 0 && result.sessionStates.length === 0) break;
     const root = baseUrl.replace(/\/$/, "");
     const anonKey = process.env.TOKENTRACKER_INSFORGE_ANON_KEY || "";
@@ -3453,7 +3609,12 @@ async function drainQueueToCloud({ baseUrl, deviceToken, queuePath, queueStatePa
     const res = await fetch(`${root}/functions/${INGEST_SLUG}`, {
       method: "POST",
       headers,
-      body: JSON.stringify({ hourly: result.buckets }),
+      body: JSON.stringify({
+        hourly: result.buckets,
+        ...(result.sessionStates.length > 0
+          ? { account_session_states: result.sessionStates }
+          : {}),
+      }),
     });
     const rawText = await res.text().catch(() => "");
@@ -3490,6 +3651,26 @@ async function readQueueBatch(queuePath, startOffset, maxBuckets) {
   const rl = readline.createInterface({ input: stream, crlfDelay: Infinity });
   const bucketMap = new Map();
+  // Account session states (kind: "account_session_state") are queue
+  // control records, not usage rows: collect them separately so they ride
+  // the same upload (after the bucket rows in file order) without entering
+  // the bucket stream. Keyed by (source, session_id) LAST-WINS: the
+  // append-only queue writes a session's newer observation after its older
+  // one, and only the latest per session may reach the ingest batch (a
+  // duplicate would make the cloud ON CONFLICT affect one row twice).
+  // snapshot_verified_at rides along verbatim from the ORIGINAL fetch, so a
+  // transport retry never fakes logical freshness.
+  //
+  // Batching: session-state records count toward the SAME per-batch record
+  // cap (maxBuckets) as bucket rows. The ingest edge rejects a request with
+  // more than 500 states (HTTP 400); before they counted, a states-heavy
+  // queue (a fresh device's first 30-day TRAE sync appends one record per
+  // observed session) was read in ONE uncapped batch - the 400 left the
+  // queue offset untouched and every retry re-read the identical oversized
+  // request, a permanent upload failure. With the default batchSize of 200
+  // (and the MAX_INGEST_BUCKETS=500 clamp above), every request stays under
+  // the edge cap while batching follows the existing design.
+  const sessionStateMap = new Map();
   let offset = startOffset;
   let linesRead = 0;
   for await (const line of rl) {
@@ -3502,6 +3683,37 @@ async function readQueueBatch(queuePath, startOffset, maxBuckets) {
     } catch (_e) {
       continue;
     }
+    if (bucket?.kind === "account_session_state") {
+      if (typeof bucket.source === "string" && typeof bucket.session_id === "string" && bucket.session_id.trim()) {
+        const ssSource = bucket.source.trim().toLowerCase();
+        sessionStateMap.set(ssSource + "|" + bucket.session_id.trim(), {
+          source: ssSource,
+          session_id: bucket.session_id.trim(),
+          model: typeof bucket.model === "string" ? bucket.model : "",
+          bucket_start: typeof bucket.bucket_start === "string" ? bucket.bucket_start : "",
+          input_tokens: Number(bucket.input_tokens) || 0,
+          output_tokens: Number(bucket.output_tokens) || 0,
+          cached_input_tokens: Number(bucket.cached_input_tokens) || 0,
+          cache_creation_input_tokens: Number(bucket.cache_creation_input_tokens) || 0,
+          reasoning_output_tokens: Number(bucket.reasoning_output_tokens) || 0,
+          total_tokens: Number(bucket.total_tokens) || 0,
+          ...(typeof bucket.snapshot_verified_at === "string" && bucket.snapshot_verified_at
+            ? { snapshot_verified_at: bucket.snapshot_verified_at }
+            : {}),
+        });
+        // Counted like a bucket row: the record rides THIS batch and its
+        // bytes are covered by nextOffset, so the next batch resumes right
+        // after it.
+        linesRead += 1;
+        if (linesRead >= maxBuckets) break;
+      }
+      continue;
+    }
+    // Pre-release watermark records from this feature branch's dev queues
+    // are obsolete control records: drop them instead of letting them enter
+    // the bucket stream (they carry no hour_start and would be skipped
+    // downstream anyway, but be explicit).
+    if (bucket?.kind === "account_sync_watermark") continue;
     const hourStart = typeof bucket?.hour_start === "string" ? bucket.hour_start : null;
     if (!hourStart) continue;
     const source = (typeof bucket?.source === "string" ? bucket.source.trim().toLowerCase() : "") || "codex";
@@ -3521,7 +3733,11 @@ async function readQueueBatch(queuePath, startOffset, maxBuckets) {
   rl.close();
   stream.close?.();
-  return { buckets: Array.from(bucketMap.values()), nextOffset: offset };
+  return {
+    buckets: Array.from(bucketMap.values()),
+    sessionStates: Array.from(sessionStateMap.values()),
+    nextOffset: offset,
+  };
 }
 function normalizeGrokRepairSource(value) {