@yhong91/vibetime 0.1.68 → 0.1.70

package/bin/vibetime.mjs

@@ -2047,7 +2047,7 @@ function claudeStyleFileMetrics(tool, input) {
 }
 
 // src/lib/constants.ts
-var PACKAGE_VERSION = true ? "0.1.68" : "0.1.1";
+var PACKAGE_VERSION = true ? "0.1.70" : "0.1.1";
 var GENERATED_MARKER = "Generated by vibetime.";
 var DEFAULT_API_URL = "http://121.196.224.82:3001";
 var DEFAULT_BACKFILL_BATCH_SIZE = 50;
@@ -5024,7 +5024,7 @@ function fileActivitiesFromPatchChanges(changes, ts, cwd, displayFilePath3) {
 }
 
 // src/lib/session-context.ts
-import { mkdir as mkdir3, stat as stat6, writeFile as writeFile3 } from "node:fs/promises";
+import { mkdir as mkdir3, rename, stat as stat6, unlink, writeFile as writeFile3 } from "node:fs/promises";
 import os4 from "node:os";
 import path10 from "node:path";
 init_fs();
@@ -5039,7 +5039,12 @@ function resolveHome2(options) {
   return options ? path10.resolve(stringOption(options.home) || os4.homedir()) : os4.homedir();
 }
 async function readPersistedSessionContext(home, sessionId) {
-  const raw = await readJsonIfExists(sessionContextPath(home, sessionId));
+  let raw;
+  try {
+    raw = await readJsonIfExists(sessionContextPath(home, sessionId));
+  } catch {
+    return void 0;
+  }
   if (!isPlainObject(raw)) {
     return void 0;
   }
@@ -5086,8 +5091,17 @@ async function persistHookSessionContext(home, payload) {
     usage: nextUsage
   };
   await mkdir3(sessionContextDir(home), { recursive: true });
-  await writeFile3(sessionContextPath(home, sessionId), `${JSON.stringify(context, null, 2)}
+  const dest = sessionContextPath(home, sessionId);
+  const tmp = `${dest}.${process.pid}.tmp`;
+  await writeFile3(tmp, `${JSON.stringify(context, null, 2)}
 `, "utf8");
+  try {
+    await rename(tmp, dest);
+  } catch (error) {
+    await unlink(tmp).catch(() => {
+    });
+    throw error;
+  }
 }
 function hookSessionId(payload) {
   for (const key of ["session_id", "sessionId", "conversation_id", "conversationId"]) {
@@ -6499,6 +6513,22 @@ function cloudAgentSessionFromEvents(conversationId, events) {
     events: sorted.map((event) => ({ ...event, conversationId }))
   };
 }
+function hookUncachedInputTokens(turn) {
+  return Math.max(0, (turn.tokensInput || 0) - (turn.tokensCacheReadInput || 0));
+}
+function cloudEventMatchesHookTurn(event, turn) {
+  return event.tokensInput === hookUncachedInputTokens(turn) && event.tokensOutput === (turn.tokensOutput || 0) && event.tokensCacheReadInput === (turn.tokensCacheReadInput || 0);
+}
+function unmatchedCloudEvents(events, turns) {
+  const used = /* @__PURE__ */ new Set();
+  for (const turn of turns) {
+    const index = events.findIndex((event, i) => !used.has(i) && cloudEventMatchesHookTurn(event, turn));
+    if (index >= 0) {
+      used.add(index);
+    }
+  }
+  return events.filter((_, i) => !used.has(i));
+}
 async function fetchCursorDashboardUsage(args) {
   const cookie = cursorSessionCookie(args.accessToken);
   if (!cookie) {
@@ -6742,6 +6772,13 @@ function injectedCloudEvent(conversationId, item) {
     tokensCacheCreationInput
   };
 }
+function cloudUsageMapFromSessions(sessions) {
+  const map = /* @__PURE__ */ new Map();
+  for (const session of sessions) {
+    map.set(session.conversationId, session.events);
+  }
+  return map;
+}
 function injectedCursorCloudUsage(options) {
   if (!Object.prototype.hasOwnProperty.call(options, "cursorCloudUsage")) {
     return void 0;
@@ -6827,7 +6864,9 @@ async function loadCursorCloudUsageMap(options, filePath) {
   if (intervalSeconds > 0 && !options.force) {
     const lastFetchedMs = await readLastCloudFetchAt(home);
     if (lastFetchedMs !== void 0 && Date.now() - lastFetchedMs < intervalSeconds * 1e3) {
-      return /* @__PURE__ */ new Map();
+      return cloudUsageMapFromSessions(
+        parseCursorCloudUsageCache(await readJsonIfExists(cursorCloudUsageCachePath(home)))
+      );
     }
   }
   const pending = (async () => {
@@ -6877,15 +6916,13 @@ function cloudUsageToPersisted(row, index = 0) {
 async function resolveCursorSessionUsage(options, sessionId, filePath) {
   const persisted = await readPersistedSessionContextFromOptions(options, sessionId);
   const hookUsage = persisted?.usage ?? [];
-  if (hookUsage.length > 0) {
-    return hookUsage;
-  }
   const cloudMap = await loadCursorCloudUsageMap(options, filePath);
-  const cloudEvents = cloudMap.get(sessionId);
-  if (!cloudEvents?.length) {
-    return [];
-  }
-  return cloudEvents.map((event, index) => cloudUsageToPersisted(event, index));
+  const cloudEvents = cloudMap.get(sessionId) ?? [];
+  const leftover = unmatchedCloudEvents(cloudEvents, hookUsage);
+  return [
+    ...hookUsage,
+    ...leftover.map((event, index) => cloudUsageToPersisted(event, index))
+  ];
 }
 function cursorCloudUsageCachePath(home) {
   return path13.join(home, ".vibetime", CURSOR_CLOUD_USAGE_FILENAME);
@@ -7082,10 +7119,10 @@ async function openCursorDb(dbPath) {
     return {
       db: new DatabaseSync(tmp, { readOnly: true }),
       cleanup: async () => {
-        const { unlink } = await import("node:fs/promises");
-        await unlink(tmp).catch(() => void 0);
-        await unlink(`${tmp}-wal`).catch(() => void 0);
-        await unlink(`${tmp}-shm`).catch(() => void 0);
+        const { unlink: unlink2 } = await import("node:fs/promises");
+        await unlink2(tmp).catch(() => void 0);
+        await unlink2(`${tmp}-wal`).catch(() => void 0);
+        await unlink2(`${tmp}-shm`).catch(() => void 0);
       }
     };
   }
@@ -8241,7 +8278,7 @@ import os7 from "node:os";
 var SOURCE_ID2 = "grok-bot";
 var AGENT_NAME2 = "grok-bot";
 var IDENTITY = { source: SOURCE_ID2, agent: AGENT_NAME2 };
-async function grokBotBackfillFiles(sourceRoot, home = os7.homedir(), env, options) {
+async function grokBotBackfillFiles(sourceRoot, home = os7.homedir(), _env, options) {
   if (sourceRoot) {
     const info = await stat9(sourceRoot).catch(() => null);
     return info ? [{ path: sourceRoot, modifiedAt: info.mtime.toISOString() }] : [];
@@ -8255,29 +8292,25 @@ async function grokBotBackfillFiles(sourceRoot, home = os7.homedir(), env, optio
     const info = await stat9(cachePath).catch(() => null);
     return info ? [{ path: cachePath, modifiedAt: info.mtime.toISOString() }] : [];
   }
-  const localIds = await listLocalCursorSessionIds(home, env);
-  const cloudOnly = [];
+  const sessions = [];
   for (const [conversationId, events] of map) {
-    if (localIds.has(conversationId)) {
-      continue;
-    }
     const session = cloudAgentSessionFromEvents(conversationId, events);
     if (session) {
-      cloudOnly.push(session);
+      sessions.push(session);
     }
   }
-  if (cloudOnly.length === 0) {
+  if (sessions.length === 0) {
     return [];
   }
   return [{
     path: cachePath,
-    modifiedAt: await writeCursorCloudUsageCache(cachePath, cloudOnly)
+    modifiedAt: await writeCursorCloudUsageCache(cachePath, sessions)
   }];
 }
 function createGrokBotAdapter() {
   return {
     id: SOURCE_ID2,
-    label: "Cloud Agent",
+    label: "Grok Bot",
     agentName: AGENT_NAME2,
     kind: "agent",
     // No hooks to install — data arrives via the Cursor dashboard API.
@@ -11241,19 +11274,25 @@ async function parseModelNamesFromDynamicTexts(dynamicTextsPath) {
   }
 }
 async function loadQoderCnModelNames(configDir2, home) {
-  const map = await parseModelNamesFromDynamicTexts(path19.join(configDir2, ".auth", "dynamic-texts.json"));
-  const siblingConfigDir = configDir2.replace(/\.qoder-cn$/, ".qoder");
-  if (siblingConfigDir !== configDir2) {
-    const siblingMap = await parseModelNamesFromDynamicTexts(path19.join(siblingConfigDir, ".auth", "dynamic-texts.json"));
-    for (const [key, val] of Object.entries(siblingMap)) {
+  const map = {};
+  for (const appDirName of ["QoderCN", "Qoder"]) {
+    const ideMap = await loadQoderIdeModelCatalog(appDirName, home);
+    for (const [key, val] of Object.entries(ideMap)) {
       if (!(key in map)) {
         map[key] = val;
       }
     }
   }
-  for (const appDirName of ["QoderCN", "Qoder"]) {
-    const ideMap = await loadQoderIdeModelCatalog(appDirName, home);
-    for (const [key, val] of Object.entries(ideMap)) {
+  const textsMap = await parseModelNamesFromDynamicTexts(path19.join(configDir2, ".auth", "dynamic-texts.json"));
+  for (const [key, val] of Object.entries(textsMap)) {
+    if (!(key in map)) {
+      map[key] = val;
+    }
+  }
+  const siblingConfigDir = configDir2.replace(/\.qoder-cn$/, ".qoder");
+  if (siblingConfigDir !== configDir2) {
+    const siblingMap = await parseModelNamesFromDynamicTexts(path19.join(siblingConfigDir, ".auth", "dynamic-texts.json"));
+    for (const [key, val] of Object.entries(siblingMap)) {
       if (!(key in map)) {
         map[key] = val;
       }
@@ -12099,7 +12138,21 @@ async function parseModelNamesFromDynamicTexts2(dynamicTextsPath) {
   }
 }
 async function loadQoderModelNames(configDir2, home) {
-  const map = await parseModelNamesFromDynamicTexts2(path20.join(configDir2, ".auth", "dynamic-texts.json"));
+  const map = {};
+  for (const appDirName of ["Qoder", "QoderCN"]) {
+    const ideMap = await loadQoderIdeModelCatalog(appDirName, home);
+    for (const [key, val] of Object.entries(ideMap)) {
+      if (!(key in map)) {
+        map[key] = val;
+      }
+    }
+  }
+  const textsMap = await parseModelNamesFromDynamicTexts2(path20.join(configDir2, ".auth", "dynamic-texts.json"));
+  for (const [key, val] of Object.entries(textsMap)) {
+    if (!(key in map)) {
+      map[key] = val;
+    }
+  }
   const siblingConfigDir = configDir2.replace(/\.qoder$/, ".qoder-cn");
   if (siblingConfigDir !== configDir2) {
     const siblingMap = await parseModelNamesFromDynamicTexts2(path20.join(siblingConfigDir, ".auth", "dynamic-texts.json"));
@@ -12122,14 +12175,6 @@ async function loadQoderModelNames(configDir2, home) {
       }
     }
   }
-  for (const appDirName of ["Qoder", "QoderCN"]) {
-    const ideMap = await loadQoderIdeModelCatalog(appDirName, home);
-    for (const [key, val] of Object.entries(ideMap)) {
-      if (!(key in map)) {
-        map[key] = val;
-      }
-    }
-  }
   return map;
 }
 function isQwenworkConfigRoot(configDir2) {
@@ -15190,8 +15235,8 @@ async function uninstallGeneratedFile(filePath, { dryRun, onWrite }) {
     onWrite(`Would uninstall ${filePath}`);
     return;
   }
-  const { unlink } = await import("node:fs/promises");
-  await unlink(filePath);
+  const { unlink: unlink2 } = await import("node:fs/promises");
+  await unlink2(filePath);
   onWrite(`Uninstalled ${filePath}`);
 }
 
@@ -15258,7 +15303,7 @@ function defaultMachineName() {
 init_fs();
 
 // src/lib/logger.ts
-import { appendFile, mkdir as mkdir5, rename, stat as stat16 } from "node:fs/promises";
+import { appendFile, mkdir as mkdir5, rename as rename2, stat as stat16 } from "node:fs/promises";
 import { homedir as homedir2 } from "node:os";
 import path25 from "node:path";
 var MAX_BYTES = 1 * 1024 * 1024;
@@ -15278,7 +15323,7 @@ async function rotateIfNeeded(file) {
   try {
     const info = await stat16(file);
     if (info.size > MAX_BYTES) {
-      await rename(file, `${file}.1`).catch(() => {
+      await rename2(file, `${file}.1`).catch(() => {
       });
     }
   } catch {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@yhong91/vibetime",
   "type": "module",
-  "version": "0.1.68",
+  "version": "0.1.70",
   "description": "vibetime CLI — install AI-agent hooks (Claude Code, Codex, OpenCode, Pi, Cursor) and report activity to vibetime.",
   "license": "MIT",
   "publishConfig": {