vibeusage 0.2.10 → 0.2.12

package/package.json

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

package/src/commands/init.js

@@ -51,6 +51,7 @@ const ASCII_LOGO = [
 ].join('\n');
 
 const DIVIDER = '----------------------------------------------';
+const DEFAULT_DASHBOARD_URL = 'https://www.vibeusage.cc';
 
 async function cmdInit(argv) {
   const opts = parseArgs(argv);
@@ -69,7 +70,7 @@ async function cmdInit(argv) {
   let dashboardUrl = opts.dashboardUrl ||
     process.env.VIBEUSAGE_DASHBOARD_URL ||
     process.env.VIBESCORE_DASHBOARD_URL ||
-    null;
+    DEFAULT_DASHBOARD_URL;
   const notifyPath = path.join(binDir, 'notify.cjs');
   const appDir = path.join(trackerDir, 'app');
   const trackerBinPath = path.join(appDir, 'bin', 'tracker.js');
@@ -140,7 +141,6 @@ async function cmdInit(argv) {
 
   if (setup.pendingBrowserAuth) {
     const deviceName = opts.deviceName || os.hostname();
-    if (!dashboardUrl) dashboardUrl = await detectLocalDashboardUrl();
     const flow = await beginBrowserAuth({ baseUrl, dashboardUrl, timeoutMs: 10 * 60_000, open: false });
     const canAutoOpen = !opts.noOpen;
     renderAuthTransition({ authUrl: flow.authUrl, canAutoOpen });
@@ -157,7 +157,6 @@ async function cmdInit(argv) {
     const resolvedDashboardUrl = dashboardUrl || null;
     renderSuccessBox({ configPath, dashboardUrl: resolvedDashboardUrl });
   } else if (deviceToken) {
-    if (!dashboardUrl) dashboardUrl = await detectLocalDashboardUrl();
     const resolvedDashboardUrl = dashboardUrl || null;
     renderSuccessBox({ configPath, dashboardUrl: resolvedDashboardUrl });
   } else {
@@ -686,35 +685,6 @@ function isSelfNotify(cmd) {
 
 module.exports = { cmdInit };
 
-async function detectLocalDashboardUrl() {
-  // Dev-only convenience: prefer a local dashboard (if running) so the user sees our own UI first.
-  // Vite defaults to 5173, but may auto-increment if the port is taken.
-  const hosts = ['127.0.0.1', 'localhost'];
-  const ports = [5173, 5174, 5175, 5176, 5177];
-
-  for (const port of ports) {
-    for (const host of hosts) {
-      const base = `http://${host}:${port}`;
-      const ok = await checkUrlReachable(base);
-      if (ok) return base;
-    }
-  }
-  return null;
-}
-
-async function checkUrlReachable(url) {
-  const timeoutMs = 250;
-  try {
-    const controller = new AbortController();
-    const t = setTimeout(() => controller.abort(), timeoutMs);
-    const res = await fetch(url, { method: 'GET', signal: controller.signal });
-    clearTimeout(t);
-    return Boolean(res && res.ok);
-  } catch (_e) {
-    return false;
-  }
-}
-
 async function probeFile(p) {
   try {
     const st = await fs.stat(p);

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;