@yhong91/vibetime 0.1.29 → 0.1.31

package/bin/vibetime.mjs

@@ -1928,7 +1928,7 @@ function countTextLines(text) {
 }
 
 // src/lib/constants.ts
-var PACKAGE_VERSION = true ? "0.1.29" : "0.1.1";
+var PACKAGE_VERSION = true ? "0.1.31" : "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;
@@ -4913,8 +4913,10 @@ async function parseCodexSessionFile(filePath, options) {
   let lastTurnIdForComplete;
   let turnIdAtLastUserMessage;
   let sessionMetaLocked = false;
+  let forkedSession = false;
   let lastTotalTokenUsage;
   let lastPerCallUsageKey;
+  let compactionPending = false;
   const pendingToolCalls = /* @__PURE__ */ new Map();
   for (const [index, line] of lines.entries()) {
     const lineNumber = index + 1;
@@ -4932,6 +4934,7 @@ async function parseCodexSessionFile(filePath, options) {
       }
       sessionMetaLocked = true;
       const forkedFromId = stringField(payload, "forked_from_id");
+      forkedSession = Boolean(forkedFromId);
       const inherited = forkedFromId ? await readPersistedSessionContextFromOptions(options, forkedFromId) : void 0;
       sessionId = stringField(payload, "id") || sessionId;
       cwd = inherited?.cwd || stringField(payload, "cwd") || cwd;
@@ -4953,6 +4956,10 @@ async function parseCodexSessionFile(filePath, options) {
       sessionStartEmitted = true;
       continue;
     }
+    if (topType === "compacted") {
+      compactionPending = true;
+      continue;
+    }
     if (topType === "turn_context") {
       currentTurnId = stringField(payload, "turn_id") || currentTurnId;
       cwd = stringField(payload, "cwd") || cwd;
@@ -5080,12 +5087,32 @@ async function parseCodexSessionFile(filePath, options) {
                 project,
                 model: rewriteCodexModelForTier(model, serviceTier),
                 confidence: "partial",
-                metrics: usage
+                metrics: excludeForkInheritedCache(usage, forkedSession)
               }), { filePath, sourcePathHash, lineNumber, topType, payloadType, options }));
               lastPerCallUsageKey = usageKey;
             }
             break;
           }
+          if (compactionPending && lastTotalTokenUsage && total < lastTotalTokenUsage.total) {
+            const lastUsage = lastTokenUsageFromPayload(payload);
+            if (lastUsage) {
+              events.push(withBackfillRefs(baseCodexEvent({
+                ts,
+                type: "model.usage",
+                sessionId,
+                turnId: currentTurnId,
+                cwd,
+                project,
+                model: rewriteCodexModelForTier(model, serviceTier),
+                confidence: "partial",
+                metrics: excludeForkInheritedCache({ ...lastUsage, reasoningEffort }, forkedSession)
+              }), { filePath, sourcePathHash, lineNumber, topType, payloadType, options }));
+            }
+            lastTotalTokenUsage = { input, cached, output, reasoning, total };
+            compactionPending = false;
+            break;
+          }
+          compactionPending = false;
           if (lastTotalTokenUsage && total >= lastTotalTokenUsage.total) {
             const deltaInput = input - lastTotalTokenUsage.input;
             const deltaCached = cached - lastTotalTokenUsage.cached;
@@ -5102,7 +5129,7 @@ async function parseCodexSessionFile(filePath, options) {
                 project,
                 model: rewriteCodexModelForTier(model, serviceTier),
                 confidence: "partial",
-                metrics: {
+                metrics: excludeForkInheritedCache({
                   tokensInput: deltaInput > 0 ? deltaInput : void 0,
                   tokensCachedInput: deltaCached > 0 ? deltaCached : void 0,
                   tokensOutput: deltaOutput > 0 ? deltaOutput : void 0,
@@ -5110,7 +5137,7 @@ async function parseCodexSessionFile(filePath, options) {
                   tokensTotal: deltaTotal > 0 ? deltaTotal : void 0,
                   modelContextWindow: usage.modelContextWindow,
                   reasoningEffort
-                }
+                }, forkedSession)
               }), { filePath, sourcePathHash, lineNumber, topType, payloadType, options }));
             }
           } else {
@@ -5123,7 +5150,7 @@ async function parseCodexSessionFile(filePath, options) {
               project,
               model: rewriteCodexModelForTier(model, serviceTier),
               confidence: "partial",
-              metrics: {
+              metrics: excludeForkInheritedCache({
                 tokensInput: input,
                 tokensCachedInput: cached,
                 tokensOutput: output,
@@ -5131,7 +5158,7 @@ async function parseCodexSessionFile(filePath, options) {
                 tokensTotal: total,
                 modelContextWindow: usage.modelContextWindow,
                 reasoningEffort
-              }
+              }, forkedSession)
             }), { filePath, sourcePathHash, lineNumber, topType, payloadType, options }));
           }
           lastTotalTokenUsage = { input, cached, output, reasoning, total };
@@ -5389,6 +5416,13 @@ function tokenUsageFromPayload(payload) {
   const info = objectField(payload, "info");
   const totalUsage = objectField(info, "total_token_usage");
   const usage = Object.keys(totalUsage).length > 0 ? totalUsage : objectField(info, "last_token_usage");
+  return tokenUsageFromRecord(usage, info);
+}
+function lastTokenUsageFromPayload(payload) {
+  const info = objectField(payload, "info");
+  return tokenUsageFromRecord(objectField(info, "last_token_usage"), info);
+}
+function tokenUsageFromRecord(usage, info) {
   if (Object.keys(usage).length === 0) {
     return;
   }
@@ -5410,6 +5444,18 @@ function tokenUsageFromPayload(payload) {
     modelContextWindow: numberField(info, "model_context_window")
   };
 }
+function excludeForkInheritedCache(usage, forked) {
+  if (!forked || !usage) {
+    return usage;
+  }
+  const cached = usage.tokensCachedInput ?? 0;
+  return {
+    ...usage,
+    tokensInput: Math.max(0, (usage.tokensInput ?? 0) - cached) || void 0,
+    tokensCachedInput: void 0,
+    tokensTotal: Math.max(0, (usage.tokensTotal ?? 0) - cached) || void 0
+  };
+}
 function toolNameFromPayload(payload, payloadType) {
   if (payloadType === "web_search_call") {
     return "web_search";
@@ -7390,11 +7436,13 @@ function parseQoderCnPaths(filePath) {
   let sessionId = "";
   let projectName = "";
   let configDir2 = "";
+  let mainTranscriptPath;
   if (subagentsIdx > 2) {
     sessionId = parts[subagentsIdx - 1];
     projectName = parts[subagentsIdx - 2];
     const projectsIdx = parts.lastIndexOf("projects");
     configDir2 = parts.slice(0, projectsIdx).join(path16.sep);
+    mainTranscriptPath = [...parts.slice(0, subagentsIdx - 1), `${sessionId}.jsonl`].join(path16.sep);
   } else {
     const filename = parts.at(-1) || "";
     sessionId = path16.basename(filename, ".jsonl");
@@ -7402,7 +7450,24 @@ function parseQoderCnPaths(filePath) {
     const projectsIdx = parts.lastIndexOf("projects");
     configDir2 = parts.slice(0, projectsIdx).join(path16.sep);
   }
-  return { configDir: configDir2, projectName, sessionId };
+  return { configDir: configDir2, projectName, sessionId, mainTranscriptPath };
+}
+function rebuildEventIdentity2(event) {
+  const importKey = createImportKey([
+    event.source,
+    event.refs?.sourcePathHash,
+    event.refs?.sourceLine,
+    event.type,
+    event.refs?.sourceId
+  ]);
+  return {
+    ...event,
+    id: createStableEventId(importKey),
+    refs: {
+      ...event.refs,
+      importKey
+    }
+  };
 }
 async function loadQoderCnModelNames(configDir2) {
   try {
@@ -7752,9 +7817,17 @@ async function parseQoderCnSessionFile(filePath, options) {
   }
   const validEvents = state.events.filter((event) => validateCanonicalEvent(event).valid);
   if (isSubagentSession) {
-    const parentSessionId = parseQoderCnPaths(filePath).sessionId;
-    if (parentSessionId) {
-      return validEvents.map((event) => ({ ...event, sessionId: parentSessionId }));
+    const { sessionId: parentSessionId, mainTranscriptPath } = parseQoderCnPaths(filePath);
+    if (parentSessionId && mainTranscriptPath) {
+      const parentSourcePathHash = `sha256:${createStableHash(mainTranscriptPath)}`;
+      return validEvents.map((event) => {
+        const mapped = {
+          ...event,
+          sessionId: parentSessionId,
+          refs: { ...event.refs, sourcePathHash: parentSourcePathHash }
+        };
+        return rebuildEventIdentity2(mapped);
+      });
     }
   }
   return validEvents;
@@ -8133,11 +8206,13 @@ function parseQoderPaths(filePath) {
   let sessionId = "";
   let projectName = "";
   let configDir2 = "";
+  let mainTranscriptPath;
   if (subagentsIdx > 2) {
     sessionId = parts[subagentsIdx - 1];
     projectName = parts[subagentsIdx - 2];
     const projectsIdx = parts.lastIndexOf("projects");
     configDir2 = parts.slice(0, projectsIdx).join(path17.sep);
+    mainTranscriptPath = [...parts.slice(0, subagentsIdx - 1), `${sessionId}.jsonl`].join(path17.sep);
   } else {
     const filename = parts.at(-1) || "";
     sessionId = path17.basename(filename, ".jsonl");
@@ -8145,7 +8220,24 @@ function parseQoderPaths(filePath) {
     const projectsIdx = parts.lastIndexOf("projects");
     configDir2 = parts.slice(0, projectsIdx).join(path17.sep);
   }
-  return { configDir: configDir2, projectName, sessionId };
+  return { configDir: configDir2, projectName, sessionId, mainTranscriptPath };
+}
+function rebuildEventIdentity3(event) {
+  const importKey = createImportKey([
+    event.source,
+    event.refs?.sourcePathHash,
+    event.refs?.sourceLine,
+    event.type,
+    event.refs?.sourceId
+  ]);
+  return {
+    ...event,
+    id: createStableEventId(importKey),
+    refs: {
+      ...event.refs,
+      importKey
+    }
+  };
 }
 async function loadQoderModelNames(configDir2) {
   try {
@@ -8495,9 +8587,17 @@ async function parseQoderSessionFile(filePath, options) {
   }
   const validEvents = state.events.filter((event) => validateCanonicalEvent(event).valid);
   if (isSubagentSession) {
-    const parentSessionId = parseQoderPaths(filePath).sessionId;
-    if (parentSessionId) {
-      return validEvents.map((event) => ({ ...event, sessionId: parentSessionId }));
+    const { sessionId: parentSessionId, mainTranscriptPath } = parseQoderPaths(filePath);
+    if (parentSessionId && mainTranscriptPath) {
+      const parentSourcePathHash = `sha256:${createStableHash(mainTranscriptPath)}`;
+      return validEvents.map((event) => {
+        const mapped = {
+          ...event,
+          sessionId: parentSessionId,
+          refs: { ...event.refs, sourcePathHash: parentSourcePathHash }
+        };
+        return rebuildEventIdentity3(mapped);
+      });
     }
   }
   return validEvents;

package/package.json

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