@vibe-cafe/vibe-usage 0.2.5 → 0.2.7

package/README.md

@@ -11,8 +11,7 @@ npx vibe-usage
 This will:
 1. Ask for your API key (get one at https://vibecafe.ai/usage/setup)
 2. Detect installed AI coding tools
-3. Install session-end hooks for automatic syncing
-4. Run an initial sync of your usage data
+3. Run an initial sync of your usage data
 
 ## Commands
 
@@ -20,18 +19,19 @@ This will:
 npx vibe-usage          # Init (first run) or sync (subsequent runs)
 npx vibe-usage init     # Re-run setup
 npx vibe-usage sync     # Manual sync
+npx vibe-usage reset    # Delete all data and re-upload from local logs
 npx vibe-usage status   # Show config & detected tools
 ```
 
 ## Supported Tools
 
-| Tool | Auto-sync | Data Location |
-|------|-----------|---------------|
-| Claude Code | Yes (session hook) | `~/.claude/projects/` |
-| Codex CLI | Yes (notify hook) | `~/.codex/sessions/` |
-| Gemini CLI | Yes (session hook) | `~/.gemini/tmp/` |
-| OpenCode | Manual only | `~/.local/share/opencode/opencode.db` (SQLite) |
-| OpenClaw | Manual only | `~/.openclaw/agents/` |
+| Tool | Data Location |
+|------|---------------|
+| Claude Code | `~/.claude/projects/` |
+| Codex CLI | `~/.codex/sessions/` |
+| Gemini CLI | `~/.gemini/tmp/` |
+| OpenCode | `~/.local/share/opencode/opencode.db` (SQLite) |
+| OpenClaw | `~/.openclaw/agents/` |
 
 ## How It Works
 
@@ -39,6 +39,7 @@ npx vibe-usage status   # Show config & detected tools
 - Aggregates token usage into 30-minute buckets
 - Uploads to your vibecafe.ai dashboard
 - Only syncs new data since last sync (incremental)
+- For continuous syncing, use the [Vibe Usage Mac app](https://github.com/vibe-cafe/vibe-usage-app) (auto-syncs every 5 minutes)
 
 ## Config
 

package/package.json

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

package/src/api.js

@@ -100,3 +100,52 @@ function _send(apiUrl, apiKey, buckets, onProgress) {
     writeNext();
   });
 }
+
+/**
+ * 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)
+ * @returns {Promise<{deleted: number}>}
+ */
+export function deleteAllData(apiUrl, apiKey) {
+  return new Promise((resolve, reject) => {
+    const url = new URL('/api/usage/ingest', apiUrl);
+    const mod = url.protocol === 'https:' ? https : http;
+
+    const req = mod.request(url, {
+      method: 'DELETE',
+      timeout: 60_000,
+      headers: {
+        'Authorization': `Bearer ${apiKey}`,
+      },
+    }, (res) => {
+      let data = '';
+      res.on('data', (chunk) => { data += chunk; });
+      res.on('end', () => {
+        if (res.statusCode === 401) {
+          reject(new Error('UNAUTHORIZED'));
+          return;
+        }
+        if (res.statusCode < 200 || res.statusCode >= 300) {
+          const err = new Error(`HTTP ${res.statusCode}: ${data}`);
+          err.statusCode = res.statusCode;
+          reject(err);
+          return;
+        }
+        try {
+          resolve(JSON.parse(data));
+        } catch {
+          reject(new Error(`Invalid JSON response: ${data}`));
+        }
+      });
+    });
+
+    req.on('error', (err) => reject(err));
+    req.on('timeout', () => {
+      req.destroy();
+      reject(new Error('Request timed out (60s)'));
+    });
+
+    req.end();
+  });
+}

package/src/hooks.js

@@ -1,178 +1,32 @@
-import { readFileSync, writeFileSync, existsSync, mkdirSync } from 'node:fs';
-import { join, dirname } from 'node:path';
+import { existsSync } from 'node:fs';
+import { join } from 'node:path';
 import { homedir } from 'node:os';
 
-const SYNC_CMD = 'npx @vibe-cafe/vibe-usage sync 2>/dev/null &';
-
-/**
- * Check if a SessionEnd hook array (new or old format) already contains a vibe-usage hook.
- */
-function hasVibeUsageHook(hooks) {
-  if (!Array.isArray(hooks)) return false;
-  return hooks.some(entry => {
-    // New format: { matcher?: "...", hooks: [{ type, command }] }
-    if (Array.isArray(entry.hooks)) {
-      return entry.hooks.some(h => h.command && h.command.includes('vibe-usage'));
-    }
-    // Old format: { type, command } directly
-    if (entry.command && entry.command.includes('vibe-usage')) return true;
-    return false;
-  });
-}
-
-/**
- * Migrate old-format hook entries to the new matcher format.
- * Old: [{ type: "command", command: "..." }]
- * New: [{ hooks: [{ type: "command", command: "..." }] }]
- */
-function migrateOldFormatHooks(hooks) {
-  if (!Array.isArray(hooks)) return hooks;
-  return hooks.map(entry => {
-    // Already new format (has "hooks" array)
-    if (Array.isArray(entry.hooks)) return entry;
-    // Old format: bare handler → wrap in matcher group
-    if (entry.type && entry.command) {
-      return { hooks: [entry] };
-    }
-    return entry;
-  });
-}
-
-export function injectClaudeCode() {
-  const settingsPath = join(homedir(), '.claude', 'settings.json');
-  let settings = {};
-  if (existsSync(settingsPath)) {
-    try { settings = JSON.parse(readFileSync(settingsPath, 'utf-8')); } catch { settings = {}; }
-  } else {
-    mkdirSync(dirname(settingsPath), { recursive: true });
-  }
-
-  if (!settings.hooks) settings.hooks = {};
-  if (!settings.hooks.SessionEnd) settings.hooks.SessionEnd = [];
-
-  // Migrate any old-format hooks first
-  settings.hooks.SessionEnd = migrateOldFormatHooks(settings.hooks.SessionEnd);
-
-  if (hasVibeUsageHook(settings.hooks.SessionEnd)) {
-    // Update the command in existing hook to use latest
-    for (const group of settings.hooks.SessionEnd) {
-      if (Array.isArray(group.hooks)) {
-        for (const h of group.hooks) {
-          if (h.command && h.command.includes('vibe-usage')) {
-            h.command = SYNC_CMD;
-          }
-        }
-      }
-    }
-    writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + '\n', 'utf-8');
-    return { injected: false, reason: 'already installed (updated)' };
-  }
-
-  // New format: matcher group with hooks array
-  settings.hooks.SessionEnd.push({
-    hooks: [{ type: 'command', command: SYNC_CMD }],
-  });
-  writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + '\n', 'utf-8');
-  return { injected: true };
-}
-
-export function injectCodex() {
-  const configPath = join(homedir(), '.codex', 'config.toml');
-  let content = '';
-  if (existsSync(configPath)) {
-    content = readFileSync(configPath, 'utf-8');
-  } else {
-    mkdirSync(dirname(configPath), { recursive: true });
-  }
-
-  const notifyLine = `notify = "sh -c \\"${SYNC_CMD}\\""`;
-
-  if (content.includes('vibe-usage')) {
-    // 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(
-      /^notify\s*=\s*".*vibe-usage.*"$/gm,
-      notifyLine,
-    );
-    writeFileSync(configPath, content, 'utf-8');
-    return { injected: false, reason: 'already installed (updated)' };
-  }
-
-  // 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 += `\n${notifyLine}\n`;
-  }
-
-  writeFileSync(configPath, content, 'utf-8');
-  return { injected: true };
-}
-
-export function injectGeminiCli() {
-  const settingsPath = join(homedir(), '.gemini', 'settings.json');
-  let settings = {};
-  if (existsSync(settingsPath)) {
-    try { settings = JSON.parse(readFileSync(settingsPath, 'utf-8')); } catch { settings = {}; }
-  } else {
-    mkdirSync(dirname(settingsPath), { recursive: true });
-  }
-
-  if (!settings.hooks) settings.hooks = {};
-  if (!settings.hooks.SessionEnd) settings.hooks.SessionEnd = [];
-
-  if (hasVibeUsageHook(settings.hooks.SessionEnd)) {
-    return { injected: false, reason: 'already installed' };
-  }
-
-  // Gemini CLI still uses the flat format (no matcher groups)
-  settings.hooks.SessionEnd.push({ type: 'command', command: SYNC_CMD });
-  writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + '\n', 'utf-8');
-  return { injected: true };
-}
-
 export const TOOLS = [
   {
     name: 'Claude Code',
     id: 'claude-code',
     dataDir: join(homedir(), '.claude', 'projects'),
-    inject: injectClaudeCode,
   },
   {
     name: 'Codex CLI',
     id: 'codex',
     dataDir: join(homedir(), '.codex', 'sessions'),
-    inject: injectCodex,
   },
   {
     name: 'Gemini CLI',
     id: 'gemini-cli',
     dataDir: join(homedir(), '.gemini', 'tmp'),
-    inject: injectGeminiCli,
   },
   {
     name: 'OpenCode',
     id: 'opencode',
     dataDir: join(homedir(), '.local', 'share', 'opencode'),
-    inject: null,
   },
   {
     name: 'OpenClaw',
     id: 'openclaw',
     dataDir: join(homedir(), '.openclaw', 'agents'),
-    inject: null,
   },
 ];
 

package/src/index.js

@@ -22,8 +22,7 @@ async function showStatus() {
     console.log('    (none)\n');
   } else {
     for (const tool of detected) {
-      const hookStatus = tool.inject ? 'auto-sync' : 'manual only';
-      console.log(`    ${tool.name} (${hookStatus})`);
+      console.log(`    ${tool.name}`);
     }
     console.log();
   }
@@ -104,6 +103,11 @@ export async function run(args) {
       await runSync();
       break;
     }
+    case 'reset': {
+      const { runReset } = await import('./reset.js');
+      await runReset();
+      break;
+    }
     case 'config': {
       handleConfig(args.slice(1));
       break;
@@ -120,8 +124,9 @@ export async function run(args) {
 
   Usage:
     npx vibe-usage              Init (first run) or sync
-    npx vibe-usage init         Set up API key and hooks
+    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 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

@@ -1,11 +1,10 @@
 import { createInterface } from 'node:readline';
 import { execFile } from 'node:child_process';
 import { platform } from 'node:os';
-import { existsSync } from 'node:fs';
 import { loadConfig, saveConfig } from './config.js';
-import { detectInstalledTools } from './hooks.js';
 import { ingest } from './api.js';
 import { runSync } from './sync.js';
+import { detectInstalledTools } from './hooks.js';
 
 function prompt(question) {
   const rl = createInterface({ input: process.stdin, output: process.stdout });
@@ -67,29 +66,9 @@ export async function runInit() {
   saveConfig(config);
 
   const tools = detectInstalledTools();
-  const hooked = [];
-  const manualOnly = [];
-
-  for (const tool of tools) {
-    if (tool.inject) {
-      try {
-        const result = tool.inject();
-        hooked.push(tool.name + (result.injected ? '' : ' (already installed)'));
-      } catch (err) {
-        console.error(`  warn: Failed to inject hook for ${tool.name}: ${err.message}`);
-      }
-    } else {
-      manualOnly.push(tool.name);
-    }
-  }
-
-  if (hooked.length > 0) {
-    console.log(`Hooks installed for: ${hooked.join(', ')}`);
-  }
-  for (const name of manualOnly) {
-    console.log(`${name} detected — use \`npx @vibe-cafe/vibe-usage sync\` to sync manually.`);
-  }
-  if (tools.length === 0) {
+  if (tools.length > 0) {
+    console.log(`Detected tools: ${tools.map(t => t.name).join(', ')}`);
+  } else {
     console.log('No AI coding tools detected. Install one and re-run init.');
   }
 

package/src/parsers/codex.js

@@ -81,18 +81,17 @@ export async function parse(lastSync) {
       try {
         const obj = JSON.parse(line);
 
+        // Capture model from top-level turn_context entries
+        if (obj.type === 'turn_context' && obj.payload?.model) {
+          turnContextModel = obj.payload.model;
+          continue;
+        }
 
         if (obj.type !== 'event_msg') continue;
 
         const payload = obj.payload;
         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;
@@ -105,7 +104,7 @@ export async function parse(lastSync) {
         // 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 totalKey = `${info.model || payload.model || turnContextModel || ''}`;
           const prev = prevTotal.get(totalKey);
           const curr = info.total_token_usage;
           if (prev) {

package/src/reset.js

@@ -0,0 +1,68 @@
+import { createInterface } from 'node:readline';
+import { existsSync, unlinkSync } from 'node:fs';
+import { join } from 'node:path';
+import { homedir } from 'node:os';
+import { loadConfig, saveConfig } from './config.js';
+import { deleteAllData } from './api.js';
+import { runSync } from './sync.js';
+
+const STATE_FILES = [
+  join(homedir(), '.vibe-usage', 'claude-code-state.json'),
+];
+
+function prompt(question) {
+  const rl = createInterface({ input: process.stdin, output: process.stdout });
+  return new Promise((resolve) => {
+    rl.question(question, (answer) => {
+      rl.close();
+      resolve(answer.trim());
+    });
+  });
+}
+
+export async function runReset() {
+  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 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.');
+      process.exit(1);
+    }
+    console.error(`Failed to delete remote data: ${err.message}`);
+    process.exit(1);
+  }
+
+  // 2. Clear local state
+  config.lastSync = null;
+  saveConfig(config);
+
+  for (const stateFile of STATE_FILES) {
+    if (existsSync(stateFile)) {
+      unlinkSync(stateFile);
+    }
+  }
+  console.log('Cleared local sync state.');
+
+  // 3. Re-upload everything
+  console.log('\nRe-syncing all data...');
+  await runSync();
+
+  console.log(`\nReset complete! View your dashboard at: ${apiUrl}/usage`);
+}

package/src/sync.js

@@ -1,11 +1,7 @@
 import { hostname as osHostname } from 'node:os';
-import { existsSync, readFileSync, unlinkSync } from 'node:fs';
-import { join } from 'node:path';
-import { homedir } from 'node:os';
 import { loadConfig, saveConfig } from './config.js';
 import { ingest } from './api.js';
 import { parsers, postSyncHooks } from './parsers/index.js';
-import { TOOLS } from './hooks.js';
 
 const BATCH_SIZE = 100;
 
@@ -16,9 +12,6 @@ function formatBytes(bytes) {
 }
 
 export async function runSync() {
-  // Self-heal: re-inject any missing hooks before syncing
-  ensureHooks();
-
   const config = loadConfig();
   if (!config?.apiKey) {
     console.error('Not configured. Run `npx @vibe-cafe/vibe-usage init` first.');
@@ -65,7 +58,7 @@ export async function runSync() {
       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`);
+          process.stdout.write(`\r${prefix}${formatBytes(sent)}/${formatBytes(total)} (${pct}%)\x1b[K`);
         },
       });
       totalIngested += result.ingested ?? batch.length;
@@ -102,39 +95,3 @@ export async function runSync() {
     process.exit(1);
   }
 }
-
-/**
- * Re-inject hooks for any installed tool whose hook is missing.
- * Runs silently — meant as a self-healing side effect of sync.
- */
-function ensureHooks() {
-  // Skip hook injection if Vibe Usage Mac app is running
-  const markerPath = join(homedir(), '.vibe-usage', 'mac-app-active');
-  if (existsSync(markerPath)) {
-    try {
-      const marker = JSON.parse(readFileSync(markerPath, 'utf-8'));
-      if (marker.pid) {
-        try {
-          process.kill(marker.pid, 0);
-          return;
-        } catch {
-          try { unlinkSync(markerPath); } catch { /* ignore */ }
-        }
-      }
-    } catch {
-      // Malformed marker file — ignore
-    }
-  }
-
-  for (const tool of TOOLS) {
-    if (!tool.inject) continue;
-    try {
-      const result = tool.inject();
-      if (result.injected) {
-        process.stderr.write(`hook: re-installed ${tool.name} hook\n`);
-      }
-    } catch {
-      // ignore — best effort
-    }
-  }
-}