@yhong91/vibetime 0.1.19 → 0.1.21

package/bin/vibetime.mjs

@@ -1202,7 +1202,7 @@ function countTextLines(text) {
 }
 
 // src/lib/constants.ts
-var PACKAGE_VERSION = true ? "0.1.19" : "0.1.1";
+var PACKAGE_VERSION = true ? "0.1.21" : "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;
@@ -3610,6 +3610,9 @@ async function parseCodebuddyTraceFile(filePath, options) {
     if (span.type === "generation") {
       generationCount++;
       const usage = extractUsageFromGenerationSpan(span) ?? modelUsageFromTrace(trace, generationCount, totalGenerations);
+      if (!usage && !model) {
+        continue;
+      }
       push(baseEvent({
         ts,
         type: "model.usage",
@@ -4708,6 +4711,8 @@ async function parseCopilotSessionFile(filePath, options) {
   let reasoningEffort;
   const pendingTools = /* @__PURE__ */ new Map();
   const turnTokenAccum = /* @__PURE__ */ new Map();
+  const pendingTurnUsage = [];
+  let emittedShutdownUsage = false;
   for (const [index, line] of lines.entries()) {
     const lineNumber = index + 1;
     const raw = parseJsonLine(line);
@@ -4872,7 +4877,7 @@ async function parseCopilotSessionFile(filePath, options) {
         const accum = turnId ? turnTokenAccum.get(turnId) : void 0;
         if (accum && accum.tokensOutput && accum.tokensOutput > 0) {
           accum.reasoningEffort = reasoningEffort;
-          events.push(baseCopilotEvent({
+          pendingTurnUsage.push(baseCopilotEvent({
             ts,
             type: "model.usage",
             sessionId,
@@ -4936,6 +4941,7 @@ async function parseCopilotSessionFile(filePath, options) {
               modelCalls: requestCount || void 0
             }
           }));
+          emittedShutdownUsage = true;
         }
         events.push(baseCopilotEvent({
           ts,
@@ -4950,6 +4956,9 @@ async function parseCopilotSessionFile(filePath, options) {
       }
     }
   }
+  if (!emittedShutdownUsage) {
+    events.push(...pendingTurnUsage);
+  }
   return events.filter((event) => validateCanonicalEvent(event).valid);
 }
 function baseCopilotEvent(event) {
@@ -5176,33 +5185,7 @@ async function parseOpenCodeSessionFile(dbPath, options) {
           const createdTs = timeCreated;
           const tokens = opencodeUsageFromInfo(info);
           const cost = typeof info.cost === "number" && info.cost > 0 ? info.cost : void 0;
-          if (tokens) {
-            const metrics = {
-              tokensInput: tokens.tokensInput,
-              tokensOutput: tokens.tokensOutput,
-              tokensReasoningOutput: tokens.tokensReasoningOutput,
-              tokensCachedInput: tokens.tokensCachedInput,
-              tokensCacheReadInput: tokens.tokensCacheReadInput,
-              tokensCacheCreationInput: tokens.tokensCacheCreationInput,
-              tokensTotal: tokens.tokensTotal,
-              reasoningEffort
-            };
-            if (cost !== void 0) {
-              metrics.costUsd = cost;
-            }
-            events.push(baseOpenCodeEvent({
-              ts: msToIso(completedTs || createdTs),
-              type: "model.usage",
-              sessionId,
-              turnId: currentTurnId,
-              cwd: assistantCwd,
-              project: assistantProject,
-              model,
-              provider,
-              operation: "model usage",
-              metrics
-            }, assistantAgent));
-          }
+          let emittedStepUsage = false;
           try {
             const parts = db.prepare(
               "SELECT data FROM part WHERE message_id = ? ORDER BY id"
@@ -5303,6 +5286,7 @@ async function parseOpenCodeSessionFile(dbPath, options) {
                 const stepTokens = opencodeUsageFromInfo(pd);
                 const stepCost = typeof pd.cost === "number" && pd.cost > 0 ? pd.cost : void 0;
                 if (stepTokens) {
+                  emittedStepUsage = true;
                   const stepMetrics = {
                     tokensInput: stepTokens.tokensInput,
                     tokensOutput: stepTokens.tokensOutput,
@@ -5347,6 +5331,33 @@ async function parseOpenCodeSessionFile(dbPath, options) {
             }
           } catch {
           }
+          if (!emittedStepUsage && tokens) {
+            const metrics = {
+              tokensInput: tokens.tokensInput,
+              tokensOutput: tokens.tokensOutput,
+              tokensReasoningOutput: tokens.tokensReasoningOutput,
+              tokensCachedInput: tokens.tokensCachedInput,
+              tokensCacheReadInput: tokens.tokensCacheReadInput,
+              tokensCacheCreationInput: tokens.tokensCacheCreationInput,
+              tokensTotal: tokens.tokensTotal,
+              reasoningEffort
+            };
+            if (cost !== void 0) {
+              metrics.costUsd = cost;
+            }
+            events.push(baseOpenCodeEvent({
+              ts: msToIso(completedTs || createdTs),
+              type: "model.usage",
+              sessionId,
+              turnId: currentTurnId,
+              cwd: assistantCwd,
+              project: assistantProject,
+              model,
+              provider,
+              operation: "model usage",
+              metrics
+            }, assistantAgent));
+          }
           if (stringField(info, "finish")) {
             const durationMs = completedTs && createdTs ? completedTs - createdTs : void 0;
             events.push(baseOpenCodeEvent({

package/package.json

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