@vibe-cafe/vibe-usage 0.10.17 → 0.10.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vibe-cafe/vibe-usage",
-  "version": "0.10.17",
+  "version": "0.10.18",
   "description": "Track your AI coding tool token usage and sync to vibecafe.ai",
   "type": "module",
   "scripts": {

package/src/parsers/codex-cache.js

@@ -14,7 +14,7 @@ import { join } from 'node:path';
 // separate from ~/.vibe-usage/state.json, whose hashes are the authoritative
 // record of successful uploads and must remain backward-compatible.
 export const CODEX_CACHE_SCHEMA_VERSION = 1;
-export const CODEX_PARSER_ALGORITHM_VERSION = 1;
+export const CODEX_PARSER_ALGORITHM_VERSION = 2;
 
 function hash(value, length = 24) {
   return createHash('sha256').update(value).digest('hex').slice(0, length);

package/src/parsers/codex.js

@@ -26,6 +26,39 @@ import {
   saveCodexFileTail,
 } from './codex-cache.js';
 
+const CODEX_API_BILLING_MARKER = '#billing=api';
+const CODEX_SUBSCRIPTION_BILLING_MARKER = '#billing=subscription';
+// Changing a model id changes its server-side bucket key. Keep pre-release
+// history byte-for-byte stable so upgrading cannot re-upload the same tokens
+// under decorated keys and double-count them.
+const CODEX_BILLING_ATTRIBUTION_START_MS = Date.parse('2026-08-31T00:00:00.000Z');
+
+function normalizeCodexServiceTier(value) {
+  if (typeof value !== 'string') return null;
+  const tier = value.trim().toLowerCase();
+  if (tier === 'fast' || tier === 'priority') return tier;
+  if (tier === 'flex' || tier === 'batch') return tier;
+  return null;
+}
+
+function hasSubscriptionPlan(planType) {
+  return typeof planType === 'string'
+    && planType.trim() !== ''
+    && planType.toLowerCase() !== 'unknown';
+}
+
+function decorateCodexModel(model, serviceTier, subscriptionBilling, timestampMs) {
+  let decorated = model || 'unknown';
+  if (decorated === 'unknown' || timestampMs < CODEX_BILLING_ATTRIBUTION_START_MS) {
+    return decorated;
+  }
+  if (serviceTier) decorated += `-${serviceTier}`;
+  decorated += subscriptionBilling
+    ? CODEX_SUBSCRIPTION_BILLING_MARKER
+    : CODEX_API_BILLING_MARKER;
+  return decorated;
+}
+
 // Codex stores live sessions in $CODEX_HOME/sessions (default ~/.codex) and,
 // once a session is "completed", moves its rollout file verbatim into
 // $CODEX_HOME/archived_sessions. A session can be archived between two syncs,
@@ -600,6 +633,8 @@ async function parseSessionFile(filePath, snapshotSize, fm, boundary, {
   const sessionKey = fm.sessionId || filePath;
 
   let turnContextModel = previousTail?.turnContextModel || 'unknown';
+  let serviceTier = previousTail?.serviceTier || null;
+  let subscriptionBilling = previousTail?.subscriptionBilling || false;
   let prevTotal = previousTail?.prevTotal || null;
   let prevCumulativeTotal = previousTail?.prevCumulativeTotal ?? null;
   const start = previousTail?.parsedBytes || 0;
@@ -644,8 +679,11 @@ async function parseSessionFile(filePath, snapshotSize, fm, boundary, {
         }
       }
 
-      if (obj.type === 'turn_context' && obj.payload?.model) {
-        turnContextModel = obj.payload.model;
+      if (obj.type === 'turn_context') {
+        if (obj.payload?.model) turnContextModel = obj.payload.model;
+        if (Object.hasOwn(obj.payload || {}, 'service_tier')) {
+          serviceTier = normalizeCodexServiceTier(obj.payload.service_tier);
+        }
         continue;
       }
 
@@ -654,6 +692,15 @@ async function parseSessionFile(filePath, snapshotSize, fm, boundary, {
       const payload = obj.payload;
       if (!payload) continue;
 
+      if (payload.type === 'thread_settings_applied') {
+        const settings = payload.thread_settings;
+        if (settings?.model) turnContextModel = settings.model;
+        if (Object.hasOwn(settings || {}, 'service_tier')) {
+          serviceTier = normalizeCodexServiceTier(settings.service_tier);
+        }
+        continue;
+      }
+
       if (payload.type !== 'token_count') continue;
 
         // Raw ordinals advance before validating usage/timestamp so pass 1 and
@@ -661,6 +708,10 @@ async function parseSessionFile(filePath, snapshotSize, fm, boundary, {
       const isReplayedHistory = inReplayBlock;
       rawTokenSeen++;
 
+      if (hasSubscriptionPlan(payload.rate_limits?.plan_type)) {
+        subscriptionBilling = true;
+      }
+
       const info = payload.info;
       if (!info) continue;
 
@@ -709,7 +760,13 @@ async function parseSessionFile(filePath, snapshotSize, fm, boundary, {
       const timestamp = obj.timestamp ? new Date(obj.timestamp) : null;
       if (!timestamp || isNaN(timestamp.getTime())) continue;
 
-      const model = info.model || payload.model || turnContextModel || 'unknown';
+      const rawModel = info.model || payload.model || turnContextModel || 'unknown';
+      const model = decorateCodexModel(
+        rawModel,
+        serviceTier,
+        subscriptionBilling,
+        timestamp.getTime()
+      );
 
         // OpenAI API: input_tokens INCLUDES cached, output_tokens INCLUDES reasoning.
         // Normalize to Anthropic-style semantics where each field is non-overlapping.
@@ -764,6 +821,8 @@ async function parseSessionFile(filePath, snapshotSize, fm, boundary, {
       rawTokenSeen,
       firstSessionMetaSeen,
       turnContextModel,
+      serviceTier,
+      subscriptionBilling,
       prevTotal,
       prevCumulativeTotal,
       buckets,