@yhong91/vibetime 0.1.37 → 0.1.39

package/bin/vibetime.mjs

@@ -1928,7 +1928,7 @@ function countTextLines(text) {
 }
 
 // src/lib/constants.ts
-var PACKAGE_VERSION = true ? "0.1.37" : "0.1.1";
+var PACKAGE_VERSION = true ? "0.1.39" : "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);
@@ -4586,6 +4586,7 @@ function extractUsageFromGenerationSpan(span) {
   return {
     tokensInput: inputTokens || void 0,
     tokensCachedInput: cachedTokens || void 0,
+    tokensCacheReadInput: cachedTokens || void 0,
     tokensOutput: outputTokens || void 0,
     tokensTotal: totalTokens || void 0,
     modelCalls: 1
@@ -4604,6 +4605,7 @@ function modelUsageFromTrace(trace, generationIndex, totalGenerations) {
     return {
       tokensInput: inputTokens || void 0,
       tokensCachedInput: cachedTokens || void 0,
+      tokensCacheReadInput: cachedTokens || void 0,
       tokensOutput: outputTokens || void 0,
       tokensTotal: totalTokens || void 0,
       modelCalls: totalGenerations || 1
@@ -4615,6 +4617,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();
 }
@@ -4786,7 +4824,7 @@ async function codebuddyBackfillFiles(sourceRoot, home, env) {
           const filePath = path9.join(traceDir, entry);
           try {
             const stat14 = await import("node:fs/promises").then((fs) => fs.stat(filePath));
-            files.push({ path: filePath, modifiedAt: stat14.mtime.toISOString() });
+            files.push({ path: filePath, modifiedAt: stat14.mtime.toISOString(), groupId: pidDir.name });
           } catch {
           }
         }
@@ -12097,10 +12135,37 @@ function selectBackfillFilesForImport(files, watermarkTs) {
   if (Number.isNaN(watermarkMs)) {
     return files;
   }
-  return files.filter((f) => {
+  const isPast = (f) => {
     const modifiedMs = Date.parse(f.modifiedAt);
     return !Number.isNaN(modifiedMs) && modifiedMs > watermarkMs;
-  });
+  };
+  const groups = /* @__PURE__ */ new Map();
+  const picked = [];
+  for (const f of files) {
+    if (!f.groupId) {
+      if (isPast(f)) {
+        picked.push(f);
+      }
+      continue;
+    }
+    const arr = groups.get(f.groupId);
+    if (arr) {
+      arr.push(f);
+    } else {
+      groups.set(f.groupId, [f]);
+    }
+  }
+  for (const arr of groups.values()) {
+    if (arr.some(isPast)) {
+      picked.push(...arr);
+    }
+  }
+  const order = /* @__PURE__ */ new Map();
+  for (let i = 0; i < files.length; i += 1) {
+    order.set(files[i].path, i);
+  }
+  picked.sort((a, b) => (order.get(a.path) ?? 0) - (order.get(b.path) ?? 0));
+  return picked;
 }
 function backfillIncrementalStatePath(home) {
   return path24.join(home, ".vibetime", "backfill-state.json");
@@ -12530,6 +12595,7 @@ Environment:
 }
 export {
   run,
+  selectBackfillFilesForImport,
   syncLocalRunnerEntryArgs
 };
 const code = await run(process.argv.slice(2));process.exitCode = code;

package/package.json

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