vibeusage 0.4.0 → 0.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vibeusage",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "Codex CLI token usage tracker (macOS-first, notify-driven).",
   "license": "MIT",
   "repository": {

package/src/commands/init.js

@@ -190,7 +190,7 @@ function renderWelcome() {
       DIVIDER,
       "",
       "This tool will:",
-      "  - Analyze your local AI CLI configurations (Codex, Every Code, Claude, Gemini, Kimi, Opencode, Hermes, OpenClaw)",
+      "  - Analyze your local AI CLI configurations (Codex, Every Code, Claude Code, Gemini, Kimi, Hermes, OpenCode, OpenClaw)",
       "  - Set up lightweight hooks to track your flow state",
       "  - Link your device to your VibeScore account",
       "",

package/src/lib/integrations/claude.js

@@ -8,7 +8,7 @@ const { isDir, isFile } = require("./utils");
 
 module.exports = {
   name: "claude",
-  summaryLabel: "Claude",
+  summaryLabel: "Claude Code",
   statusLabel: "Claude plugin",
   async probe(ctx) {
     const hasConfigDir = await isDir(ctx.claude.configDir);

package/src/lib/integrations/opencode.js

@@ -3,8 +3,8 @@ const { isDir } = require("./utils");
 
 module.exports = {
   name: "opencode",
-  summaryLabel: "Opencode Plugin",
-  statusLabel: "Opencode plugin",
+  summaryLabel: "OpenCode Plugin",
+  statusLabel: "OpenCode plugin",
   async probe(ctx) {
     const hasConfigDir = await isDir(ctx.opencode.configDir);
     if (!hasConfigDir) {

package/src/lib/rollout.js

@@ -246,6 +246,8 @@ async function parseClaudeIncremental({
     const prev = cursors.files[key] || null;
     const inode = st.ino || 0;
     const startOffset = prev && prev.inode === inode ? prev.offset || 0 : 0;
+    const priorSeenIds =
+      prev && prev.inode === inode && Array.isArray(prev.seenIds) ? prev.seenIds : [];
 
     const projectContext = projectEnabled
       ? await resolveProjectContextForFile({
@@ -269,11 +271,13 @@ async function parseClaudeIncremental({
       projectTouchedBuckets,
       projectRef,
       projectKey,
+      priorSeenIds,
     });
 
     cursors.files[key] = {
       inode,
       offset: result.endOffset,
+      seenIds: result.seenIds,
       updatedAt: new Date().toISOString(),
     };
 
@@ -778,6 +782,8 @@ async function parseRolloutFile({
   return { endOffset, lastTotal: totals, lastModel: model, eventsAggregated };
 }
 
+const CLAUDE_SEEN_IDS_LIMIT = 500;
+
 async function parseClaudeFile({
   filePath,
   startOffset,
@@ -788,12 +794,18 @@ async function parseClaudeFile({
   projectTouchedBuckets,
   projectRef,
   projectKey,
+  priorSeenIds,
 }) {
+  const seenOrder = Array.isArray(priorSeenIds) ? priorSeenIds.slice() : [];
+  const seenSet = new Set(seenOrder);
+
   const st = await fs.stat(filePath).catch(() => null);
-  if (!st || !st.isFile()) return { endOffset: startOffset, eventsAggregated: 0 };
+  if (!st || !st.isFile()) {
+    return { endOffset: startOffset, eventsAggregated: 0, seenIds: seenOrder };
+  }
 
   const endOffset = st.size;
-  if (startOffset >= endOffset) return { endOffset, eventsAggregated: 0 };
+  if (startOffset >= endOffset) return { endOffset, eventsAggregated: 0, seenIds: seenOrder };
 
   const stream = fssync.createReadStream(filePath, { encoding: "utf8", start: startOffset });
   const rl = readline.createInterface({ input: stream, crlfDelay: Infinity });
@@ -811,6 +823,12 @@ async function parseClaudeFile({
     const usage = obj?.message?.usage || obj?.usage;
     if (!usage || typeof usage !== "object") continue;
 
+    // Claude Code writes the same assistant message multiple times in the session log
+    // (same `message.id` / `requestId`, different outer `uuid`). Aggregate once per
+    // upstream Anthropic response to avoid multi-counting token usage.
+    const dedupeId = obj?.message?.id || obj?.requestId || null;
+    if (dedupeId && seenSet.has(dedupeId)) continue;
+
     const model = normalizeModelInput(obj?.message?.model || obj?.model) || DEFAULT_MODEL;
     const tokenTimestamp = typeof obj?.timestamp === "string" ? obj.timestamp : null;
     if (!tokenTimestamp) continue;
@@ -835,12 +853,20 @@ async function parseClaudeFile({
       addTotals(projectBucket.totals, delta);
       projectTouchedBuckets.add(projectBucketKey(projectKey, source, bucketStart));
     }
+    if (dedupeId) {
+      seenSet.add(dedupeId);
+      seenOrder.push(dedupeId);
+    }
     eventsAggregated += 1;
   }
 
   rl.close();
   stream.close?.();
-  return { endOffset, eventsAggregated };
+  const trimmedSeenIds =
+    seenOrder.length > CLAUDE_SEEN_IDS_LIMIT
+      ? seenOrder.slice(seenOrder.length - CLAUDE_SEEN_IDS_LIMIT)
+      : seenOrder;
+  return { endOffset, eventsAggregated, seenIds: trimmedSeenIds };
 }
 
 async function parseKimiFile({
@@ -2181,7 +2207,10 @@ function normalizeOpencodeTokens(tokens) {
   const cached = toNonNegativeInt(tokens.cache?.read);
   const cacheWrite = toNonNegativeInt(tokens.cache?.write);
   const inputTokens = input + cacheWrite;
-  const total = inputTokens + output + reasoning;
+  // Include cache-read tokens in the total so OpenCode sessions do not
+  // under-count the way Claude did before the parallel fix; cache-read is
+  // real spend the user pays for on every turn.
+  const total = inputTokens + cached + output + reasoning;
 
   return {
     input_tokens: inputTokens,
@@ -2304,12 +2333,19 @@ function normalizeUsage(u) {
 function normalizeClaudeUsage(u) {
   const inputTokens =
     toNonNegativeInt(u?.input_tokens) + toNonNegativeInt(u?.cache_creation_input_tokens);
+  const cachedInputTokens = toNonNegativeInt(u?.cache_read_input_tokens);
   const outputTokens = toNonNegativeInt(u?.output_tokens);
   const hasTotal = u && Object.prototype.hasOwnProperty.call(u, "total_tokens");
-  const totalTokens = hasTotal ? toNonNegativeInt(u?.total_tokens) : inputTokens + outputTokens;
+  // Claude's Messages API does not emit `total_tokens`. When absent, compose it
+  // from all four channels (input / cache_creation / cache_read / output). The
+  // old formula omitted cache_read, which is ~99% of token spend on long
+  // Claude Opus sessions and was the main driver of user-visible under-counts.
+  const totalTokens = hasTotal
+    ? toNonNegativeInt(u?.total_tokens)
+    : inputTokens + cachedInputTokens + outputTokens;
   return {
     input_tokens: inputTokens,
-    cached_input_tokens: toNonNegativeInt(u?.cache_read_input_tokens),
+    cached_input_tokens: cachedInputTokens,
     output_tokens: outputTokens,
     reasoning_output_tokens: 0,
     total_tokens: totalTokens,