@yhong91/vibetime 0.1.7 → 0.1.9

package/bin/vibetime.mjs

@@ -1195,7 +1195,7 @@ function countTextLines(text) {
 }
 
 // src/lib/constants.ts
-var PACKAGE_VERSION = true ? "0.1.7" : "0.1.1";
+var PACKAGE_VERSION = true ? "0.1.9" : "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;
@@ -1680,6 +1680,27 @@ function resolveModelName(text) {
   }
   return null;
 }
+var AGY_USAGE_TIME_MATCH_TOLERANCE_MS = 5 * 60 * 1e3;
+function usageMetadataFromGenerator(item) {
+  const usage = item.chatModel?.usage;
+  if (!usage) {
+    return null;
+  }
+  const chatModel = item.chatModel;
+  const modelCandidates = [
+    chatModel.modelDisplayName,
+    chatModel.responseModel,
+    usage.model,
+    chatModel.model
+  ];
+  const model = modelCandidates.filter((candidate) => typeof candidate === "string" && !candidate.startsWith("MODEL_PLACEHOLDER_")).map(resolveModelName).find(Boolean) ?? null;
+  const occurredAt = Date.parse(chatModel.chatStartMetadata?.createdAt ?? "");
+  return {
+    usage,
+    model,
+    occurredAt: Number.isFinite(occurredAt) ? occurredAt : null
+  };
+}
 function extractProjectContext(rawLines) {
   let cwd;
   let project;
@@ -1774,32 +1795,55 @@ async function parseAgySessionFile(filePath, options) {
   }
   const usageMap = /* @__PURE__ */ new Map();
   const usageEntries = [];
+  const matchedUsageEntries = /* @__PURE__ */ new Set();
   if (generatorMetadata) {
     for (const item of generatorMetadata) {
-      const usage = item.chatModel?.usage;
-      if (usage) {
-        usageEntries.push(usage);
+      const metadata = usageMetadataFromGenerator(item);
+      if (metadata) {
+        usageEntries.push(metadata);
       }
-      if (item.stepIndices && Array.isArray(item.stepIndices)) {
+      if (metadata && item.stepIndices && Array.isArray(item.stepIndices)) {
         for (const idx of item.stepIndices) {
-          usageMap.set(idx, usage);
+          usageMap.set(idx, metadata);
         }
       }
     }
     const plannerResponses = rawEvents.filter((raw) => raw.type === "PLANNER_RESPONSE");
-    const exactMatches = plannerResponses.filter((raw) => usageMap.has(raw.step_index)).length;
-    if (exactMatches === 0 && plannerResponses.length > 0 && usageEntries.length > 0) {
-      const matchCount = Math.min(plannerResponses.length, usageEntries.length);
-      const plannerOffset = plannerResponses.length - matchCount;
-      const usageOffset = usageEntries.length - matchCount;
-      for (let i = 0; i < matchCount; i += 1) {
-        usageMap.set(plannerResponses[plannerOffset + i].step_index, usageEntries[usageOffset + i]);
+    const available = usageEntries.filter((entry) => entry.occurredAt !== null);
+    const used = /* @__PURE__ */ new Set();
+    for (const planner of plannerResponses) {
+      const exact = usageMap.get(planner.step_index);
+      if (exact) {
+        used.add(exact);
+        matchedUsageEntries.add(exact);
+        continue;
+      }
+      const plannerAt = Date.parse(planner.created_at ?? planner.timestamp ?? "");
+      if (!Number.isFinite(plannerAt)) {
+        continue;
+      }
+      let closest;
+      let closestDelta = Number.POSITIVE_INFINITY;
+      for (const entry of available) {
+        if (used.has(entry) || entry.occurredAt === null) {
+          continue;
+        }
+        const delta = Math.abs(entry.occurredAt - plannerAt);
+        if (delta < closestDelta) {
+          closest = entry;
+          closestDelta = delta;
+        }
+      }
+      if (closest && closestDelta <= AGY_USAGE_TIME_MATCH_TOLERANCE_MS) {
+        usageMap.set(planner.step_index, closest);
+        used.add(closest);
+        matchedUsageEntries.add(closest);
       }
     }
   }
   const cwd = detectedCwd;
   const project = detectedProject;
-  let model = "gemini-2.5-pro";
+  let model = "unknown";
   const baseAgyEvent = (event) => {
     return {
       schemaVersion: AGENT_TIME_SCHEMA_VERSION,
@@ -1851,8 +1895,10 @@ async function parseAgySessionFile(filePath, options) {
       }), lineNumber, raw.type);
     } else if (raw.type === "PLANNER_RESPONSE") {
       const content = stringField(raw, "content") || "";
-      const usage = usageMap.get(raw.step_index);
-      if (usage) {
+      const usageMetadata = usageMap.get(raw.step_index);
+      if (usageMetadata) {
+        matchedUsageEntries.add(usageMetadata);
+        const usage = usageMetadata.usage;
         const inputTokens = Number.parseInt(usage.inputTokens, 10) || 0;
         const outputTokens = Number.parseInt(usage.outputTokens, 10) || 0;
         const cacheRead = Number.parseInt(usage.cacheReadTokens, 10) || 0;
@@ -1862,6 +1908,7 @@ async function parseAgySessionFile(filePath, options) {
           type: "model.usage",
           sessionId,
           turnId: state.currentTurnId,
+          model: usageMetadata.model ?? model,
           confidence: "exact",
           metrics: {
             modelCalls: 1,
@@ -2011,6 +2058,32 @@ async function parseAgySessionFile(filePath, options) {
       }
     }
   }
+  for (const [index, usageMetadata] of usageEntries.entries()) {
+    if (matchedUsageEntries.has(usageMetadata) || usageMetadata.occurredAt === null) {
+      continue;
+    }
+    const usage = usageMetadata.usage;
+    const inputTokens = Number.parseInt(usage.inputTokens, 10) || 0;
+    const outputTokens = Number.parseInt(usage.outputTokens, 10) || 0;
+    const cacheRead = Number.parseInt(usage.cacheReadTokens, 10) || 0;
+    const reasoning = Number.parseInt(usage.thinkingOutputTokens, 10) || 0;
+    state.push(baseAgyEvent({
+      ts: new Date(usageMetadata.occurredAt).toISOString(),
+      type: "model.usage",
+      sessionId,
+      model: usageMetadata.model ?? "unknown",
+      confidence: "exact",
+      metrics: {
+        modelCalls: 1,
+        tokensInput: inputTokens + cacheRead,
+        tokensOutput: outputTokens,
+        tokensTotal: inputTokens + cacheRead + outputTokens,
+        tokensCachedInput: cacheRead || void 0,
+        tokensCacheReadInput: cacheRead || void 0,
+        tokensReasoningOutput: reasoning || void 0
+      }
+    }), rawEvents.length + index + 1, "trajectory_metadata");
+  }
   if (state.currentTurnLastEventAt) {
     state.closeTurn(state.currentTurnLastEventAt, rawEvents.length, "session_end");
   }

package/package.json

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