@vibe-cafe/vibe-usage 0.2.1 → 0.2.3

package/package.json

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

package/src/api.js

@@ -12,13 +12,14 @@ const INITIAL_DELAY = 1000;
  * @param {string} apiUrl - Base URL (e.g. "https://vibecafe.ai")
  * @param {string} apiKey - Bearer token (vbu_xxx)
  * @param {Array} buckets - Array of usage bucket objects
+ * @param {{onProgress?: (sent: number, total: number) => void}} [opts]
  * @returns {Promise<{ingested: number}>}
  */
-export async function ingest(apiUrl, apiKey, buckets) {
+export async function ingest(apiUrl, apiKey, buckets, opts) {
   let lastError;
   for (let attempt = 0; attempt < MAX_RETRIES; attempt++) {
     try {
-      return await _send(apiUrl, apiKey, buckets);
+      return await _send(apiUrl, apiKey, buckets, opts?.onProgress);
     } catch (err) {
       lastError = err;
       // Don't retry auth errors or client errors
@@ -34,10 +35,11 @@ export async function ingest(apiUrl, apiKey, buckets) {
   throw lastError;
 }
 
-function _send(apiUrl, apiKey, buckets) {
+function _send(apiUrl, apiKey, buckets, onProgress) {
   return new Promise((resolve, reject) => {
     const url = new URL('/api/usage/ingest', apiUrl);
-    const body = JSON.stringify({ buckets });
+    const body = Buffer.from(JSON.stringify({ buckets }));
+    const totalBytes = body.length;
     const mod = url.protocol === 'https:' ? https : http;
 
     const req = mod.request(url, {
@@ -46,7 +48,7 @@ function _send(apiUrl, apiKey, buckets) {
       headers: {
         'Content-Type': 'application/json',
         'Authorization': `Bearer ${apiKey}`,
-        'Content-Length': Buffer.byteLength(body),
+        'Content-Length': totalBytes,
       },
     }, (res) => {
       let data = '';
@@ -75,7 +77,26 @@ function _send(apiUrl, apiKey, buckets) {
       req.destroy();
       reject(new Error('Request timed out (60s)'));
     });
-    req.write(body);
-    req.end();
+
+    // Write body in chunks to report upload progress
+    const CHUNK = 16 * 1024;
+    let sent = 0;
+
+    function writeNext() {
+      let ok = true;
+      while (ok && sent < totalBytes) {
+        const slice = body.subarray(sent, sent + CHUNK);
+        sent += slice.length;
+        if (onProgress) onProgress(sent, totalBytes);
+        ok = req.write(slice);
+      }
+      if (sent < totalBytes) {
+        req.once('drain', writeNext);
+      } else {
+        req.end();
+      }
+    }
+
+    writeNext();
   });
 }

package/src/hooks.js

@@ -85,26 +85,36 @@ export function injectCodex() {
     mkdirSync(dirname(configPath), { recursive: true });
   }
 
+  const notifyLine = `notify = "sh -c \\"${SYNC_CMD}\\""`;
+
   if (content.includes('vibe-usage')) {
-    // Fix broken [notify] → [[notify]] from previous versions
-    content = content.replace(/^\[notify\]$/gm, '[[notify]]');
-    // Update existing command to use latest
+    // Migrate broken [[notify]] / [notify] table format and array format from previous versions
+    // to correct string format: notify = "sh -c \"...\""
+    content = content.replace(
+      /^\[\[?notify\]\]?\n(?:command\s*=\s*["'][^"']*["']\n?)?/gm,
+      notifyLine + '\n',
+    );
+    // Migrate array format: notify = ["sh", "-c", "..."]
+    content = content.replace(
+      /^notify\s*=\s*\[.*vibe-usage.*\]$/gm,
+      notifyLine,
+    );
+    // Update existing string format notify = "..." to use latest command
     content = content.replace(
-      /npx @vibe-cafe\/vibe-usage(?:@[\d.]+)? sync[^"']*/g,
-      SYNC_CMD,
+      /^notify\s*=\s*".*vibe-usage.*"$/gm,
+      notifyLine,
     );
     writeFileSync(configPath, content, 'utf-8');
     return { injected: false, reason: 'already installed (updated)' };
   }
 
-  const notifySection = `\n[[notify]]\ncommand = "${SYNC_CMD}"\n`;
-  const notifyIdx = content.indexOf('[[notify]]');
-  if (notifyIdx !== -1) {
-    const nextSection = content.indexOf('\n[', notifyIdx + 1);
-    const sectionEnd = nextSection === -1 ? content.length : nextSection;
-    content = content.slice(0, notifyIdx) + `[[notify]]\ncommand = "${SYNC_CMD}"` + content.slice(sectionEnd);
+  // Check if any notify line already exists
+  const hasNotify = /^notify\s*=/m.test(content);
+  if (hasNotify) {
+    // Replace existing notify value
+    content = content.replace(/^notify\s*=\s*.+$/gm, notifyLine);
   } else {
-    content += notifySection;
+    content += `\n${notifyLine}\n`;
   }
 
   writeFileSync(configPath, content, 'utf-8');

package/src/parsers/codex.js

@@ -72,6 +72,8 @@ export async function parse(lastSync) {
       } catch { break; }
     }
 
+    // Track model from turn_context events (fallback when token_count lacks model)
+    let turnContextModel = 'unknown';
     // 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')) {
@@ -83,7 +85,15 @@ export async function parse(lastSync) {
         if (obj.type !== 'event_msg') continue;
 
         const payload = obj.payload;
-        if (!payload || payload.type !== 'token_count') continue;
+        if (!payload) continue;
+
+        // Capture model from turn_context events
+        if (payload.type === 'turn_context' && payload.model) {
+          turnContextModel = payload.model;
+          continue;
+        }
+
+        if (payload.type !== 'token_count') continue;
 
         const info = payload.info;
         if (!info) continue;
@@ -113,7 +123,7 @@ export async function parse(lastSync) {
         }
         if (!usage) continue;
 
-        const model = info.model || payload.model || sessionModel;
+        const model = info.model || payload.model || turnContextModel || sessionModel;
 
         entries.push({
           source: 'codex',

package/src/sync.js

@@ -9,6 +9,12 @@ import { TOOLS } from './hooks.js';
 
 const BATCH_SIZE = 500;
 
+function formatBytes(bytes) {
+  if (bytes < 1024) return `${bytes}B`;
+  if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)}KB`;
+  return `${(bytes / (1024 * 1024)).toFixed(1)}MB`;
+}
+
 export async function runSync() {
   // Self-heal: re-inject any missing hooks before syncing
   ensureHooks();
@@ -54,13 +60,14 @@ export async function runSync() {
     for (let i = 0; i < allBuckets.length; i += BATCH_SIZE) {
       const batch = allBuckets.slice(i, i + BATCH_SIZE);
       const batchNum = Math.floor(i / BATCH_SIZE) + 1;
-      const uploaded = Math.min(i + BATCH_SIZE, allBuckets.length);
-
-      if (totalBatches > 1) {
-        process.stdout.write(`  [${batchNum}/${totalBatches}] ${uploaded}/${allBuckets.length} buckets...\r`);
-      }
-
-      const result = await ingest(apiUrl, config.apiKey, batch);
+      const prefix = totalBatches > 1 ? `  [${batchNum}/${totalBatches}] ` : '  ';
+
+      const result = await ingest(apiUrl, config.apiKey, batch, {
+        onProgress(sent, total) {
+          const pct = Math.round((sent / total) * 100);
+          process.stdout.write(`${prefix}${formatBytes(sent)}/${formatBytes(total)} (${pct}%)\r`);
+        },
+      });
       totalIngested += result.ingested ?? batch.length;
 
       // Save progress after each successful batch so partial uploads survive interruptions
@@ -68,7 +75,7 @@ export async function runSync() {
       saveConfig(config);
     }
 
-    if (totalBatches > 1) {
+    if (totalBatches > 1 || allBuckets.length > 0) {
       process.stdout.write('\n');
     }
     console.log(`Synced ${totalIngested} buckets.`);