@yhong91/vibetime 0.1.38 → 0.1.40

package/bin/vibetime.mjs

@@ -1928,7 +1928,7 @@ function countTextLines(text) {
 }
 
 // src/lib/constants.ts
-var PACKAGE_VERSION = true ? "0.1.38" : "0.1.1";
+var PACKAGE_VERSION = true ? "0.1.40" : "0.1.1";
 var DEFAULT_API_URL = "http://121.196.224.82:3001";
 var DEFAULT_BACKFILL_BATCH_SIZE = 50;
 var DEFAULT_BACKFILL_BATCH_BYTES = 800 * 1024;
@@ -4209,7 +4209,7 @@ async function parseCodebuddyTraceFile(filePath, options) {
     return [];
   }
   const sessionMeta = await readCodebuddySessionMeta(trace.workerPid, trace.sessionId, options);
-  const sessionId = trace.sessionId || sessionMeta.sessionId || sessionIdFromTracePath(filePath);
+  const sessionId = trace.sessionId || sessionMeta.sessionId || await resolveSessionIdFromSiblingTraces(filePath) || sessionIdFromTracePath(filePath);
   let cwd = sessionMeta.cwd;
   if (!cwd && trace.startedAt) {
     cwd = await cwdFromHistoryFile(trace.startedAt, options);
@@ -4565,46 +4565,71 @@ function normalizeModelCandidate(value) {
   }
   return trimmed;
 }
-function extractUsageFromGenerationSpan(span) {
-  const parsed = parseEmbeddedJson(span.toolOutput);
-  if (!Array.isArray(parsed) || parsed.length === 0) {
-    return void 0;
-  }
-  const first = parsed[0];
-  if (!isPlainObject(first)) {
-    return void 0;
-  }
-  const usage = objectField(first, "usage");
-  if (!isPlainObject(usage)) {
+function finitePositive(value) {
+  if (typeof value !== "number" && typeof value !== "string") {
     return void 0;
   }
+  const parsed = Number(value);
+  return Number.isFinite(parsed) && parsed > 0 ? parsed : void 0;
+}
+function extractUsageFromGenerationSpan(span) {
+  const parsed = parseEmbeddedJson(span.toolOutput);
+  const first = Array.isArray(parsed) ? parsed[0] : void 0;
+  const usage = isPlainObject(first) ? objectField(first, "usage") : {};
   const inputTokens = numberField(usage, "prompt_tokens");
   const outputTokens = numberField(usage, "completion_tokens");
   const totalTokens = numberField(usage, "total_tokens");
   const details = objectField(usage, "prompt_tokens_details");
   const cachedTokens = isPlainObject(details) ? numberField(details, "cached_tokens") : void 0;
+  const otelAttributes = span.attributes || {};
+  const otelInputTokens = finitePositive(otelAttributes["gen_ai.usage.input_tokens"]);
+  const otelOutputTokens = finitePositive(otelAttributes["gen_ai.usage.output_tokens"]);
+  const otelCacheReadTokens = finitePositive(otelAttributes["gen_ai.usage.cache_read_input_tokens"]);
+  const otelCacheCreationTokens = finitePositive(otelAttributes["gen_ai.usage.cache_creation_input_tokens"]);
+  const otelReasoningTokens = finitePositive(otelAttributes["gen_ai.usage.reasoning_output_tokens"]);
+  const tokensInput = otelInputTokens ?? inputTokens;
+  const tokensOutput = otelOutputTokens ?? outputTokens;
+  const tokensCacheReadInput = otelCacheReadTokens ?? cachedTokens;
+  const tokensCachedInput = (tokensCacheReadInput ?? 0) + (otelCacheCreationTokens ?? 0);
+  const tokensTotal = totalTokens || (tokensInput ?? 0) + (tokensOutput ?? 0);
+  if (!tokensInput && !tokensOutput && !tokensCachedInput && !otelReasoningTokens && !tokensTotal) {
+    return void 0;
+  }
   return {
-    tokensInput: inputTokens || void 0,
-    tokensCachedInput: cachedTokens || void 0,
-    tokensOutput: outputTokens || void 0,
-    tokensTotal: totalTokens || void 0,
+    tokensInput: tokensInput || void 0,
+    tokensOutput: tokensOutput || void 0,
+    tokensCachedInput: tokensCachedInput || void 0,
+    tokensCacheReadInput: tokensCacheReadInput || void 0,
+    tokensCacheCreationInput: otelCacheCreationTokens,
+    tokensReasoningOutput: otelReasoningTokens,
+    tokensTotal: tokensTotal || void 0,
     modelCalls: 1
   };
 }
 function modelUsageFromTrace(trace, generationIndex, totalGenerations) {
   const info = trace.modelInfo;
-  if (!info || !info.totalInputTokens && !info.totalOutputTokens && !trace.totalTokens) {
+  const otelAttributes = trace.attributes || {};
+  const otelInputTokens = finitePositive(otelAttributes["gen_ai.usage.input_tokens"]);
+  const otelOutputTokens = finitePositive(otelAttributes["gen_ai.usage.output_tokens"]);
+  const otelCacheReadTokens = finitePositive(otelAttributes["gen_ai.usage.cache_read_input_tokens"]);
+  const otelCacheCreationTokens = finitePositive(otelAttributes["gen_ai.usage.cache_creation_input_tokens"]);
+  const otelReasoningTokens = finitePositive(otelAttributes["gen_ai.usage.reasoning_output_tokens"]);
+  if (!info && !trace.totalTokens && !otelInputTokens && !otelOutputTokens && !otelCacheReadTokens && !otelCacheCreationTokens && !otelReasoningTokens) {
     return void 0;
   }
+  const inputTokens = otelInputTokens ?? (info?.totalInputTokens || 0);
+  const outputTokens = otelOutputTokens ?? (info?.totalOutputTokens || 0);
+  const cacheReadTokens = otelCacheReadTokens ?? info?.totalCachedTokens;
+  const cachedTokens = (cacheReadTokens ?? 0) + (otelCacheCreationTokens ?? 0);
+  const totalTokens = trace.totalTokens || inputTokens + outputTokens;
   if (generationIndex === 1) {
-    const inputTokens = info.totalInputTokens || 0;
-    const outputTokens = info.totalOutputTokens || 0;
-    const cachedTokens = info.totalCachedTokens || 0;
-    const totalTokens = trace.totalTokens || inputTokens + outputTokens;
     return {
       tokensInput: inputTokens || void 0,
       tokensCachedInput: cachedTokens || void 0,
+      tokensCacheReadInput: cacheReadTokens,
+      tokensCacheCreationInput: otelCacheCreationTokens || void 0,
       tokensOutput: outputTokens || void 0,
+      tokensReasoningOutput: otelReasoningTokens || void 0,
       tokensTotal: totalTokens || void 0,
       modelCalls: totalGenerations || 1
     };
@@ -4615,6 +4640,42 @@ function sessionIdFromTracePath(filePath) {
   const match = path9.basename(filePath).match(/trace_([0-9a-f]{32})/);
   return match?.[1] ? `codebuddy_${match[1]}` : `codebuddy_${createStableHash(filePath).slice(0, 24)}`;
 }
+var siblingSessionIdByDir = /* @__PURE__ */ new Map();
+async function resolveSessionIdFromSiblingTraces(filePath) {
+  const dir = path9.dirname(filePath);
+  let cached = siblingSessionIdByDir.get(dir);
+  if (!cached) {
+    cached = (async () => {
+      try {
+        const entries = await readdir4(dir);
+        for (const entry of entries) {
+          if (!entry.startsWith("trace_") || !entry.endsWith(".json")) {
+            continue;
+          }
+          const siblingPath = path9.join(dir, entry);
+          if (siblingPath === filePath) {
+            continue;
+          }
+          try {
+            const text = await readFile5(siblingPath, "utf8");
+            const data = JSON.parse(text);
+            if (isPlainObject(data) && isPlainObject(data.trace)) {
+              const sid = stringField(data.trace, "sessionId");
+              if (sid) {
+                return sid;
+              }
+            }
+          } catch {
+          }
+        }
+      } catch {
+      }
+      return void 0;
+    })();
+    siblingSessionIdByDir.set(dir, cached);
+  }
+  return cached;
+}
 function resolveHome(options) {
   return options.home ? path9.resolve(String(options.home)) : process.env.HOME || __require("node:os").homedir();
 }
@@ -7579,9 +7640,8 @@ function rebuildEventIdentity2(event) {
     }
   };
 }
-async function loadQoderCnModelNames(configDir2) {
+async function parseModelNamesFromDynamicTexts(dynamicTextsPath) {
   try {
-    const dynamicTextsPath = path17.join(configDir2, ".auth", "dynamic-texts.json");
     const content = await readFile10(dynamicTextsPath, "utf8");
     const json = JSON.parse(content);
     const texts = json.texts || {};
@@ -7597,6 +7657,19 @@ async function loadQoderCnModelNames(configDir2) {
     return {};
   }
 }
+async function loadQoderCnModelNames(configDir2) {
+  const map = await parseModelNamesFromDynamicTexts(path17.join(configDir2, ".auth", "dynamic-texts.json"));
+  const siblingConfigDir = configDir2.replace(/\.qoder-cn$/, ".qoder");
+  if (siblingConfigDir !== configDir2) {
+    const siblingMap = await parseModelNamesFromDynamicTexts(path17.join(siblingConfigDir, ".auth", "dynamic-texts.json"));
+    for (const [key, val] of Object.entries(siblingMap)) {
+      if (!(key in map)) {
+        map[key] = val;
+      }
+    }
+  }
+  return map;
+}
 async function loadQoderCnSegmentModelCalls(filePath, isSubagentSession, modelMap) {
   const { configDir: configDir2, projectName, sessionId } = parseQoderCnPaths(filePath);
   const segmentsPath = path17.join(configDir2, "logs", "sessions", projectName, sessionId, "segments");
@@ -8382,9 +8455,8 @@ function rebuildEventIdentity3(event) {
     }
   };
 }
-async function loadQoderModelNames(configDir2) {
+async function parseModelNamesFromDynamicTexts2(dynamicTextsPath) {
   try {
-    const dynamicTextsPath = path18.join(configDir2, ".auth", "dynamic-texts.json");
     const content = await readFile11(dynamicTextsPath, "utf8");
     const json = JSON.parse(content);
     const texts = json.texts || {};
@@ -8400,6 +8472,19 @@ async function loadQoderModelNames(configDir2) {
     return {};
   }
 }
+async function loadQoderModelNames(configDir2) {
+  const map = await parseModelNamesFromDynamicTexts2(path18.join(configDir2, ".auth", "dynamic-texts.json"));
+  const siblingConfigDir = configDir2.replace(/\.qoder$/, ".qoder-cn");
+  if (siblingConfigDir !== configDir2) {
+    const siblingMap = await parseModelNamesFromDynamicTexts2(path18.join(siblingConfigDir, ".auth", "dynamic-texts.json"));
+    for (const [key, val] of Object.entries(siblingMap)) {
+      if (!(key in map)) {
+        map[key] = val;
+      }
+    }
+  }
+  return map;
+}
 async function loadQoderSegmentModelCalls(filePath, isSubagentSession, modelMap) {
   const { configDir: configDir2, projectName, sessionId } = parseQoderPaths(filePath);
   const segmentsPath = path18.join(configDir2, "logs", "sessions", projectName, sessionId, "segments");

package/package.json

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