@yhong91/vibetime 0.1.47 → 0.1.49

package/bin/vibetime.mjs

@@ -2047,7 +2047,7 @@ function claudeStyleFileMetrics(tool, input) {
 }
 
 // src/lib/constants.ts
-var PACKAGE_VERSION = true ? "0.1.47" : "0.1.1";
+var PACKAGE_VERSION = true ? "0.1.49" : "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;
@@ -5157,7 +5157,7 @@ async function parseCodexSessionFile(filePath, options) {
   let sessionId = sessionIdFromFilePath(filePath, "codex");
   let cwd;
   let project;
-  let model;
+  let model = firstTurnContextModel(lines);
   let sessionStartEmitted = false;
   let serviceTier;
   let reasoningEffort;
@@ -5191,7 +5191,6 @@ async function parseCodexSessionFile(filePath, options) {
       sessionId = stringField(payload, "id") || sessionId;
       cwd = inherited?.cwd || stringField(payload, "cwd") || cwd;
       project = inherited?.project || (cwd ? path11.basename(cwd) : project);
-      model = stringField(payload, "model_provider") || model;
       events.push(withBackfillRefs({
         schemaVersion: AGENT_TIME_SCHEMA_VERSION,
         ts,
@@ -5599,6 +5598,21 @@ async function parseCodexSessionFile(filePath, options) {
   }
   return events.filter((event) => validateCanonicalEvent(event).valid);
 }
+function firstTurnContextModel(lines) {
+  for (const line of lines) {
+    if (!line.includes("turn_context")) {
+      continue;
+    }
+    const raw = parseJsonLine(line);
+    if (raw && stringField(raw, "type") === "turn_context") {
+      const model = stringField(objectField(raw, "payload"), "model");
+      if (model) {
+        return model;
+      }
+    }
+  }
+  return void 0;
+}
 function rewriteCodexModelForTier(model, serviceTier) {
   if (!model) {
     return model;
@@ -7487,6 +7501,79 @@ function createOpenCodeAdapter() {
 // src/adapters/pi.ts
 import { readFile as readFile9 } from "node:fs/promises";
 import path15 from "node:path";
+function parsePiSubagentLink(filePath, headerParentSession) {
+  if (headerParentSession) {
+    const parentFile = path15.isAbsolute(headerParentSession) ? headerParentSession : void 0;
+    const parentSessionId2 = parentFile ? path15.basename(parentFile, ".jsonl") : headerParentSession;
+    return { parentSessionId: parentSessionId2, parentSessionFile: parentFile, explicit: true };
+  }
+  const normalized = filePath.replaceAll("\\", "/");
+  const match = normalized.match(/([^/]+)\/[^/]+\/run-\d+\/session\.jsonl$/);
+  if (!match) {
+    return void 0;
+  }
+  const parentBasename = match[1];
+  if (!parentBasename || parentBasename === "session") {
+    return void 0;
+  }
+  const parentSessionId = parentBasename.endsWith(".jsonl") ? parentBasename.slice(0, -".jsonl".length) : parentBasename;
+  const parentDir = path15.dirname(path15.dirname(path15.dirname(filePath)));
+  const parentSessionFile = path15.join(path15.dirname(parentDir), `${parentBasename}.jsonl`);
+  return { parentSessionId, parentSessionFile, explicit: false };
+}
+async function resolveParentContext(link, options) {
+  if (link.parentSessionFile) {
+    try {
+      const text = await readFile9(link.parentSessionFile, "utf8");
+      const firstLine = text.split("\n").find((line) => line.trim().length > 0);
+      const raw = firstLine ? parseJsonLine(firstLine) : void 0;
+      if (raw) {
+        const id = stringField(raw, "id");
+        const cwd = stringField(raw, "cwd");
+        const project = cwd ? path15.basename(cwd) : void 0;
+        if (id || cwd || project) {
+          return { sessionId: id, cwd, project };
+        }
+      }
+    } catch {
+    }
+  }
+  const persisted = await readPersistedSessionContextFromOptions(options, link.parentSessionId);
+  if (persisted) {
+    return { cwd: persisted.cwd, project: persisted.project };
+  }
+  return void 0;
+}
+function foldEventsIntoParent(events, link) {
+  const childSessionId = events.find((event) => event.sessionId)?.sessionId;
+  return events.map((event) => {
+    const rewritten = {
+      ...event,
+      sessionId: link.parentSessionId
+    };
+    if (childSessionId && childSessionId !== link.parentSessionId) {
+      rewritten.refs = {
+        ...event.refs,
+        supersededSessionId: childSessionId
+      };
+    }
+    return rebuildEventIdentity2(rewritten);
+  });
+}
+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 parsePiSessionFile(filePath, options) {
   const text = await readFile9(filePath, "utf8");
   const lines = text.split("\n").filter(Boolean);
@@ -7497,6 +7584,7 @@ async function parsePiSessionFile(filePath, options) {
   let provider;
   let turnStartedAt;
   let reasoningEffort;
+  let headerParentSession;
   const pendingToolCalls = /* @__PURE__ */ new Map();
   const state = new SessionParserState(filePath, options, (event) => basePiEvent({ ...event, cwd, project, model }));
   const push = (event, ln) => {
@@ -7520,6 +7608,7 @@ async function parsePiSessionFile(filePath, options) {
       state.sessionId = sessionId || state.sessionId;
       cwd = stringField(raw, "cwd") || cwd;
       project = cwd ? path15.basename(cwd) : project;
+      headerParentSession = stringField(raw, "parentSession") || headerParentSession;
       continue;
     }
     if (entryType === "model_change") {
@@ -7703,6 +7792,17 @@ async function parsePiSessionFile(filePath, options) {
   if (isTurnIdle(state.currentTurnLastEventAt)) {
     state.closeTurn(state.currentTurnLastEventAt, lines.length);
   }
+  const link = parsePiSubagentLink(filePath, headerParentSession);
+  if (link) {
+    const parentContext = await resolveParentContext(link, options);
+    const effectiveLink = parentContext?.sessionId ? { ...link, parentSessionId: parentContext.sessionId } : link;
+    if (parentContext) {
+      cwd = cwd || parentContext.cwd;
+      project = project || parentContext.project;
+    }
+    const events = state.events.filter((event) => matchesBackfillFilters(event, options));
+    return foldEventsIntoParent(events, effectiveLink);
+  }
   return state.events.filter((event) => matchesBackfillFilters(event, options));
 }
 function basePiEvent(event) {
@@ -8132,7 +8232,7 @@ function parseQoderCnPaths(filePath) {
   }
   return { configDir: configDir2, projectName, sessionId, mainTranscriptPath };
 }
-function rebuildEventIdentity2(event) {
+function rebuildEventIdentity3(event) {
   const importKey = createImportKey([
     event.source,
     event.refs?.sourcePathHash,
@@ -8553,7 +8653,7 @@ async function parseQoderCnSessionFile(filePath, options) {
             ...event.sessionId && event.sessionId !== parentSessionId ? { supersededSessionId: event.sessionId } : {}
           }
         };
-        return rebuildEventIdentity2(mapped);
+        return rebuildEventIdentity3(mapped);
       });
     }
   }
@@ -8561,7 +8661,7 @@ async function parseQoderCnSessionFile(filePath, options) {
   if (dbModelCalls.rootSessionId) {
     const parentPath = path17.join(path17.dirname(filePath), `${dbModelCalls.rootSessionId}.jsonl`);
     const parentSourcePathHash = `sha256:${createStableHash(parentPath)}`;
-    return validEvents.map((event) => rebuildEventIdentity2({
+    return validEvents.map((event) => rebuildEventIdentity3({
       ...event,
       sessionId: dbModelCalls.rootSessionId,
       refs: {
@@ -8910,7 +9010,7 @@ function parseQoderPaths(filePath) {
   }
   return { configDir: configDir2, projectName, sessionId, mainTranscriptPath };
 }
-function rebuildEventIdentity3(event) {
+function rebuildEventIdentity4(event) {
   const importKey = createImportKey([
     event.source,
     event.refs?.sourcePathHash,
@@ -9331,7 +9431,7 @@ async function parseQoderSessionFile(filePath, options) {
             ...event.sessionId && event.sessionId !== parentSessionId ? { supersededSessionId: event.sessionId } : {}
           }
         };
-        return rebuildEventIdentity3(mapped);
+        return rebuildEventIdentity4(mapped);
       });
     }
   }
@@ -9339,7 +9439,7 @@ async function parseQoderSessionFile(filePath, options) {
   if (dbModelCalls.rootSessionId) {
     const parentPath = path18.join(path18.dirname(filePath), `${dbModelCalls.rootSessionId}.jsonl`);
     const parentSourcePathHash = `sha256:${createStableHash(parentPath)}`;
-    return validEvents.map((event) => rebuildEventIdentity3({
+    return validEvents.map((event) => rebuildEventIdentity4({
       ...event,
       sessionId: dbModelCalls.rootSessionId,
       refs: {

package/package.json

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