@yhong91/vibetime 0.1.28 → 0.1.30

package/bin/vibetime.mjs

@@ -1928,7 +1928,7 @@ function countTextLines(text) {
 }
 
 // src/lib/constants.ts
-var PACKAGE_VERSION = true ? "0.1.28" : "0.1.1";
+var PACKAGE_VERSION = true ? "0.1.30" : "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;
@@ -4069,6 +4069,19 @@ function prefixCoworkId(value) {
   }
   return value.startsWith(COWORK_PREFIX) ? value : `${COWORK_PREFIX}${value}`;
 }
+function parseCoworkSubagentPath(filePath) {
+  const parts = filePath.split(path8.sep);
+  const subagentsIdx = parts.lastIndexOf("subagents");
+  if (subagentsIdx < 2) {
+    return void 0;
+  }
+  const cliSessionId = parts[subagentsIdx - 1];
+  if (!cliSessionId) {
+    return void 0;
+  }
+  const mainTranscriptPath = [...parts.slice(0, subagentsIdx - 1), `${cliSessionId}.jsonl`].join(path8.sep);
+  return { cliSessionId, mainTranscriptPath };
+}
 function rebuildEventIdentity(event) {
   const importKey = createImportKey([
     event.source,
@@ -4094,15 +4107,21 @@ async function parseClaudeCoworkSessionFile(filePath, options) {
   if (!parser) {
     return [];
   }
+  const subagentInfo = parseCoworkSubagentPath(filePath);
+  const parentSourcePathHash = subagentInfo ? `sha256:${createStableHash(subagentInfo.mainTranscriptPath)}` : void 0;
+  const parentSessionId = subagentInfo ? prefixCoworkId(subagentInfo.cliSessionId) : void 0;
   const events = await parser(filePath, options);
   return events.map((event) => {
-    const sessionId = prefixCoworkId(event.sessionId);
+    const sessionId = parentSessionId || prefixCoworkId(event.sessionId);
     const turnId = prefixCoworkId(event.turnId);
     const workspaceId = createWorkspaceId({ projectName: project, repoRoot: cwd });
     const refs2 = { ...event.refs };
     if (metadata.title) {
       refs2.coworkTitleHash = `sha256:${createStableHash(metadata.title)}`;
     }
+    if (parentSourcePathHash) {
+      refs2.sourcePathHash = parentSourcePathHash;
+    }
     const mapped = {
       ...event,
       schemaVersion: event.schemaVersion || AGENT_TIME_SCHEMA_VERSION,
@@ -6348,6 +6367,7 @@ async function parseOpenCodeSessionFile(dbPath, options) {
     const hasDirectory = sessionCols.has("directory");
     const hasPath = sessionCols.has("path");
     const hasArchived = sessionCols.has("time_archived");
+    const hasParentId = sessionCols.has("parent_id");
     const selectCols = ["id", "title", "time_created"];
     if (hasDirectory) {
       selectCols.push("directory");
@@ -6358,11 +6378,36 @@ async function parseOpenCodeSessionFile(dbPath, options) {
     if (hasArchived) {
       selectCols.push("time_archived");
     }
+    if (hasParentId) {
+      selectCols.push("parent_id");
+    }
     const sessions = db.prepare(
       `SELECT ${selectCols.join(", ")} FROM session WHERE time_created IS NOT NULL ORDER BY time_created`
     ).all();
+    const rootIdByRawId = /* @__PURE__ */ new Map();
+    if (hasParentId) {
+      const byId = new Map(sessions.map((s) => [s.id, s]));
+      for (const session of sessions) {
+        let current = session.id;
+        const visited = /* @__PURE__ */ new Set();
+        while (true) {
+          if (visited.has(current)) {
+            break;
+          }
+          visited.add(current);
+          const node = byId.get(current);
+          const parentId = node?.parent_id || void 0;
+          if (!parentId || !byId.has(parentId)) {
+            break;
+          }
+          current = parentId;
+        }
+        rootIdByRawId.set(session.id, current);
+      }
+    }
     for (const session of sessions) {
-      const sessionId = session.id;
+      const rawSessionId = session.id;
+      const sessionId = rootIdByRawId.get(rawSessionId) || rawSessionId;
       const cwd = session.directory || session.path || void 0;
       const project = cwd ? path14.basename(cwd) : void 0;
       const sessionTs = msToIso(session.time_created);
@@ -6376,14 +6421,14 @@ async function parseOpenCodeSessionFile(dbPath, options) {
       }));
       const messages = db.prepare(
         "SELECT id, data FROM message WHERE session_id = ? ORDER BY time_created"
-      ).all(sessionId);
+      ).all(rawSessionId);
       let currentTurnId;
       let currentProvider;
       let turnTs;
       let reasoningEffort;
       const modelSwitchedEvents = db.prepare(
         "SELECT data FROM event WHERE aggregate_id = ? AND type = 'session.next.model.switched.1' ORDER BY seq"
-      ).all(sessionId);
+      ).all(rawSessionId);
       for (const evt of modelSwitchedEvents) {
         try {
           const evtData = JSON.parse(evt.data);
@@ -7345,11 +7390,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");
@@ -7357,7 +7404,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 {
@@ -7707,9 +7771,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;
@@ -8088,11 +8160,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");
@@ -8100,7 +8174,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 {
@@ -8450,9 +8541,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;
@@ -9359,14 +9458,32 @@ function modelMetrics(row) {
     toolCalls: numberField(row, "tool_call_count")
   };
 }
+function resolveRootSessionId(sessionId, sessions) {
+  let current = sessionId;
+  const visited = /* @__PURE__ */ new Set();
+  while (true) {
+    if (visited.has(current)) {
+      break;
+    }
+    visited.add(current);
+    const session = sessions.get(current);
+    const parentId = stringField(session, "parent_id");
+    if (!parentId || !sessions.has(parentId)) {
+      break;
+    }
+    current = parentId;
+  }
+  return current;
+}
 function sessionContext(row, sessions) {
   const sessionId = stringField(row, "session_id") || stringField(row, "id") || "unknown";
   const session = sessions.get(sessionId);
   const cwd = stringField(session, "directory");
   const project = projectFromDirectory(cwd);
+  const rootSessionId = resolveRootSessionId(sessionId, sessions);
   return {
     rawSessionId: sessionId,
-    sessionId: `zcode:${sessionId}`,
+    sessionId: `zcode:${rootSessionId}`,
     cwd,
     project,
     workspaceId: createWorkspaceId({ projectName: project, repoRoot: cwd }),

package/package.json

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