vibeusage 0.2.10 → 0.2.11

package/package.json

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

package/src/lib/insforge-client.js

@@ -1,6 +1,14 @@
 'use strict';
 
-const { createClient } = require('@insforge/sdk');
+function loadInsforgeSdk() {
+  try {
+    return require('@insforge/sdk');
+  } catch (err) {
+    const wrapped = new Error('Missing dependency @insforge/sdk. Please reinstall vibeusage.');
+    wrapped.cause = err;
+    throw wrapped;
+  }
+}
 
 function getAnonKey({ env = process.env } = {}) {
   return (
@@ -44,6 +52,7 @@ function createTimeoutFetch(baseFetch) {
 
 function createInsforgeClient({ baseUrl, accessToken } = {}) {
   if (!baseUrl) throw new Error('Missing baseUrl');
+  const { createClient } = loadInsforgeSdk();
   const anonKey = getAnonKey();
   return createClient({
     baseUrl,

package/src/lib/rollout.js

@@ -606,7 +606,9 @@ async function parseOpencodeMessageFile({
 
   const messageKey = deriveOpencodeMessageKey(msg, filePath);
   const prev = messageIndex && messageKey ? messageIndex[messageKey] : null;
-  const lastTotals = prev && typeof prev.lastTotals === 'object' ? prev.lastTotals : legacyTotals;
+  const indexTotals = prev && typeof prev.lastTotals === 'object' ? prev.lastTotals : null;
+  const fallbackMatch = !fallbackKey || fallbackKey === messageKey;
+  const lastTotals = indexTotals || (fallbackMatch ? fallbackLastTotals : null);
 
   const currentTotals = normalizeOpencodeTokens(msg?.tokens);
   if (!currentTotals) {
@@ -1200,10 +1202,12 @@ function normalizeOpencodeTokens(tokens) {
   const output = toNonNegativeInt(tokens.output);
   const reasoning = toNonNegativeInt(tokens.reasoning);
   const cached = toNonNegativeInt(tokens.cache?.read);
-  const total = input + output + reasoning;
+  const cacheWrite = toNonNegativeInt(tokens.cache?.write);
+  const inputTokens = input + cacheWrite;
+  const total = inputTokens + output + reasoning;
 
   return {
-    input_tokens: input,
+    input_tokens: inputTokens,
     cached_input_tokens: cached,
     output_tokens: output,
     reasoning_output_tokens: reasoning,
@@ -1303,7 +1307,7 @@ function normalizeUsage(u) {
 }
 
 function normalizeClaudeUsage(u) {
-  const inputTokens = toNonNegativeInt(u?.input_tokens);
+  const inputTokens = toNonNegativeInt(u?.input_tokens) + toNonNegativeInt(u?.cache_creation_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;