@vibe-cafe/vibe-usage 0.1.3 → 0.1.5

package/package.json

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

package/src/api.js

@@ -18,6 +18,7 @@ export function ingest(apiUrl, apiKey, buckets) {
 
     const req = mod.request(url, {
       method: 'POST',
+      timeout: 60_000,
       headers: {
         'Content-Type': 'application/json',
         'Authorization': `Bearer ${apiKey}`,
@@ -44,6 +45,10 @@ export function ingest(apiUrl, apiKey, buckets) {
     });
 
     req.on('error', (err) => reject(err));
+    req.on('timeout', () => {
+      req.destroy();
+      reject(new Error('Request timed out (60s)'));
+    });
     req.write(body);
     req.end();
   });

package/src/init.js

@@ -1,5 +1,5 @@
 import { createInterface } from 'node:readline';
-import { exec } from 'node:child_process';
+import { execFile } from 'node:child_process';
 import { platform } from 'node:os';
 import { existsSync } from 'node:fs';
 import { loadConfig, saveConfig } from './config.js';
@@ -20,7 +20,8 @@ function prompt(question) {
 function openBrowser(url) {
   const cmds = { darwin: 'open', linux: 'xdg-open', win32: 'start' };
   const cmd = cmds[platform()] || cmds.linux;
-  exec(`${cmd} ${url}`, () => {});
+  // Use execFile with args array to avoid shell injection via VIBE_USAGE_API_URL
+  execFile(cmd, [url], () => {});
 }
 
 export async function runInit() {

package/src/parsers/claude-code.js

@@ -14,7 +14,7 @@ export async function parse(lastSync) {
   const entries = [];
 
   for (const session of sessions) {
-    if (lastSync && session.lastActivity <= lastSync) continue;
+    if (lastSync && new Date(session.lastActivity) <= new Date(lastSync)) continue;
 
     for (const breakdown of session.modelBreakdowns || []) {
       entries.push({

package/src/parsers/codex.js

@@ -36,6 +36,9 @@ export async function parse(lastSync) {
       continue;
     }
 
+    // Track previous cumulative totals per model to compute deltas when only total_token_usage is available
+    const prevTotal = new Map();
+
     for (const line of content.split('\n')) {
       if (!line.trim()) continue;
       try {
@@ -54,8 +57,25 @@ export async function parse(lastSync) {
         if (!timestamp || isNaN(timestamp.getTime())) continue;
         if (lastSync && timestamp <= new Date(lastSync)) continue;
 
-
-        const usage = info.last_token_usage || info.total_token_usage;
+        // Prefer incremental per-request usage; compute delta from cumulative total as fallback
+        let usage = info.last_token_usage;
+        if (!usage && info.total_token_usage) {
+          const totalKey = `${info.model || payload.model || ''}`;
+          const prev = prevTotal.get(totalKey);
+          const curr = info.total_token_usage;
+          if (prev) {
+            usage = {
+              input_tokens: (curr.input_tokens || 0) - (prev.input_tokens || 0),
+              output_tokens: (curr.output_tokens || 0) - (prev.output_tokens || 0),
+              cached_input_tokens: (curr.cached_input_tokens || 0) - (prev.cached_input_tokens || 0),
+              reasoning_output_tokens: (curr.reasoning_output_tokens || 0) - (prev.reasoning_output_tokens || 0),
+            };
+          } else {
+            // First cumulative entry — use as-is (it's the first event's total)
+            usage = curr;
+          }
+          prevTotal.set(totalKey, { ...curr });
+        }
         if (!usage) continue;
 
         const model = info.model || payload.model || 'unknown';

package/src/sync.js

@@ -39,13 +39,15 @@ export async function runSync() {
       const result = await ingest(apiUrl, config.apiKey, batch);
       totalIngested += result.ingested ?? batch.length;
 
+      // Save progress after each successful batch so partial uploads survive interruptions
+      config.lastSync = new Date().toISOString();
+      saveConfig(config);
+
       if (allBuckets.length > BATCH_SIZE) {
         process.stdout.write(`  ${Math.min(i + BATCH_SIZE, allBuckets.length)}/${allBuckets.length} buckets...\r`);
       }
     }
 
-    config.lastSync = new Date().toISOString();
-    saveConfig(config);
     console.log(`Synced ${totalIngested} buckets.`);
     return totalIngested;
   } catch (err) {
@@ -53,7 +55,12 @@ export async function runSync() {
       console.error('Invalid API key. Run `npx @vibe-cafe/vibe-usage init` to reconfigure.');
       process.exit(1);
     }
-    console.error(`Sync failed: ${err.message}`);
+    // Progress already saved per-batch — report partial success
+    if (totalIngested > 0) {
+      console.error(`Sync partially completed (${totalIngested} buckets uploaded). ${err.message}`);
+    } else {
+      console.error(`Sync failed: ${err.message}`);
+    }
     process.exit(1);
   }
 }