@yhong91/vibetime 0.1.42 → 0.1.44

package/bin/vibetime.mjs

@@ -1845,7 +1845,7 @@ function operationForTool(tool) {
   if (["write"].includes(normalized)) {
     return "write";
   }
-  if (["edit", "multiedit", "notebookedit", "apply_patch", "applypatch"].includes(normalized)) {
+  if (["edit", "multiedit", "notebookedit", "apply_patch", "applypatch", "searchreplace"].includes(normalized)) {
     return "edit";
   }
   return "read";
@@ -1928,7 +1928,7 @@ function countTextLines(text) {
 }
 
 // src/lib/constants.ts
-var PACKAGE_VERSION = true ? "0.1.42" : "0.1.1";
+var PACKAGE_VERSION = true ? "0.1.44" : "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;
@@ -5815,6 +5815,18 @@ async function parseCopilotSessionFile(filePath, options) {
         }
         const msgTurnId = stringField(data, "turnId");
         const turnId = msgTurnId !== void 0 ? `turn_${createStableHash([sessionId, msgTurnId]).slice(0, 24)}` : currentTurnId;
+        events.push(baseCopilotEvent({
+          ts,
+          type: "agent.operation",
+          operation: "model call",
+          sessionId,
+          turnId,
+          cwd,
+          project,
+          model,
+          confidence: "exact",
+          metrics: { modelCalls: 1 }
+        }));
         const outputTokens = numberField(data, "outputTokens");
         if (outputTokens && outputTokens > 0) {
           const key = turnId || "unknown";
@@ -8138,7 +8150,11 @@ async function parseQoderCnSessionFile(filePath, options) {
         const mapped = {
           ...event,
           sessionId: parentSessionId,
-          refs: { ...event.refs, sourcePathHash: parentSourcePathHash }
+          refs: {
+            ...event.refs,
+            sourcePathHash: parentSourcePathHash,
+            ...event.sessionId && event.sessionId !== parentSessionId ? { supersededSessionId: event.sessionId } : {}
+          }
         };
         return rebuildEventIdentity2(mapped);
       });
@@ -8151,7 +8167,11 @@ async function parseQoderCnSessionFile(filePath, options) {
     return validEvents.map((event) => rebuildEventIdentity2({
       ...event,
       sessionId: dbModelCalls.rootSessionId,
-      refs: { ...event.refs, sourcePathHash: parentSourcePathHash }
+      refs: {
+        ...event.refs,
+        sourcePathHash: parentSourcePathHash,
+        ...event.sessionId && event.sessionId !== dbModelCalls.rootSessionId ? { supersededSessionId: event.sessionId } : {}
+      }
     }));
   }
   return validEvents;
@@ -8198,7 +8218,7 @@ function fileActivitiesFromQoderCnToolUse(tool, input, ts, cwd) {
     const metrics = fileMetricsFromQoderCnToolInput(tool, input);
     addResolvedPathActivity(changes, filePath, operation, ts, cwd, workdir, metrics);
   }
-  for (const edit of arrayField4(input, "edits")) {
+  for (const edit of [...arrayField4(input, "edits"), ...arrayField4(input, "replacements")]) {
     if (!isPlainObject(edit)) {
       continue;
     }
@@ -8207,8 +8227,8 @@ function fileActivitiesFromQoderCnToolUse(tool, input, ts, cwd) {
       continue;
     }
     addResolvedPathActivity(changes, filePath, "edit", ts, cwd, workdir, {
-      linesAdded: countTextLines(stringField(edit, "new_string")),
-      linesRemoved: countTextLines(stringField(edit, "old_string"))
+      linesAdded: countTextLines(stringField(edit, "new_string") || stringField(edit, "new_text")),
+      linesRemoved: countTextLines(stringField(edit, "old_string") || stringField(edit, "original_text"))
     });
   }
   const command = stringField(input, "command");
@@ -8225,13 +8245,13 @@ function fileMetricsFromQoderCnToolInput(tool, input) {
     return { linesRead: numberField(input, "limit") };
   }
   if (normalized === "write") {
-    const content = stringField(input, "content");
+    const content = stringField(input, "content") || stringField(input, "file_content");
     return {
       linesAdded: countTextLines(content),
       charsWritten: content?.length
     };
   }
-  if (normalized === "edit" || normalized === "multiedit") {
+  if (normalized === "edit" || normalized === "multiedit" || normalized === "searchreplace") {
     const oldString = stringField(input, "old_string");
     const newString = stringField(input, "new_string");
     return {
@@ -8964,7 +8984,11 @@ async function parseQoderSessionFile(filePath, options) {
         const mapped = {
           ...event,
           sessionId: parentSessionId,
-          refs: { ...event.refs, sourcePathHash: parentSourcePathHash }
+          refs: {
+            ...event.refs,
+            sourcePathHash: parentSourcePathHash,
+            ...event.sessionId && event.sessionId !== parentSessionId ? { supersededSessionId: event.sessionId } : {}
+          }
         };
         return rebuildEventIdentity3(mapped);
       });
@@ -8977,7 +9001,11 @@ async function parseQoderSessionFile(filePath, options) {
     return validEvents.map((event) => rebuildEventIdentity3({
       ...event,
       sessionId: dbModelCalls.rootSessionId,
-      refs: { ...event.refs, sourcePathHash: parentSourcePathHash }
+      refs: {
+        ...event.refs,
+        sourcePathHash: parentSourcePathHash,
+        ...event.sessionId && event.sessionId !== dbModelCalls.rootSessionId ? { supersededSessionId: event.sessionId } : {}
+      }
     }));
   }
   return validEvents;
@@ -9024,7 +9052,7 @@ function fileActivitiesFromQoderToolUse(tool, input, ts, cwd) {
     const metrics = fileMetricsFromQoderToolInput(tool, input);
     addResolvedPathActivity(changes, filePath, operation, ts, cwd, workdir, metrics);
   }
-  for (const edit of arrayField5(input, "edits")) {
+  for (const edit of [...arrayField5(input, "edits"), ...arrayField5(input, "replacements")]) {
     if (!isPlainObject(edit)) {
       continue;
     }
@@ -9033,8 +9061,8 @@ function fileActivitiesFromQoderToolUse(tool, input, ts, cwd) {
       continue;
     }
     addResolvedPathActivity(changes, filePath, "edit", ts, cwd, workdir, {
-      linesAdded: countTextLines(stringField(edit, "new_string")),
-      linesRemoved: countTextLines(stringField(edit, "old_string"))
+      linesAdded: countTextLines(stringField(edit, "new_string") || stringField(edit, "new_text")),
+      linesRemoved: countTextLines(stringField(edit, "old_string") || stringField(edit, "original_text"))
     });
   }
   const command = stringField(input, "command");
@@ -9051,13 +9079,13 @@ function fileMetricsFromQoderToolInput(tool, input) {
     return { linesRead: numberField(input, "limit") };
   }
   if (normalized === "write") {
-    const content = stringField(input, "content");
+    const content = stringField(input, "content") || stringField(input, "file_content");
     return {
       linesAdded: countTextLines(content),
       charsWritten: content?.length
     };
   }
-  if (normalized === "edit" || normalized === "multiedit") {
+  if (normalized === "edit" || normalized === "multiedit" || normalized === "searchreplace") {
     const oldString = stringField(input, "old_string");
     const newString = stringField(input, "new_string");
     return {
@@ -10746,11 +10774,14 @@ function buildSessionRollup(rollupKey, events) {
   const agent = first.agent || ordered.find((event) => event.agent)?.agent;
   const startedAt = ordered[0]?.ts || (/* @__PURE__ */ new Date()).toISOString();
   const lastEventAt = ordered.at(-1)?.ts || startedAt;
+  const supersededSessionIds = [...new Set(ordered.map((event) => event.refs?.supersededSessionId).filter((id) => Boolean(id) && id !== sessionId))];
   const timeBuckets = /* @__PURE__ */ new Map();
   const modelRollups = /* @__PURE__ */ new Map();
   const toolRollups = /* @__PURE__ */ new Map();
   const fileRollups = /* @__PURE__ */ new Map();
   const turnRollups = /* @__PURE__ */ new Map();
+  const turnTimings = /* @__PURE__ */ new Map();
+  let activeTurnId;
   let promptCount = 0;
   let turnCount = 0;
   let toolCallCount = 0;
@@ -10766,6 +10797,22 @@ function buildSessionRollup(rollupKey, events) {
   let linesAdded = 0;
   let linesRemoved = 0;
   for (const event of ordered) {
+    if (event.type === "turn.started" && event.turnId) {
+      activeTurnId = event.turnId;
+      const timing = turnTimings.get(event.turnId) || {};
+      timing.taskStartedAt ??= event.ts;
+      turnTimings.set(event.turnId, timing);
+    }
+    if (event.type === "model.usage" || (event.metrics?.modelCalls || 0) > 0) {
+      const turnId = event.turnId || activeTurnId;
+      if (turnId) {
+        const timing = turnTimings.get(turnId) || {};
+        if (!timing.lastCallAt || event.ts > timing.lastCallAt) {
+          timing.lastCallAt = event.ts;
+        }
+        turnTimings.set(turnId, timing);
+      }
+    }
     const eventInputTokens = Math.max(0, event.metrics?.tokensInput || 0);
     const eventCachedInputTokens = Math.max(0, event.metrics?.tokensCachedInput || 0);
     const eventCacheCreationInputTokens = Math.max(0, event.metrics?.tokensCacheCreationInput || 0);
@@ -10969,6 +11016,9 @@ function buildSessionRollup(rollupKey, events) {
       fileRollups.set(pathHash, fileRollup);
     }
     timeBuckets.set(bucketTs, bucket);
+    if (event.type === "turn.completed" && event.turnId === activeTurnId) {
+      activeTurnId = void 0;
+    }
   }
   const baseRollup = {
     rollupKey,
@@ -10999,10 +11049,16 @@ function buildSessionRollup(rollupKey, events) {
     modelRollups: [...modelRollups.values()].sort((a, b) => b.callCount - a.callCount || a.model.localeCompare(b.model)),
     toolRollups: [...toolRollups.values()].sort((a, b) => b.callCount - a.callCount || a.tool.localeCompare(b.tool)),
     fileRollups: [...fileRollups.values()].sort((a, b) => b.writes - a.writes || b.reads - a.reads || a.displayPath.localeCompare(b.displayPath)),
-    turnRollups: [...turnRollups.values()].map((rollup) => ({
-      ...rollup,
-      durationMs: Math.max(0, Date.parse(rollup.lastEventAt) - Date.parse(rollup.startedAt))
-    })).sort((a, b) => a.startedAt.localeCompare(b.startedAt))
+    turnRollups: [...turnRollups.values()].map((rollup) => {
+      const timing = turnTimings.get(rollup.turnId);
+      const startedAt2 = timing?.taskStartedAt || rollup.startedAt;
+      return {
+        ...rollup,
+        startedAt: startedAt2,
+        durationMs: timing?.lastCallAt ? Math.max(0, Date.parse(timing.lastCallAt) - Date.parse(startedAt2)) : 0
+      };
+    }).sort((a, b) => a.startedAt.localeCompare(b.startedAt)),
+    ...supersededSessionIds.length > 0 ? { supersededSessionIds } : {}
   };
   return {
     ...baseRollup,
@@ -11416,7 +11472,7 @@ async function postRollupBatch(remote, rollups, options = {}) {
   };
 }
 async function deleteRollupsBySource(remote, source, machine, options = {}) {
-  const query = `source=${encodeURIComponent(source)}${options.preserveTokens ? "&preserveTokens=1" : ""}${options.allowHistoricalRewrite ? "&allowHistoricalRewrite=1" : ""}`;
+  const query = `source=${encodeURIComponent(source)}${options.rollupKey ? `&rollupKey=${encodeURIComponent(options.rollupKey)}` : ""}${options.preserveTokens ? "&preserveTokens=1" : ""}${options.allowHistoricalRewrite ? "&allowHistoricalRewrite=1" : ""}`;
   const response = await remote.fetchImpl(
     joinUrl(remote.baseUrl, `/v3/agent/sessions?${query}`),
     { method: "DELETE", headers: buildHeaders(remote.token, machine) }
@@ -12273,6 +12329,21 @@ async function sendSessionRollupBatch(rollups, options, ctx) {
     machine,
     allowHistoricalRewrite: options["purge-all"] === true
   });
+  if (options.force && result.conflicts === 0) {
+    for (const rollup of rollups) {
+      for (const sessionId of rollup.supersededSessionIds ?? []) {
+        try {
+          await deleteRollupsBySource(remote, rollup.source, machine, {
+            rollupKey: createImportKey(["rollup", rollup.source, sessionId]),
+            allowHistoricalRewrite: options["purge-all"] === true
+          });
+        } catch (error) {
+          debug(ctx, `Failed to delete superseded ${rollup.source} session ${sessionId}: ${error.message}
+`);
+        }
+      }
+    }
+  }
   return result;
 }
 async function deleteSessionRollupsBySourceAPI(source, options, ctx, preserveTokens) {

package/package.json

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