@vibe-cafe/vibe-usage 0.1.6 → 0.1.8

package/README.md

@@ -30,7 +30,7 @@ npx vibe-usage status   # Show config & detected tools
 | 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 | Manual only | `~/.local/share/opencode/opencode.db` (SQLite) |
 | OpenClaw | Manual only | `~/.openclaw/agents/` |
 
 ## How It Works

package/package.json

@@ -1,14 +1,27 @@
 {
   "name": "@vibe-cafe/vibe-usage",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "Track your AI coding tool token usage and sync to vibecafe.ai",
   "type": "module",
   "bin": {
-    "vibe-usage": "./bin/vibe-usage.js"
+    "vibe-usage": "bin/vibe-usage.js"
   },
-  "files": ["bin/", "src/"],
-  "engines": { "node": ">=20" },
-  "keywords": ["ai", "coding", "usage", "tokens", "claude", "codex", "gemini"],
+  "files": [
+    "bin/",
+    "src/"
+  ],
+  "engines": {
+    "node": ">=20"
+  },
+  "keywords": [
+    "ai",
+    "coding",
+    "usage",
+    "tokens",
+    "claude",
+    "codex",
+    "gemini"
+  ],
   "dependencies": {
     "ccusage": "18.0.5"
   },

package/src/hooks.js

@@ -4,9 +4,38 @@ 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(h => h.command && h.command.includes('vibe-usage'));
+  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() {
@@ -21,11 +50,28 @@ export function injectClaudeCode() {
   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)) {
-    return { injected: false, reason: 'already installed' };
+    // 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)' };
   }
 
-  settings.hooks.SessionEnd.push({ type: 'command', command: SYNC_CMD });
+  // 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 };
 }
@@ -40,7 +86,13 @@ export function injectCodex() {
   }
 
   if (content.includes('vibe-usage')) {
-    return { injected: false, reason: 'already installed' };
+    // Update existing command to use latest
+    content = content.replace(
+      /npx @vibe-cafe\/vibe-usage(?:@[\d.]+)? sync[^"']*/g,
+      SYNC_CMD,
+    );
+    writeFileSync(configPath, content, 'utf-8');
+    return { injected: false, reason: 'already installed (updated)' };
   }
 
   const notifySection = `\n[notify]\ncommand = "${SYNC_CMD}"\n`;
@@ -73,6 +125,7 @@ export function injectGeminiCli() {
     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 };

package/src/parsers/opencode.js

@@ -1,12 +1,103 @@
+import { execFileSync } from 'node:child_process';
 import { readdirSync, readFileSync, statSync, existsSync } from 'node:fs';
 import { join, basename } from 'node:path';
 import { homedir } from 'node:os';
 import { aggregateToBuckets } from './index.js';
 
 const DATA_DIR = join(homedir(), '.local', 'share', 'opencode');
+const DB_PATH = join(DATA_DIR, 'opencode.db');
 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) {
+  if (existsSync(DB_PATH)) {
+    try {
+      return parseFromSqlite(lastSync);
+    } catch (err) {
+      process.stderr.write(`warn: opencode sqlite parse failed (${err.message}), trying legacy json...\n`);
+    }
+  }
+  return parseFromJson(lastSync);
+}
+
+function parseFromSqlite(lastSync) {
+  // 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 ')}`;
+
+  let output;
+  try {
+    output = execFileSync('sqlite3', [
+      '-json',
+      DB_PATH,
+      query,
+    ], { encoding: 'utf-8', maxBuffer: 100 * 1024 * 1024, timeout: 30000 });
+  } catch (err) {
+    if (err.status === 127 || (err.message && err.message.includes('ENOENT'))) {
+      throw new Error('sqlite3 CLI not found. Install sqlite3 to sync opencode data.');
+    }
+    throw err;
+  }
+
+  output = output.trim();
+  if (!output || output === '[]') return [];
+
+  let rows;
+  try {
+    rows = JSON.parse(output);
+  } catch {
+    throw new Error('Failed to parse sqlite3 JSON output');
+  }
+
+  const entries = [];
+  for (const row of rows) {
+    let data;
+    try {
+      data = JSON.parse(row.data);
+    } catch {
+      continue;
+    }
+
+    if (!data.modelID) continue;
+
+    const tokens = data.tokens;
+    if (!tokens) continue;
+    if (!tokens.input && !tokens.output) continue;
+
+    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';
+
+    entries.push({
+      source: 'opencode',
+      model: data.modelID || 'unknown',
+      project,
+      timestamp,
+      inputTokens: tokens.input || 0,
+      outputTokens: tokens.output || 0,
+      cachedInputTokens: tokens.cache?.read || 0,
+      reasoningOutputTokens: tokens.reasoning || 0,
+    });
+  }
+
+  return aggregateToBuckets(entries);
+}
+
+/** Legacy parser: reads JSON files from storage/message directories. */
+function parseFromJson(lastSync) {
   if (!existsSync(MESSAGES_DIR)) return [];
 
   const entries = [];
@@ -45,10 +136,8 @@ export async function parse(lastSync) {
         continue;
       }
 
-
       if (!data.modelID) continue;
 
-
       const tokens = data.tokens;
       if (!tokens) continue;
       if (!tokens.input && !tokens.output) continue;
@@ -57,7 +146,6 @@ export async function parse(lastSync) {
       if (isNaN(timestamp.getTime())) continue;
       if (lastSync && timestamp <= new Date(lastSync)) continue;
 
-
       const rootPath = data.path?.root;
       const project = rootPath ? basename(rootPath) : 'unknown';