@yhong91/vibetime 0.1.43 → 0.1.45

package/bin/vibetime.mjs

@@ -1719,6 +1719,69 @@ import { promisify } from "node:util";
 // src/lib/activity.ts
 import path2 from "node:path";
 
+// src/lib/fields.ts
+function stringField(object, key) {
+  if (!isPlainObject(object)) {
+    return void 0;
+  }
+  const value = object[key];
+  return typeof value === "string" ? value : void 0;
+}
+function numberField(object, key) {
+  const value = object[key];
+  return typeof value === "number" && Number.isFinite(value) ? value : void 0;
+}
+function objectField(object, key) {
+  if (!isPlainObject(object) || !isPlainObject(object[key])) {
+    return {};
+  }
+  return object[key];
+}
+function arrayField(object, key) {
+  if (!isPlainObject(object) || !Array.isArray(object[key])) {
+    return [];
+  }
+  return object[key];
+}
+function isPlainObject(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+function stringRefs(value) {
+  const refs2 = {};
+  for (const [key, item] of Object.entries(value || {})) {
+    if (typeof item === "string" && item.length > 0) {
+      refs2[key] = item;
+    }
+  }
+  return refs2;
+}
+function stringOption(value) {
+  if (Array.isArray(value)) {
+    return value.at(-1);
+  }
+  return typeof value === "string" ? value : void 0;
+}
+function valuesOption(value) {
+  if (Array.isArray(value)) {
+    return value;
+  }
+  return typeof value === "string" ? [value] : [];
+}
+function numberOption(value) {
+  if (typeof value === "number" && Number.isFinite(value)) {
+    return value;
+  }
+  if (Array.isArray(value)) {
+    return numberOption(value.at(-1));
+  }
+  const text = stringOption(value);
+  if (!text) {
+    return void 0;
+  }
+  const parsed = Number(text);
+  return Number.isFinite(parsed) ? parsed : void 0;
+}
+
 // src/lib/shell.ts
 import path from "node:path";
 function fileActivitiesFromShellCommand(command, ts, rootCwd, initialCwd) {
@@ -1845,7 +1908,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";
@@ -1926,78 +1989,71 @@ function countTextLines(text) {
   }
   return text.split(/\r\n|\r|\n/).length;
 }
-
-// src/lib/constants.ts
-var PACKAGE_VERSION = true ? "0.1.43" : "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;
-var ROLLUP_BUCKET_MS = 15 * 60 * 1e3;
-var DEFAULT_HOOK_SYNC_MIN_INTERVAL_SECONDS = 60;
-
-// src/lib/fields.ts
-function stringField(object, key) {
-  if (!isPlainObject(object)) {
-    return void 0;
-  }
-  const value = object[key];
-  return typeof value === "string" ? value : void 0;
-}
-function numberField(object, key) {
-  const value = object[key];
-  return typeof value === "number" && Number.isFinite(value) ? value : void 0;
-}
-function objectField(object, key) {
-  if (!isPlainObject(object) || !isPlainObject(object[key])) {
-    return {};
-  }
-  return object[key];
-}
-function arrayField(object, key) {
-  if (!isPlainObject(object) || !Array.isArray(object[key])) {
-    return [];
-  }
-  return object[key];
-}
-function isPlainObject(value) {
-  return value !== null && typeof value === "object" && !Array.isArray(value);
-}
-function stringRefs(value) {
-  const refs2 = {};
-  for (const [key, item] of Object.entries(value || {})) {
-    if (typeof item === "string" && item.length > 0) {
-      refs2[key] = item;
+function claudeStyleToolFileActivities(tool, input, ts, cwd) {
+  const changes = /* @__PURE__ */ new Map();
+  const operation = operationForTool(tool);
+  const workdir = stringField(input, "cwd") || cwd;
+  for (const key of ["file_path", "path", "notebook_path"]) {
+    const filePath = stringField(input, key);
+    if (!filePath) {
+      continue;
     }
+    const metrics = claudeStyleFileMetrics(tool, input);
+    addResolvedPathActivity(changes, filePath, operation, ts, cwd, workdir, metrics);
   }
-  return refs2;
-}
-function stringOption(value) {
-  if (Array.isArray(value)) {
-    return value.at(-1);
+  for (const edit of [...arrayField(input, "edits"), ...arrayField(input, "replacements")]) {
+    if (!isPlainObject(edit)) {
+      continue;
+    }
+    const filePath = stringField(input, "file_path") || stringField(input, "path");
+    if (!filePath) {
+      continue;
+    }
+    addResolvedPathActivity(changes, filePath, "edit", ts, cwd, workdir, {
+      linesAdded: countTextLines(stringField(edit, "new_string") || stringField(edit, "new_text")),
+      linesRemoved: countTextLines(stringField(edit, "old_string") || stringField(edit, "original_text"))
+    });
   }
-  return typeof value === "string" ? value : void 0;
-}
-function valuesOption(value) {
-  if (Array.isArray(value)) {
-    return value;
+  const command = stringField(input, "command");
+  if (command) {
+    for (const item of fileActivitiesFromShellCommand(command, ts, cwd, workdir)) {
+      changes.set(item.path, mergeFileActivity(changes.get(item.path), item));
+    }
   }
-  return typeof value === "string" ? [value] : [];
+  return [...changes.values()];
 }
-function numberOption(value) {
-  if (typeof value === "number" && Number.isFinite(value)) {
-    return value;
+function claudeStyleFileMetrics(tool, input) {
+  const normalized = tool.toLowerCase();
+  if (normalized === "read") {
+    return { linesRead: numberField(input, "limit") };
   }
-  if (Array.isArray(value)) {
-    return numberOption(value.at(-1));
+  if (normalized === "write") {
+    const content = stringField(input, "content") || stringField(input, "file_content");
+    return {
+      linesAdded: countTextLines(content),
+      charsWritten: content?.length
+    };
   }
-  const text = stringOption(value);
-  if (!text) {
-    return void 0;
+  if (normalized === "edit" || normalized === "multiedit" || normalized === "searchreplace") {
+    const oldString = stringField(input, "old_string");
+    const newString = stringField(input, "new_string");
+    return {
+      linesAdded: countTextLines(newString),
+      linesRemoved: countTextLines(oldString),
+      charsWritten: newString?.length
+    };
   }
-  const parsed = Number(text);
-  return Number.isFinite(parsed) ? parsed : void 0;
+  return {};
 }
 
+// src/lib/constants.ts
+var PACKAGE_VERSION = true ? "0.1.45" : "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;
+var ROLLUP_BUCKET_MS = 15 * 60 * 1e3;
+var DEFAULT_HOOK_SYNC_MIN_INTERVAL_SECONDS = 60;
+
 // src/lib/jsonl.ts
 function parseJsonLine(line) {
   try {
@@ -3868,14 +3924,14 @@ function claudeProjectRootFromCwds(projectDir, cwds) {
   return void 0;
 }
 function encodeClaudeProjectPath(value) {
-  return path7.resolve(value).split(path7.sep).join("-").replace(/_/g, "-");
+  return path7.resolve(value).split(path7.sep).join("-").replaceAll("_", "-");
 }
 function rawClaudeProjectPath(value) {
   return path7.resolve(value).split(path7.sep).join("-");
 }
 function claudeEncodedVariants(value) {
   const raw = rawClaudeProjectPath(value);
-  const normalized = raw.replace(/_/g, "-");
+  const normalized = raw.replaceAll("_", "-");
   return raw === normalized ? [raw] : [raw, normalized];
 }
 function claudeEncodedProjectSuffix(projectDir, home) {
@@ -4129,7 +4185,7 @@ async function discoverCoworkTranscripts(root) {
 function coworkMetaPathForTranscript(transcriptPath) {
   const marker = `${path8.sep}.claude${path8.sep}projects${path8.sep}`;
   const index = transcriptPath.indexOf(marker);
-  if (index < 0) {
+  if (index === -1) {
     return void 0;
   }
   return `${transcriptPath.slice(0, index)}.json`;
@@ -4144,7 +4200,7 @@ function projectFromMeta(meta) {
   }
   const resolved = path8.resolve(folder);
   return {
-    project: path8.basename(resolved).replace(/-/g, "_") || "cowork",
+    project: path8.basename(resolved).replaceAll("-", "_") || "cowork",
     cwd: resolved
   };
 }
@@ -4269,7 +4325,7 @@ function createClaudeCoworkAdapter() {
 }
 
 // src/adapters/codebuddy.ts
-import { readFile as readFile5, readdir as readdir4 } from "node:fs/promises";
+import { readdir as readdir4, readFile as readFile5 } from "node:fs/promises";
 import path9 from "node:path";
 var ENDPOINT_MODEL_ID_RE = /^(?:ep|endpoint)-/i;
 async function parseCodebuddyTraceFile(filePath, options) {
@@ -4504,6 +4560,28 @@ async function parseCodebuddyTraceFile(filePath, options) {
           sourceId: span.spanId
         })
       }), index, "function");
+      const toolInput = parseEmbeddedJson(span.toolInput);
+      if (isPlainObject(toolInput)) {
+        const fileActivities = claudeStyleToolFileActivities(tool, toolInput, ts, cwd);
+        if (fileActivities.length > 0) {
+          push(baseEvent({
+            ts,
+            type: eventTypeFromFileActivities(fileActivities),
+            operation: `${tool} file activity`,
+            sessionId,
+            cwd,
+            project,
+            model,
+            tool,
+            confidence: "derived",
+            fileActivities,
+            metrics: summarizeFileActivities(fileActivities),
+            refs: stringRefs({
+              sourceId: span.spanId
+            })
+          }), index, "function");
+        }
+      }
       if (span.endedAt) {
         const durationMs = span.duration ?? void 0;
         push(baseEvent({
@@ -4527,30 +4605,28 @@ async function parseCodebuddyTraceFile(filePath, options) {
           })
         }), index, "function");
       }
-      if (tool === "Bash") {
-        if (span.endedAt) {
-          const durationMs = span.duration ?? void 0;
-          push(baseEvent({
-            ts: span.endedAt,
-            type: toolSuccess ? "command.completed" : "command.failed",
-            operation: "Bash completed",
-            sessionId,
-            cwd,
-            project,
-            model,
-            tool,
-            success: toolSuccess,
-            confidence: "derived",
-            metrics: {
-              commandCalls: 1,
-              commandDurationMs: durationMs,
-              durationMs
-            },
-            refs: stringRefs({
-              sourceId: span.spanId
-            })
-          }), index, "function");
-        }
+      if (tool === "Bash" && span.endedAt) {
+        const durationMs = span.duration ?? void 0;
+        push(baseEvent({
+          ts: span.endedAt,
+          type: toolSuccess ? "command.completed" : "command.failed",
+          operation: "Bash completed",
+          sessionId,
+          cwd,
+          project,
+          model,
+          tool,
+          success: toolSuccess,
+          confidence: "derived",
+          metrics: {
+            commandCalls: 1,
+            commandDurationMs: durationMs,
+            durationMs
+          },
+          refs: stringRefs({
+            sourceId: span.spanId
+          })
+        }), index, "function");
       }
       continue;
     }
@@ -4755,7 +4831,6 @@ async function resolveSessionIdFromSiblingTraces(filePath) {
         }
       } catch {
       }
-      return void 0;
     })();
     siblingSessionIdByDir.set(dir, cached);
   }
@@ -4949,6 +5024,33 @@ import { readFile as readFile6 } from "node:fs/promises";
 import path11 from "node:path";
 
 // src/lib/diff.ts
+function parseApplyPatch(patch, ts) {
+  const changes = [];
+  let current;
+  for (const line of patch.split("\n")) {
+    const fileMatch = line.match(/^\*\*\* (Add|Update|Delete) File: (.+)$/);
+    if (fileMatch) {
+      current = {
+        ts,
+        path: fileMatch[2].trim(),
+        operation: fileMatch[1] === "Add" ? "create" : fileMatch[1] === "Delete" ? "delete" : "edit",
+        linesAdded: 0,
+        linesRemoved: 0
+      };
+      changes.push(current);
+      continue;
+    }
+    if (!current) {
+      continue;
+    }
+    if (line.startsWith("+") && !line.startsWith("+++")) {
+      current.linesAdded = (current.linesAdded || 0) + 1;
+    } else if (line.startsWith("-") && !line.startsWith("---")) {
+      current.linesRemoved = (current.linesRemoved || 0) + 1;
+    }
+  }
+  return changes;
+}
 function diffStats(diff) {
   let linesAdded = 0;
   let linesRemoved = 0;
@@ -4992,10 +5094,10 @@ function fileActivitiesFromPatchChanges(changes, ts, cwd, displayFilePath3) {
 }
 
 // src/lib/session-context.ts
-init_fs();
 import { mkdir as mkdir3, writeFile as writeFile3 } from "node:fs/promises";
 import os4 from "node:os";
 import path10 from "node:path";
+init_fs();
 var SESSION_CONTEXT_VERSION = 1;
 function sessionContextDir(home) {
   return path10.join(home, ".vibetime", "session-context");
@@ -5814,7 +5916,7 @@ async function parseCopilotSessionFile(filePath, options) {
           model = msgModel;
         }
         const msgTurnId = stringField(data, "turnId");
-        const turnId = msgTurnId !== void 0 ? `turn_${createStableHash([sessionId, msgTurnId]).slice(0, 24)}` : currentTurnId;
+        const turnId = msgTurnId === void 0 ? currentTurnId : `turn_${createStableHash([sessionId, msgTurnId]).slice(0, 24)}`;
         events.push(baseCopilotEvent({
           ts,
           type: "agent.operation",
@@ -5841,7 +5943,7 @@ async function parseCopilotSessionFile(filePath, options) {
         const toolCallId = stringField(data, "toolCallId");
         const toolName = stringField(data, "toolName") || "tool";
         const toolTurnId = stringField(data, "turnId");
-        const turnId = toolTurnId !== void 0 ? `turn_${createStableHash([sessionId, toolTurnId]).slice(0, 24)}` : currentTurnId;
+        const turnId = toolTurnId === void 0 ? currentTurnId : `turn_${createStableHash([sessionId, toolTurnId]).slice(0, 24)}`;
         if (toolCallId) {
           pendingTools.set(toolCallId, { tool: toolName, startedAt: ts, turnId });
         }
@@ -5859,6 +5961,24 @@ async function parseCopilotSessionFile(filePath, options) {
           metrics: { toolCalls: 1 },
           refs: stringRefs({ sourceId: toolCallId })
         }));
+        const fileActivities = copilotFileActivities(toolName, data.arguments, ts, cwd);
+        if (fileActivities.length > 0) {
+          events.push(baseCopilotEvent({
+            ts,
+            type: eventTypeFromFileActivities(fileActivities),
+            operation: `${toolName} file activity`,
+            sessionId,
+            turnId,
+            cwd,
+            project,
+            model,
+            tool: toolName,
+            confidence: "derived",
+            fileActivities,
+            metrics: summarizeFileActivities(fileActivities),
+            refs: stringRefs({ sourceId: toolCallId })
+          }));
+        }
         break;
       }
       case "tool.execution_complete": {
@@ -5881,7 +6001,7 @@ async function parseCopilotSessionFile(filePath, options) {
           tool: pending?.tool,
           success,
           confidence: "exact",
-          metrics: durationMs !== void 0 ? { toolDurationMs: durationMs, durationMs } : void 0,
+          metrics: durationMs === void 0 ? void 0 : { toolDurationMs: durationMs, durationMs },
           refs: stringRefs({ sourceId: toolCallId })
         }));
         const toolLower = (pending?.tool || "").toLowerCase();
@@ -5910,7 +6030,7 @@ async function parseCopilotSessionFile(filePath, options) {
       }
       case "assistant.turn_end": {
         const endTurnId = stringField(data, "turnId");
-        const turnId = endTurnId !== void 0 ? `turn_${createStableHash([sessionId, endTurnId]).slice(0, 24)}` : currentTurnId;
+        const turnId = endTurnId === void 0 ? currentTurnId : `turn_${createStableHash([sessionId, endTurnId]).slice(0, 24)}`;
         const accum = turnId ? turnTokenAccum.get(turnId) : void 0;
         if (accum && accum.tokensOutput && accum.tokensOutput > 0) {
           accum.reasoningEffort = reasoningEffort;
@@ -5997,6 +6117,29 @@ async function parseCopilotSessionFile(filePath, options) {
   }
   return events.filter((event) => validateCanonicalEvent(event).valid);
 }
+function copilotFileActivities(tool, args, ts, cwd) {
+  const normalized = tool.toLowerCase();
+  if (normalized === "apply_patch" && typeof args === "string") {
+    return parseApplyPatch(args, ts);
+  }
+  if (!isPlainObject(args)) {
+    return [];
+  }
+  const changes = /* @__PURE__ */ new Map();
+  const filePath = stringField(args, "path") || stringField(args, "file_path");
+  if (filePath) {
+    const metrics = {};
+    if (normalized === "edit") {
+      const oldStr = stringField(args, "old_str");
+      const newStr = stringField(args, "new_str");
+      metrics.linesAdded = countTextLines(newStr);
+      metrics.linesRemoved = countTextLines(oldStr);
+      metrics.charsWritten = newStr?.length;
+    }
+    addResolvedPathActivity(changes, filePath, operationForTool(normalized === "view" ? "read" : tool), ts, cwd, cwd, metrics);
+  }
+  return [...changes.values()];
+}
 function baseCopilotEvent(event) {
   return {
     schemaVersion: AGENT_TIME_SCHEMA_VERSION,
@@ -6205,7 +6348,7 @@ async function parseGrokSessionFile(filePath, options) {
     }
     if (type === "turn_started") {
       const turnNumber = numberField(raw, "turn_number");
-      currentTurnId = turnNumber !== void 0 ? `turn_${turnNumber}` : `turn_${createStableHash([sessionId, lineNumber]).slice(0, 24)}`;
+      currentTurnId = turnNumber === void 0 ? `turn_${createStableHash([sessionId, lineNumber]).slice(0, 24)}` : `turn_${turnNumber}`;
       currentTurnStartedAt = ts;
       const turnModel = stringField(raw, "model_id") || model;
       push(base({
@@ -6229,7 +6372,7 @@ async function parseGrokSessionFile(filePath, options) {
         turnId,
         success,
         confidence: "exact",
-        metrics: durationMs !== void 0 ? { durationMs } : void 0,
+        metrics: durationMs === void 0 ? void 0 : { durationMs },
         refs: stringRefs({
           sourceId: `${sessionId}:${turnId || "turn"}:ended`,
           outcome
@@ -6374,7 +6517,7 @@ function resolveSessionDir(filePath) {
   if (base === "summary.json" || base === "events.jsonl" || base === "signals.json") {
     return path13.dirname(filePath);
   }
-  if (base.match(/^[0-9a-f]{8}-[0-9a-f-]{27,}$/i)) {
+  if (/^[0-9a-f]{8}-[0-9a-f-]{27,}$/i.test(base)) {
     return filePath;
   }
   return void 0;
@@ -7381,6 +7524,18 @@ function piFileActivitiesFromToolCall(tool, input, ts, cwd) {
       addResolvedPathActivity(changes, filePath, operation, ts, cwd, cwd, piToolFileMetrics(normalized, input));
     }
   }
+  if (normalized === "edit") {
+    const filePath = stringField(input, "path") || stringField(input, "file_path") || stringField(input, "filePath");
+    for (const edit of Array.isArray(input.edits) ? input.edits : []) {
+      if (!isPlainObject(edit) || !filePath) {
+        continue;
+      }
+      addResolvedPathActivity(changes, filePath, "edit", ts, cwd, cwd, {
+        linesAdded: countTextLines(stringField(edit, "newText") || stringField(edit, "new_text")),
+        linesRemoved: countTextLines(stringField(edit, "oldText") || stringField(edit, "old_text"))
+      });
+    }
+  }
   if (normalized === "bash" || normalized === "run") {
     const command = stringField(input, "command");
     if (command) {
@@ -8069,7 +8224,7 @@ async function parseQoderCnSessionFile(filePath, options) {
       const toolUseId = stringField(toolUse, "id") || `tool_${createStableHash([filePath, lineNumber, tool]).slice(0, 24)}`;
       const input = objectField(toolUse, "input");
       const command = stringField(input, "command");
-      const fileActivities = fileActivitiesFromQoderCnToolUse(tool, input, ts, cwd);
+      const fileActivities = claudeStyleToolFileActivities(tool, input, ts, cwd);
       const agentInstanceId = tool === "Agent" ? `agent_${createStableHash([sessionId, toolUseId]).slice(0, 24)}` : void 0;
       pendingTools.set(toolUseId, {
         id: toolUseId,
@@ -8150,7 +8305,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);
       });
@@ -8163,7 +8322,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,62 +8361,6 @@ function qoderCnSubagentMetrics(toolResult, fallbackDurationMs) {
     tokensTotal: numberField(toolResult, "totalTokens") || totalInputTokens + outputTokens || void 0
   };
 }
-function fileActivitiesFromQoderCnToolUse(tool, input, ts, cwd) {
-  const changes = /* @__PURE__ */ new Map();
-  const operation = operationForTool(tool);
-  const workdir = stringField(input, "cwd") || cwd;
-  for (const key of ["file_path", "path", "notebook_path"]) {
-    const filePath = stringField(input, key);
-    if (!filePath) {
-      continue;
-    }
-    const metrics = fileMetricsFromQoderCnToolInput(tool, input);
-    addResolvedPathActivity(changes, filePath, operation, ts, cwd, workdir, metrics);
-  }
-  for (const edit of arrayField4(input, "edits")) {
-    if (!isPlainObject(edit)) {
-      continue;
-    }
-    const filePath = stringField(input, "file_path") || stringField(input, "path");
-    if (!filePath) {
-      continue;
-    }
-    addResolvedPathActivity(changes, filePath, "edit", ts, cwd, workdir, {
-      linesAdded: countTextLines(stringField(edit, "new_string")),
-      linesRemoved: countTextLines(stringField(edit, "old_string"))
-    });
-  }
-  const command = stringField(input, "command");
-  if (command) {
-    for (const item of fileActivitiesFromShellCommand(command, ts, cwd, workdir)) {
-      changes.set(item.path, mergeFileActivity(changes.get(item.path), item));
-    }
-  }
-  return [...changes.values()];
-}
-function fileMetricsFromQoderCnToolInput(tool, input) {
-  const normalized = tool.toLowerCase();
-  if (normalized === "read") {
-    return { linesRead: numberField(input, "limit") };
-  }
-  if (normalized === "write") {
-    const content = stringField(input, "content");
-    return {
-      linesAdded: countTextLines(content),
-      charsWritten: content?.length
-    };
-  }
-  if (normalized === "edit" || normalized === "multiedit") {
-    const oldString = stringField(input, "old_string");
-    const newString = stringField(input, "new_string");
-    return {
-      linesAdded: countTextLines(newString),
-      linesRemoved: countTextLines(oldString),
-      charsWritten: newString?.length
-    };
-  }
-  return {};
-}
 function arrayField4(object, key) {
   if (!isPlainObject(object) || !Array.isArray(object[key])) {
     return [];
@@ -8414,7 +8521,7 @@ function qoderCnProjectRootFromCwds(projectDir, cwds) {
   return void 0;
 }
 function encodeQoderCnProjectPath(value) {
-  return path17.resolve(value).split(path17.sep).join("-").replace(/_/g, "-");
+  return path17.resolve(value).split(path17.sep).join("-").replaceAll("_", "-");
 }
 async function qoderCnProjectFromFilePath(filePath, options) {
   const projectDir = path17.basename(path17.dirname(filePath));
@@ -8895,7 +9002,7 @@ async function parseQoderSessionFile(filePath, options) {
       const toolUseId = stringField(toolUse, "id") || `tool_${createStableHash([filePath, lineNumber, tool]).slice(0, 24)}`;
       const input = objectField(toolUse, "input");
       const command = stringField(input, "command");
-      const fileActivities = fileActivitiesFromQoderToolUse(tool, input, ts, cwd);
+      const fileActivities = claudeStyleToolFileActivities(tool, input, ts, cwd);
       const agentInstanceId = tool === "Agent" ? `agent_${createStableHash([sessionId, toolUseId]).slice(0, 24)}` : void 0;
       pendingTools.set(toolUseId, {
         id: toolUseId,
@@ -8976,7 +9083,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);
       });
@@ -8989,7 +9100,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,62 +9139,6 @@ function qoderSubagentMetrics(toolResult, fallbackDurationMs) {
     tokensTotal: numberField(toolResult, "totalTokens") || totalInputTokens + outputTokens || void 0
   };
 }
-function fileActivitiesFromQoderToolUse(tool, input, ts, cwd) {
-  const changes = /* @__PURE__ */ new Map();
-  const operation = operationForTool(tool);
-  const workdir = stringField(input, "cwd") || cwd;
-  for (const key of ["file_path", "path", "notebook_path"]) {
-    const filePath = stringField(input, key);
-    if (!filePath) {
-      continue;
-    }
-    const metrics = fileMetricsFromQoderToolInput(tool, input);
-    addResolvedPathActivity(changes, filePath, operation, ts, cwd, workdir, metrics);
-  }
-  for (const edit of arrayField5(input, "edits")) {
-    if (!isPlainObject(edit)) {
-      continue;
-    }
-    const filePath = stringField(input, "file_path") || stringField(input, "path");
-    if (!filePath) {
-      continue;
-    }
-    addResolvedPathActivity(changes, filePath, "edit", ts, cwd, workdir, {
-      linesAdded: countTextLines(stringField(edit, "new_string")),
-      linesRemoved: countTextLines(stringField(edit, "old_string"))
-    });
-  }
-  const command = stringField(input, "command");
-  if (command) {
-    for (const item of fileActivitiesFromShellCommand(command, ts, cwd, workdir)) {
-      changes.set(item.path, mergeFileActivity(changes.get(item.path), item));
-    }
-  }
-  return [...changes.values()];
-}
-function fileMetricsFromQoderToolInput(tool, input) {
-  const normalized = tool.toLowerCase();
-  if (normalized === "read") {
-    return { linesRead: numberField(input, "limit") };
-  }
-  if (normalized === "write") {
-    const content = stringField(input, "content");
-    return {
-      linesAdded: countTextLines(content),
-      charsWritten: content?.length
-    };
-  }
-  if (normalized === "edit" || normalized === "multiedit") {
-    const oldString = stringField(input, "old_string");
-    const newString = stringField(input, "new_string");
-    return {
-      linesAdded: countTextLines(newString),
-      linesRemoved: countTextLines(oldString),
-      charsWritten: newString?.length
-    };
-  }
-  return {};
-}
 function arrayField5(object, key) {
   if (!isPlainObject(object) || !Array.isArray(object[key])) {
     return [];
@@ -9206,14 +9265,14 @@ function qoderProjectRootFromCwds(projectDir, cwds) {
   return void 0;
 }
 function encodeQoderProjectPath(value) {
-  return path18.resolve(value).split(path18.sep).join("-").replace(/_/g, "-");
+  return path18.resolve(value).split(path18.sep).join("-").replaceAll("_", "-");
 }
 function rawQoderProjectPath(value) {
   return path18.resolve(value).split(path18.sep).join("-");
 }
 function qoderEncodedVariants(value) {
   const raw = rawQoderProjectPath(value);
-  const normalized = raw.replace(/_/g, "-");
+  const normalized = raw.replaceAll("_", "-");
   return raw === normalized ? [raw] : [raw, normalized];
 }
 function qoderEncodedProjectSuffix(projectDir, home) {
@@ -9369,7 +9428,7 @@ function normalizeId(id) {
 }
 
 // src/adapters/workbuddy.ts
-import { readFile as readFile12, readdir as readdir9, stat as stat10 } from "node:fs/promises";
+import { readdir as readdir9, readFile as readFile12, stat as stat10 } from "node:fs/promises";
 import path19 from "node:path";
 function workbuddyProjectsDir(home, env) {
   const override = env?.WORKBUDDY_PROJECTS_DIR || env?.WORKBUDDY_HOME;
@@ -9575,7 +9634,9 @@ async function parseWorkbuddySessionFile(filePath, options) {
       confidence: "derived",
       refs: { sourceId: `${sessionPrefix}:session`, ...subagentRefs }
     }, lines[0], filePath, options);
-    if (event) events.push(event);
+    if (event) {
+      events.push(event);
+    }
   }
   for (const line of lines) {
     const record = line.record;
@@ -9590,7 +9651,9 @@ async function parseWorkbuddySessionFile(filePath, options) {
         continue;
       }
       const ended = closeTurn(line);
-      if (ended) events.push(ended);
+      if (ended) {
+        events.push(ended);
+      }
       turnIndex += 1;
       currentTurnId = `${sessionPrefix}:turn:${turnIndex}`;
       turnLastTs = ts;
@@ -9628,7 +9691,9 @@ async function parseWorkbuddySessionFile(filePath, options) {
           refs: { sourceId: `${sourceId}:prompt` }
         }, line, filePath, options)
       ]) {
-        if (event) events.push(event);
+        if (event) {
+          events.push(event);
+        }
       }
       continue;
     }
@@ -9655,7 +9720,9 @@ async function parseWorkbuddySessionFile(filePath, options) {
           confidence: "partial",
           refs: { sourceId: `${sourceId}:usage` }
         }, line, filePath, options);
-        if (usage) events.push(usage);
+        if (usage) {
+          events.push(usage);
+        }
       }
       continue;
     }
@@ -9682,7 +9749,40 @@ async function parseWorkbuddySessionFile(filePath, options) {
           confidence: "exact",
           refs: { sourceId: `${callId}:start` }
         }, line, filePath, options);
-        if (started) events.push(started);
+        if (started) {
+          events.push(started);
+        }
+        let toolInput;
+        try {
+          toolInput = JSON.parse(stringField(record, "arguments") || "");
+        } catch {
+          toolInput = void 0;
+        }
+        if (isPlainObject(toolInput)) {
+          const fileActivities = claudeStyleToolFileActivities(tool, toolInput, ts, cwd);
+          if (fileActivities.length > 0) {
+            const fileEvent = makeEvent({
+              schemaVersion: AGENT_TIME_SCHEMA_VERSION,
+              ts,
+              type: eventTypeFromFileActivities(fileActivities),
+              source: "workbuddy",
+              workspaceId,
+              project,
+              cwd,
+              sessionId: sessionPrefix,
+              turnId: currentTurnId,
+              agent: "workbuddy",
+              tool,
+              confidence: "derived",
+              fileActivities,
+              metrics: summarizeFileActivities(fileActivities),
+              refs: { sourceId: `${callId}:files` }
+            }, line, filePath, options);
+            if (fileEvent) {
+              events.push(fileEvent);
+            }
+          }
+        }
       }
       const metrics = workbuddyUsageMetrics(record);
       const model = stringField(objectField(record, "providerData"), "model");
@@ -9703,7 +9803,9 @@ async function parseWorkbuddySessionFile(filePath, options) {
           confidence: metrics ? "partial" : "derived",
           refs: { sourceId: `${sourceId}:usage:${callId || line.lineNumber}` }
         }, line, filePath, options);
-        if (usage) events.push(usage);
+        if (usage) {
+          events.push(usage);
+        }
       }
       continue;
     }
@@ -9732,13 +9834,17 @@ async function parseWorkbuddySessionFile(filePath, options) {
         confidence: start ? "derived" : "partial",
         refs: { sourceId: `${callId}:result` }
       }, line, filePath, options);
-      if (completed) events.push(completed);
+      if (completed) {
+        events.push(completed);
+      }
     }
   }
   const lastLine = lines.at(-1);
   if (lastLine) {
     const ended = closeTurn(lastLine);
-    if (ended) events.push(ended);
+    if (ended) {
+      events.push(ended);
+    }
   }
   const lastTs = lastLine ? timestampFrom(numberField(lastLine.record, "timestamp")) : void 0;
   if (lastLine && lastTs) {
@@ -9755,7 +9861,9 @@ async function parseWorkbuddySessionFile(filePath, options) {
       confidence: "derived",
       refs: { sourceId: `${sessionPrefix}:ended` }
     }, lastLine, filePath, options);
-    if (event) events.push(event);
+    if (event) {
+      events.push(event);
+    }
   }
   return events;
 }
@@ -10758,6 +10866,7 @@ 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();
@@ -11040,7 +11149,8 @@ function buildSessionRollup(rollupKey, events) {
         startedAt: startedAt2,
         durationMs: timing?.lastCallAt ? Math.max(0, Date.parse(timing.lastCallAt) - Date.parse(startedAt2)) : 0
       };
-    }).sort((a, b) => a.startedAt.localeCompare(b.startedAt))
+    }).sort((a, b) => a.startedAt.localeCompare(b.startedAt)),
+    ...supersededSessionIds.length > 0 ? { supersededSessionIds } : {}
   };
   return {
     ...baseRollup,
@@ -11454,7 +11564,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) }
@@ -12311,6 +12421,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) {
@@ -12392,8 +12517,8 @@ function selectBackfillFilesForImport(files, watermarkTs) {
     }
   }
   const order = /* @__PURE__ */ new Map();
-  for (let i = 0; i < files.length; i += 1) {
-    order.set(files[i].path, i);
+  for (const [i, file] of files.entries()) {
+    order.set(file.path, i);
   }
   picked.sort((a, b) => (order.get(a.path) ?? 0) - (order.get(b.path) ?? 0));
   return picked;

package/package.json

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