@vibe-cafe/vibe-usage 0.2.7 → 0.3.0

package/package.json

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

package/src/api.js

@@ -102,14 +102,16 @@ function _send(apiUrl, apiKey, buckets, onProgress) {
 }
 
 /**
- * DELETE all usage data for the authenticated user.
- * @param {string} apiUrl - Base URL (e.g. "https://vibecafe.ai")
- * @param {string} apiKey - Bearer token (vbu_xxx)
+ * DELETE usage data for the authenticated user.
+ * @param {string} apiUrl
+ * @param {string} apiKey
+ * @param {{hostname?: string}} [opts]
  * @returns {Promise<{deleted: number}>}
  */
-export function deleteAllData(apiUrl, apiKey) {
+export function deleteAllData(apiUrl, apiKey, opts) {
   return new Promise((resolve, reject) => {
     const url = new URL('/api/usage/ingest', apiUrl);
+    if (opts?.hostname) url.searchParams.set('hostname', opts.hostname);
     const mod = url.protocol === 'https:' ? https : http;
 
     const req = mod.request(url, {

package/src/index.js

@@ -13,7 +13,6 @@ async function showStatus() {
     console.log(`  Config: ${getConfigPath()}`);
     console.log(`  API key: ${config.apiKey.slice(0, 8)}...`);
     console.log(`  API URL: ${config.apiUrl || 'https://vibecafe.ai'}`);
-    console.log(`  Last sync: ${config.lastSync || 'never'}`);
   }
 
   console.log('\n  Detected tools:');
@@ -35,7 +34,7 @@ async function showStatus() {
   console.log();
 }
 
-const VALID_CONFIG_KEYS = ['apiKey', 'apiUrl', 'lastSync'];
+const VALID_CONFIG_KEYS = ['apiKey', 'apiUrl'];
 
 function handleConfig(args) {
   const sub = args[0];
@@ -105,7 +104,7 @@ export async function run(args) {
     }
     case 'reset': {
       const { runReset } = await import('./reset.js');
-      await runReset();
+      await runReset(args.slice(1));
       break;
     }
     case 'config': {
@@ -127,6 +126,7 @@ export async function run(args) {
     npx vibe-usage init         Set up API key
     npx vibe-usage sync         Manually sync usage data
     npx vibe-usage reset        Delete all data and re-upload
+    npx vibe-usage reset --host  Delete data for this host only and re-upload
     npx vibe-usage status       Show config and detected tools
     npx vibe-usage config show  Show full config as JSON
     npx vibe-usage config get <key>   Get a config value

package/src/init.js

@@ -61,7 +61,6 @@ export async function runInit() {
   const config = {
     apiKey,
     apiUrl,
-    lastSync: existing?.lastSync || null,
   };
   saveConfig(config);
 

package/src/parsers/claude-code.js

@@ -35,7 +35,7 @@ export function commitState() {
   }
 }
 
-export async function parse(lastSync) {
+export async function parse() {
   let sessions;
   try {
     sessions = await loadSessionData({ mode: 'display' });
@@ -50,7 +50,6 @@ export async function parse(lastSync) {
   const entries = [];
 
   for (const session of sessions) {
-    if (lastSync && new Date(session.lastActivity) <= new Date(lastSync)) continue;
 
     const project = resolveProject(session);
     const sessionKey = `${session.projectPath}\0${session.sessionId}`;

package/src/parsers/codex.js

@@ -27,21 +27,13 @@ function findJsonlFiles(dir) {
   return results;
 }
 
-export async function parse(lastSync) {
+export async function parse() {
   if (!existsSync(SESSIONS_DIR)) return [];
 
   const entries = [];
   const files = findJsonlFiles(SESSIONS_DIR);
   if (files.length === 0) return [];
   for (const filePath of files) {
-    if (lastSync) {
-      try {
-        const stat = statSync(filePath);
-        if (stat.mtime <= new Date(lastSync)) continue;
-      } catch {
-        continue;
-      }
-    }
 
     let content;
     try {
@@ -99,7 +91,6 @@ export async function parse(lastSync) {
 
         const timestamp = obj.timestamp ? new Date(obj.timestamp) : null;
         if (!timestamp || isNaN(timestamp.getTime())) continue;
-        if (lastSync && timestamp <= new Date(lastSync)) continue;
 
         // Prefer incremental per-request usage; compute delta from cumulative total as fallback
         let usage = info.last_token_usage;

package/src/parsers/gemini-cli.js

@@ -30,21 +30,13 @@ function findSessionFiles(baseDir) {
   return results;
 }
 
-export async function parse(lastSync) {
+export async function parse() {
   const sessionFiles = findSessionFiles(TMP_DIR);
   if (sessionFiles.length === 0) return [];
 
   const entries = [];
 
   for (const filePath of sessionFiles) {
-    if (lastSync) {
-      try {
-        const stat = statSync(filePath);
-        if (stat.mtime <= new Date(lastSync)) continue;
-      } catch {
-        continue;
-      }
-    }
 
     let data;
     try {
@@ -65,7 +57,6 @@ export async function parse(lastSync) {
       if (!timestamp) continue;
       const ts = new Date(timestamp);
       if (isNaN(ts.getTime())) continue;
-      if (lastSync && ts <= new Date(lastSync)) continue;
 
       if (tokens) {
         // New format: { input, output, cached, thoughts, tool, total }

package/src/parsers/openclaw.js

@@ -20,7 +20,7 @@ function getTokens(usage, ...keys) {
   return 0;
 }
 
-export async function parse(lastSync) {
+export async function parse() {
   const entries = [];
 
   for (const root of POSSIBLE_ROOTS) {
@@ -49,14 +49,6 @@ export async function parse(lastSync) {
 
       for (const file of files) {
         const filePath = join(sessionsDir, file);
-        if (lastSync) {
-          try {
-            const stat = statSync(filePath);
-            if (stat.mtime <= new Date(lastSync)) continue;
-          } catch {
-            continue;
-          }
-        }
 
         let content;
         try {
@@ -82,7 +74,6 @@ export async function parse(lastSync) {
             if (!timestamp) continue;
             const ts = new Date(typeof timestamp === 'number' ? timestamp : timestamp);
             if (isNaN(ts.getTime())) continue;
-            if (lastSync && ts <= new Date(lastSync)) continue;
 
             entries.push({
               source: 'openclaw',

package/src/parsers/opencode.js

@@ -12,26 +12,22 @@ const MESSAGES_DIR = join(DATA_DIR, 'storage', 'message');
  * Parse opencode usage data.
  * Tries SQLite database first (opencode >= v0.2), falls back to legacy JSON files.
  */
-export async function parse(lastSync) {
+export async function parse() {
   if (existsSync(DB_PATH)) {
     try {
-      return parseFromSqlite(lastSync);
+      return parseFromSqlite();
     } catch (err) {
       process.stderr.write(`warn: opencode sqlite parse failed (${err.message}), trying legacy json...\n`);
     }
   }
-  return parseFromJson(lastSync);
+  return parseFromJson();
 }
 
-function parseFromSqlite(lastSync) {
+function parseFromSqlite() {
   // Build WHERE clause: only messages with token data
   const conditions = [
     "(json_extract(data, '$.tokens.input') > 0 OR json_extract(data, '$.tokens.output') > 0)",
   ];
-  if (lastSync) {
-    const sinceMs = new Date(lastSync).getTime();
-    conditions.push(`time_created > ${sinceMs}`);
-  }
 
   const query = `SELECT data FROM message WHERE ${conditions.join(' AND ')}`;
 
@@ -76,7 +72,6 @@ function parseFromSqlite(lastSync) {
 
     const timestamp = new Date(data.time?.created);
     if (isNaN(timestamp.getTime())) continue;
-    if (lastSync && timestamp <= new Date(lastSync)) continue;
 
     const rootPath = data.path?.root;
     const project = rootPath ? basename(rootPath) : 'unknown';
@@ -97,7 +92,7 @@ function parseFromSqlite(lastSync) {
 }
 
 /** Legacy parser: reads JSON files from storage/message directories. */
-function parseFromJson(lastSync) {
+function parseFromJson() {
   if (!existsSync(MESSAGES_DIR)) return [];
 
   const entries = [];
@@ -120,14 +115,6 @@ function parseFromJson(lastSync) {
 
     for (const file of msgFiles) {
       const filePath = join(sessionPath, file);
-      if (lastSync) {
-        try {
-          const stat = statSync(filePath);
-          if (stat.mtime <= new Date(lastSync)) continue;
-        } catch {
-          continue;
-        }
-      }
 
       let data;
       try {
@@ -144,7 +131,6 @@ function parseFromJson(lastSync) {
 
       const timestamp = new Date(data.time?.created);
       if (isNaN(timestamp.getTime())) continue;
-      if (lastSync && timestamp <= new Date(lastSync)) continue;
 
       const rootPath = data.path?.root;
       const project = rootPath ? basename(rootPath) : 'unknown';

package/src/reset.js

@@ -1,7 +1,7 @@
 import { createInterface } from 'node:readline';
 import { existsSync, unlinkSync } from 'node:fs';
 import { join } from 'node:path';
-import { homedir } from 'node:os';
+import { homedir, hostname as getHostname } from 'node:os';
 import { loadConfig, saveConfig } from './config.js';
 import { deleteAllData } from './api.js';
 import { runSync } from './sync.js';
@@ -20,33 +20,57 @@ function prompt(question) {
   });
 }
 
-export async function runReset() {
+export async function runReset(args = []) {
+  const hostOnly = args.includes('--host');
   const config = loadConfig();
   if (!config?.apiKey) {
     console.error('Not configured. Run `npx @vibe-cafe/vibe-usage init` first.');
     process.exit(1);
   }
 
-  const answer = await prompt('This will delete ALL your usage data and re-upload from local logs. Continue? (y/N) ');
-  if (answer.toLowerCase() !== 'y') {
-    console.log('Cancelled.');
-    return;
-  }
-
+  const currentHost = getHostname();
   const apiUrl = config.apiUrl || 'https://vibecafe.ai';
 
-  // 1. Delete remote data
-  console.log('Deleting remote data...');
-  try {
-    const result = await deleteAllData(apiUrl, config.apiKey);
-    console.log(`Deleted ${result.deleted} buckets from server.`);
-  } catch (err) {
-    if (err.message === 'UNAUTHORIZED') {
-      console.error('Invalid API key. Run `npx @vibe-cafe/vibe-usage init` to reconfigure.');
+  if (hostOnly) {
+    const answer = await prompt(`This will delete usage data for this host (${currentHost}) and re-upload from local logs. Continue? (y/N) `);
+    if (answer.toLowerCase() !== 'y') {
+      console.log('Cancelled.');
+      return;
+    }
+
+    // 1. Delete remote data for this host
+    console.log(`Deleting remote data for host: ${currentHost}...`);
+    try {
+      const result = await deleteAllData(apiUrl, config.apiKey, { hostname: currentHost });
+      console.log(`Deleted ${result.deleted} buckets from server.`);
+    } catch (err) {
+      if (err.message === 'UNAUTHORIZED') {
+        console.error('Invalid API key. Run `npx @vibe-cafe/vibe-usage init` to reconfigure.');
+        process.exit(1);
+      }
+      console.error(`Failed to delete remote data: ${err.message}`);
+      process.exit(1);
+    }
+  } else {
+    const answer = await prompt('This will delete ALL your usage data and re-upload from local logs. Continue? (y/N) ');
+    if (answer.toLowerCase() !== 'y') {
+      console.log('Cancelled.');
+      return;
+    }
+
+    // 1. Delete all remote data
+    console.log('Deleting all remote data...');
+    try {
+      const result = await deleteAllData(apiUrl, config.apiKey);
+      console.log(`Deleted ${result.deleted} buckets from server.`);
+    } catch (err) {
+      if (err.message === 'UNAUTHORIZED') {
+        console.error('Invalid API key. Run `npx @vibe-cafe/vibe-usage init` to reconfigure.');
+        process.exit(1);
+      }
+      console.error(`Failed to delete remote data: ${err.message}`);
       process.exit(1);
     }
-    console.error(`Failed to delete remote data: ${err.message}`);
-    process.exit(1);
   }
 
   // 2. Clear local state

package/src/sync.js

@@ -18,12 +18,17 @@ export async function runSync() {
     process.exit(1);
   }
 
-  const lastSync = config.lastSync || null;
+  // Migration: remove deprecated lastSync field from config
+  if ('lastSync' in config) {
+    delete config.lastSync;
+    saveConfig(config);
+  }
+
   const allBuckets = [];
 
   for (const [source, parse] of Object.entries(parsers)) {
     try {
-      const buckets = await parse(lastSync);
+      const buckets = await parse();
       if (buckets.length > 0) {
         allBuckets.push(...buckets);
       }
@@ -63,9 +68,7 @@ export async function runSync() {
       });
       totalIngested += result.ingested ?? batch.length;
 
-      // Save progress after each successful batch so partial uploads survive interruptions
-      config.lastSync = new Date().toISOString();
-      saveConfig(config);
+      // State commit happens after ALL batches complete (see postSyncHooks below)
     }
 
 
@@ -86,7 +89,7 @@ export async function runSync() {
       console.error('Invalid API key. Run `npx @vibe-cafe/vibe-usage init` to reconfigure.');
       process.exit(1);
     }
-    // Progress already saved per-batch — report partial success
+    // Report partial success
     if (totalIngested > 0) {
       console.error(`Sync partially completed (${totalIngested} buckets uploaded). ${err.message}`);
     } else {