@yhong91/vibetime 0.1.53 → 0.1.55

package/bin/vibetime.mjs

@@ -884,8 +884,8 @@ var init_esm = __esm({
 
 // src/cli.ts
 import { spawn as spawn2, spawnSync } from "node:child_process";
-import { mkdir as mkdir5, open, rm, stat as stat13, writeFile as writeFile4 } from "node:fs/promises";
-import os11 from "node:os";
+import { mkdir as mkdir5, open, rm, stat as stat14, writeFile as writeFile4 } from "node:fs/promises";
+import os12 from "node:os";
 import path25 from "node:path";
 import { fileURLToPath } from "node:url";
 
@@ -2047,7 +2047,7 @@ function claudeStyleFileMetrics(tool, input) {
 }
 
 // src/lib/constants.ts
-var PACKAGE_VERSION = true ? "0.1.53" : "0.1.1";
+var PACKAGE_VERSION = true ? "0.1.55" : "0.1.1";
 var GENERATED_MARKER = "Generated by vibetime.";
 var DEFAULT_API_URL = "http://121.196.224.82:3001";
 var DEFAULT_BACKFILL_BATCH_SIZE = 50;
@@ -3331,6 +3331,9 @@ function isTurnIdle(lastEventAt) {
   }
   return Date.now() - lastMs > TURN_IDLE_MS;
 }
+function withoutSubagentTurnEvents(events) {
+  return events.filter((event) => event.type !== "turn.started" && event.type !== "turn.completed");
+}
 function sessionIdFromFilePath(filePath, prefix) {
   const match = path6.basename(filePath).match(/([0-9a-f]{8}-[0-9a-f-]{27,})/);
   return match?.[1] || `${prefix}_${createStableHash(filePath).slice(0, 24)}`;
@@ -4253,7 +4256,8 @@ async function parseClaudeCoworkSessionFile(filePath, options) {
   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 foldable = subagentInfo ? withoutSubagentTurnEvents(events).map((event) => ({ ...event, turnId: void 0 })) : events;
+  return foldable.map((event) => {
     const sessionId = parentSessionId || prefixCoworkId(event.sessionId);
     const turnId = prefixCoworkId(event.turnId);
     const workspaceId = createWorkspaceId({ projectName: project, repoRoot: cwd });
@@ -5007,8 +5011,8 @@ 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(), groupId: pidDir.name });
+            const stat15 = await import("node:fs/promises").then((fs) => fs.stat(filePath));
+            files.push({ path: filePath, modifiedAt: stat15.mtime.toISOString(), groupId: pidDir.name });
           } catch {
           }
         }
@@ -7635,6 +7639,8 @@ async function parseOpenCodeSessionFile(dbPath, options) {
     for (const session of sessions) {
       const rawSessionId = session.id;
       const sessionId = rootIdByRawId.get(rawSessionId) || rawSessionId;
+      const isSubagent = sessionId !== rawSessionId;
+      const sessionEventStart = events.length;
       const cwd = session.directory || session.path || void 0;
       const project = cwd ? path15.basename(cwd) : void 0;
       const sessionTs = msToIso(session.time_created);
@@ -7951,6 +7957,9 @@ async function parseOpenCodeSessionFile(dbPath, options) {
           operation: "session end"
         }));
       }
+      if (isSubagent) {
+        events.push(...withoutSubagentTurnEvents(events.splice(sessionEventStart)).map((event) => ({ ...event, turnId: void 0 })));
+      }
     }
   } finally {
     db.close();
@@ -8029,19 +8038,19 @@ function opencodeDataCandidates(home, env) {
   return [primary, path15.join(home, ".opencode", "opencode.db")];
 }
 async function opencodeBackfillFiles(sourceRoot, home = os6.homedir(), env) {
-  const { stat: stat14 } = await import("node:fs/promises");
+  const { stat: stat15 } = await import("node:fs/promises");
   if (sourceRoot) {
     if (!sourceRoot.endsWith(".db")) {
       return [];
     }
-    const info = await stat14(sourceRoot).catch(() => null);
+    const info = await stat15(sourceRoot).catch(() => null);
     if (!info) {
       return [];
     }
     return [{ path: sourceRoot, modifiedAt: info.mtime.toISOString() }];
   }
   for (const candidatePath of opencodeDataCandidates(home, env)) {
-    const info = await stat14(candidatePath).catch(() => null);
+    const info = await stat15(candidatePath).catch(() => null);
     if (info) {
       return [{ path: candidatePath, modifiedAt: info.mtime.toISOString() }];
     }
@@ -8141,8 +8150,10 @@ function createOpenCodeAdapter() {
 }
 
 // src/adapters/pi.ts
-import { readFile as readFile10 } from "node:fs/promises";
+import { readdir as readdir7, readFile as readFile10, stat as stat8 } from "node:fs/promises";
+import os7 from "node:os";
 import path16 from "node:path";
+init_fs();
 function parsePiSubagentLink(filePath, headerParentSession) {
   if (headerParentSession) {
     const parentFile = path16.isAbsolute(headerParentSession) ? headerParentSession : void 0;
@@ -8187,11 +8198,15 @@ async function resolveParentContext(link, options) {
   return void 0;
 }
 function foldEventsIntoParent(events, link) {
-  const childSessionId = events.find((event) => event.sessionId)?.sessionId;
-  return events.map((event) => {
+  const folded = withoutSubagentTurnEvents(events);
+  const childSessionId = folded.find((event) => event.sessionId)?.sessionId;
+  return folded.map((event) => {
     const rewritten = {
       ...event,
-      sessionId: link.parentSessionId
+      sessionId: link.parentSessionId,
+      // Subagent turns don't exist in the host session; drop the reference so
+      // buildSessionRollups doesn't synthesize phantom turn rollups.
+      turnId: void 0
     };
     if (childSessionId && childSessionId !== link.parentSessionId) {
       rewritten.refs = {
@@ -8447,6 +8462,100 @@ async function parsePiSessionFile(filePath, options) {
   }
   return state.events.filter((event) => matchesBackfillFilters(event, options));
 }
+async function parsePiFile(filePath, options) {
+  if (filePath.endsWith(".json")) {
+    return parsePiWorkflowRunFile(filePath, options);
+  }
+  return parsePiSessionFile(filePath, options);
+}
+async function parsePiWorkflowRunFile(filePath, options) {
+  let raw;
+  try {
+    raw = JSON.parse(await readFile10(filePath, "utf8"));
+  } catch {
+    return [];
+  }
+  if (!isPlainObject(raw)) {
+    return [];
+  }
+  const sessionId = stringField(raw, "sessionId");
+  const agents = Array.isArray(raw.agents) ? raw.agents.filter((agent) => isPlainObject(agent)) : [];
+  if (!sessionId || agents.length === 0) {
+    return [];
+  }
+  const runUpdatedAt = timestampFrom(raw.updatedAt);
+  const parentSessionFile = await findPiSessionFileById(sessionId, options);
+  const host = await resolveParentContext(
+    { parentSessionId: sessionId, parentSessionFile, explicit: true },
+    options
+  );
+  const cwd = host?.cwd;
+  const project = host?.project;
+  const state = new SessionParserState(filePath, options, (event) => basePiEvent({ ...event, cwd, project, model: event.model }));
+  const push = (event, ln) => {
+    state.push(
+      { ...event, workspaceId: event.workspaceId || createWorkspaceId({ projectName: project, repoRoot: cwd }) },
+      ln,
+      "workflow-run",
+      event.type
+    );
+  };
+  for (const [index, agent] of agents.entries()) {
+    const lineNumber = index + 1;
+    const usage = objectField(agent, "tokenUsage");
+    const input = numberField(usage, "input") || 0;
+    const output = numberField(usage, "output") || 0;
+    const cacheRead = numberField(usage, "cacheRead") || 0;
+    const cacheWrite = numberField(usage, "cacheWrite") || 0;
+    const breakdown = input + output + cacheRead + cacheWrite;
+    const total = numberField(usage, "total") || breakdown || numberField(agent, "tokens") || 0;
+    if (total <= 0) {
+      continue;
+    }
+    const model = stringField(agent, "model")?.replace(/:(off|minimal|low|medium|high|xhigh|max)$/, "");
+    const ts = timestampFrom(agent.endedAt) || timestampFrom(agent.startedAt) || runUpdatedAt || (/* @__PURE__ */ new Date()).toISOString();
+    push(basePiEvent({
+      ts,
+      type: "model.usage",
+      sessionId,
+      cwd,
+      project,
+      model,
+      confidence: breakdown > 0 ? "exact" : "derived",
+      metrics: {
+        tokensInput: breakdown > 0 ? input + cacheRead + cacheWrite || void 0 : void 0,
+        tokensOutput: breakdown > 0 ? output || void 0 : void 0,
+        tokensCachedInput: breakdown > 0 ? cacheRead + cacheWrite || void 0 : void 0,
+        tokensCacheReadInput: breakdown > 0 ? cacheRead || void 0 : void 0,
+        tokensCacheCreationInput: breakdown > 0 ? cacheWrite || void 0 : void 0,
+        tokensTotal: total,
+        costUsd: numberField(usage, "cost") || void 0
+      },
+      refs: stringRefs({
+        sourceId: stringField(agent, "callId") || stringField(agent, "label")
+      })
+    }), lineNumber);
+  }
+  return state.events.filter((event) => matchesBackfillFilters(event, options));
+}
+async function findPiSessionFileById(sessionId, options) {
+  const sessionsDir = piSessionDir(path16.resolve(stringOption(options.home) || os7.homedir()));
+  try {
+    const projectDirs = await readdir7(sessionsDir, { withFileTypes: true });
+    for (const dir of projectDirs) {
+      if (!dir.isDirectory()) {
+        continue;
+      }
+      const names = await readdir7(path16.join(sessionsDir, dir.name));
+      const hit = names.find((name) => name.endsWith(`_${sessionId}.jsonl`));
+      if (hit) {
+        return path16.join(sessionsDir, dir.name, hit);
+      }
+    }
+  } catch {
+  }
+  return void 0;
+}
 function basePiEvent(event) {
   return {
     schemaVersion: AGENT_TIME_SCHEMA_VERSION,
@@ -8693,6 +8802,20 @@ function piSessionDir(home, env) {
   }
   return path16.join(piAgentDir(home, env), "sessions");
 }
+function piWorkflowProjectsDir(home) {
+  return path16.join(home, ".pi", "workflows", "projects");
+}
+async function piBackfillFiles(sourceRoot, home = os7.homedir(), env) {
+  const lists = sourceRoot ? [await listFilesByExtensions(sourceRoot, [".jsonl", ".json"])] : await Promise.all([
+    listFilesByExtensions(piSessionDir(home, env), [".jsonl"]),
+    listFilesByExtensions(piWorkflowProjectsDir(home), [".json"])
+  ]);
+  const files = lists.flat().sort();
+  return Promise.all(files.map(async (filePath) => {
+    const info = await stat8(filePath);
+    return { path: filePath, modifiedAt: info.mtime.toISOString() };
+  }));
+}
 function createPiAdapter() {
   return {
     id: "pi",
@@ -8721,20 +8844,20 @@ function createPiAdapter() {
       }];
     },
     sourcePaths(home, env) {
-      return [piSessionDir(home, env)];
+      return [piSessionDir(home, env), piWorkflowProjectsDir(home)];
     },
-    parseSessionFile: parsePiSessionFile
+    parseSessionFile: parsePiFile
   };
 }
 
 // src/adapters/qoder-cn.ts
-import { readdir as readdir7, readFile as readFile11, stat as stat8 } from "node:fs/promises";
-import os8 from "node:os";
+import { readdir as readdir8, readFile as readFile11, stat as stat9 } from "node:fs/promises";
+import os9 from "node:os";
 import path18 from "node:path";
 
 // src/adapters/qoder-local-db.ts
 import { access } from "node:fs/promises";
-import os7 from "node:os";
+import os8 from "node:os";
 import path17 from "node:path";
 function takeQoderDbModelCall(calls, requestId, blockStart) {
   if (requestId) {
@@ -8752,7 +8875,7 @@ function takeQoderDbModelCall(calls, requestId, blockStart) {
   }
   return calls.ordered.shift();
 }
-function appDataRoot(appDirName, home = os7.homedir()) {
+function appDataRoot(appDirName, home = os8.homedir()) {
   if (process.platform === "darwin") {
     return path17.join(home, "Library", "Application Support", appDirName);
   }
@@ -9005,7 +9128,7 @@ async function loadQoderCnSegmentModelCalls(filePath, isSubagentSession, modelMa
   const segmentsPath = path18.join(configDir2, "logs", "sessions", projectName, sessionId, "segments");
   const modelCalls = [];
   try {
-    const files = await readdir7(segmentsPath);
+    const files = await readdir8(segmentsPath);
     for (const file of files) {
       if (!file.endsWith(".jsonl")) {
         continue;
@@ -9055,7 +9178,7 @@ async function parseQoderCnSessionFile(filePath, options) {
   let cwd;
   let project = projectContext.project;
   let model;
-  const home = path18.resolve(stringOption(options.home) || os8.homedir());
+  const home = path18.resolve(stringOption(options.home) || os9.homedir());
   const modelMap = await loadQoderCnModelNames(configDir2, home);
   const isSubagentSession = filePath.includes("subagents");
   const segmentModelCalls = await loadQoderCnSegmentModelCalls(filePath, isSubagentSession, modelMap);
@@ -9623,7 +9746,7 @@ async function gitRootFromCwds2(cwds) {
     while (!seen.has(current)) {
       seen.add(current);
       try {
-        await stat8(path18.join(current, ".git"));
+        await stat9(path18.join(current, ".git"));
         return current;
       } catch {
       }
@@ -9657,7 +9780,7 @@ function encodeQoderCnProjectPath(value) {
 }
 async function qoderCnProjectFromFilePath(filePath, options) {
   const projectDir = path18.basename(path18.dirname(filePath));
-  const home = options ? path18.resolve(stringOption(options.home) || os8.homedir()) : os8.homedir();
+  const home = options ? path18.resolve(stringOption(options.home) || os9.homedir()) : os9.homedir();
   const resolved = await resolveQoderCnProjectPath(projectDir, home);
   if (resolved) {
     return path18.basename(resolved);
@@ -9680,7 +9803,7 @@ async function resolveQoderCnProjectPath(projectDir, home) {
   while (projectDir.startsWith(`${currentEncoded}-`)) {
     let matchedChild;
     try {
-      const entries = await readdir7(current, { withFileTypes: true });
+      const entries = await readdir8(current, { withFileTypes: true });
       for (const entry of entries) {
         if (!entry.isDirectory()) {
           continue;
@@ -9773,8 +9896,8 @@ function createQoderCnAdapter() {
 
 // src/adapters/qoder.ts
 import { existsSync } from "node:fs";
-import { readdir as readdir8, readFile as readFile12, stat as stat9 } from "node:fs/promises";
-import os9 from "node:os";
+import { readdir as readdir9, readFile as readFile12, stat as stat10 } from "node:fs/promises";
+import os10 from "node:os";
 import path19 from "node:path";
 function parseQoderPaths(filePath) {
   const parts = filePath.split(path19.sep);
@@ -9883,7 +10006,7 @@ async function loadQoderSegmentModelCalls(filePath, isSubagentSession, modelMap)
   const segmentsPath = path19.join(configDir2, "logs", "sessions", projectName, sessionId, "segments");
   const modelCalls = [];
   try {
-    const files = await readdir8(segmentsPath);
+    const files = await readdir9(segmentsPath);
     for (const file of files) {
       if (!file.endsWith(".jsonl")) {
         continue;
@@ -9933,7 +10056,7 @@ async function parseQoderSessionFile(filePath, options) {
   let cwd;
   let project = projectContext.project;
   let model;
-  const home = path19.resolve(stringOption(options.home) || os9.homedir());
+  const home = path19.resolve(stringOption(options.home) || os10.homedir());
   const modelMap = await loadQoderModelNames(configDir2, home);
   const qwenworkRoot = isQwenworkConfigRoot(configDir2);
   const isSubagentSession = filePath.includes("subagents");
@@ -10467,7 +10590,7 @@ async function gitRootFromCwds3(cwds) {
     while (!seen.has(current)) {
       seen.add(current);
       try {
-        await stat9(path19.join(current, ".git"));
+        await stat10(path19.join(current, ".git"));
         return current;
       } catch {
       }
@@ -10519,7 +10642,7 @@ function qoderEncodedProjectSuffix(projectDir, home) {
 }
 async function qoderProjectFromFilePath(filePath, options) {
   const projectDir = path19.basename(path19.dirname(filePath));
-  const home = options ? path19.resolve(stringOption(options.home) || os9.homedir()) : os9.homedir();
+  const home = options ? path19.resolve(stringOption(options.home) || os10.homedir()) : os10.homedir();
   const resolved = await resolveQoderProjectPath(projectDir, home);
   if (resolved) {
     return path19.basename(resolved);
@@ -10543,7 +10666,7 @@ async function resolveQoderProjectPath(projectDir, home) {
   while (currentEncodedVariants.some((prefix) => projectDir.startsWith(`${prefix}-`))) {
     let matchedChild;
     try {
-      const entries = await readdir8(current, { withFileTypes: true });
+      const entries = await readdir9(current, { withFileTypes: true });
       for (const entry of entries) {
         if (!entry.isDirectory()) {
           continue;
@@ -10675,7 +10798,7 @@ function normalizeId(id) {
 }
 
 // src/adapters/workbuddy.ts
-import { readdir as readdir9, readFile as readFile13, stat as stat10 } from "node:fs/promises";
+import { readdir as readdir10, readFile as readFile13, stat as stat11 } from "node:fs/promises";
 import path20 from "node:path";
 function workbuddyProjectsDir(home, env) {
   const override = env?.WORKBUDDY_PROJECTS_DIR || env?.WORKBUDDY_HOME;
@@ -11118,17 +11241,17 @@ async function workbuddyBackfillFiles(sourceRoot, home, env) {
   const base = sourceRoot || workbuddyProjectsDir(home, env);
   const files = [];
   try {
-    const projects = await readdir9(base, { withFileTypes: true });
+    const projects = await readdir10(base, { withFileTypes: true });
     for (const project of projects) {
       if (!project.isDirectory()) {
         continue;
       }
       const projectDir = path20.join(base, project.name);
-      const entries = await readdir9(projectDir, { withFileTypes: true });
+      const entries = await readdir10(projectDir, { withFileTypes: true });
       for (const entry of entries) {
         if (entry.isFile() && entry.name.endsWith(".jsonl")) {
           const filePath = path20.join(projectDir, entry.name);
-          const info = await stat10(filePath);
+          const info = await stat11(filePath);
           files.push({ path: filePath, modifiedAt: info.mtime.toISOString() });
         }
       }
@@ -11189,7 +11312,7 @@ function createWorkbuddyAdapter() {
 
 // src/adapters/zcode.ts
 import { execFile } from "node:child_process";
-import { readFile as readFile14, stat as stat11 } from "node:fs/promises";
+import { readFile as readFile14, stat as stat12 } from "node:fs/promises";
 import path21 from "node:path";
 import { promisify as promisify2 } from "node:util";
 init_fs();
@@ -11208,7 +11331,7 @@ var providerNameCache = null;
 async function loadProviderNames(configPath2) {
   let fileMtime = 0;
   try {
-    const info = await stat11(configPath2);
+    const info = await stat12(configPath2);
     fileMtime = info.mtimeMs;
   } catch {
     return /* @__PURE__ */ new Map();
@@ -11408,6 +11531,7 @@ function sessionContext(row, sessions) {
   return {
     rawSessionId: sessionId,
     sessionId: `zcode:${rootSessionId}`,
+    isSubagent: rootSessionId !== sessionId,
     cwd,
     project,
     workspaceId: createWorkspaceId({ projectName: project, repoRoot: cwd }),
@@ -11424,7 +11548,7 @@ async function parseZCodeDb(filePath, options) {
   for (let i = 0; i < 12; i++) {
     const probe = path21.join(candidate, ".zcode", "v2", "config.json");
     try {
-      await stat11(probe);
+      await stat12(probe);
       configPath2 = probe;
       break;
     } catch {
@@ -11499,6 +11623,9 @@ async function parseZCodeDb(filePath, options) {
         return;
       }
       const ctx = sessionContext(row, sessions);
+      if (ctx.isSubagent) {
+        return;
+      }
       const turnId = `zcode:${rawTurnId}`;
       const started = makeEvent2({
         schemaVersion: AGENT_TIME_SCHEMA_VERSION,
@@ -11559,7 +11686,8 @@ async function parseZCodeDb(filePath, options) {
         project: ctx.project,
         cwd: ctx.cwd,
         sessionId: ctx.sessionId,
-        turnId: stringField(row, "turn_id") ? `zcode:${stringField(row, "turn_id")}` : void 0,
+        // Subagent turns are dropped; keep their events out of turn rollups.
+        turnId: !ctx.isSubagent && stringField(row, "turn_id") ? `zcode:${stringField(row, "turn_id")}` : void 0,
         agent: stringField(row, "agent") || "zcode",
         provider: nameMap.get(stringField(row, "provider_id") || "") || stringField(row, "provider_id"),
         model: modelId,
@@ -11585,7 +11713,7 @@ async function parseZCodeDb(filePath, options) {
         return;
       }
       const ctx = sessionContext(row, sessions);
-      const turnId = stringField(row, "turn_id") ? `zcode:${stringField(row, "turn_id")}` : void 0;
+      const turnId = !ctx.isSubagent && stringField(row, "turn_id") ? `zcode:${stringField(row, "turn_id")}` : void 0;
       const spanId = `${ctx.sessionId}:tool:${toolCallId}`;
       const started = makeEvent2({
         schemaVersion: AGENT_TIME_SCHEMA_VERSION,
@@ -11646,7 +11774,7 @@ async function zcodeBackfillFiles(sourceRoot, home, env) {
   const candidate = sourceRoot || zcodeDbPath(home, env);
   const filePath = candidate.endsWith(".sqlite") ? candidate : path21.join(candidate, "db", "db.sqlite");
   try {
-    const info = await stat11(filePath);
+    const info = await stat12(filePath);
     return [{ path: filePath, modifiedAt: info.mtime.toISOString() }];
   } catch {
     return [];
@@ -11678,7 +11806,7 @@ function createZCodeAdapter() {
 }
 
 // src/adapters/zed.ts
-import os10 from "node:os";
+import os11 from "node:os";
 import path22 from "node:path";
 function zedThreadsCandidates(home, env) {
   const candidates = [];
@@ -12030,20 +12158,20 @@ async function parseZedSessionFile(dbPath, options) {
   }
   return events.filter((event) => matchesBackfillFilters(event, options));
 }
-async function zedBackfillFiles(sourceRoot, home = os10.homedir(), env) {
-  const { stat: stat14 } = await import("node:fs/promises");
+async function zedBackfillFiles(sourceRoot, home = os11.homedir(), env) {
+  const { stat: stat15 } = await import("node:fs/promises");
   if (sourceRoot) {
     if (!sourceRoot.endsWith(".db")) {
       return [];
     }
-    const info = await stat14(sourceRoot).catch(() => null);
+    const info = await stat15(sourceRoot).catch(() => null);
     if (!info) {
       return [];
     }
     return [{ path: sourceRoot, modifiedAt: info.mtime.toISOString() }];
   }
   for (const candidatePath of zedThreadsCandidates(home, env)) {
-    const info = await stat14(candidatePath).catch(() => null);
+    const info = await stat15(candidatePath).catch(() => null);
     if (info) {
       return [{ path: candidatePath, modifiedAt: info.mtime.toISOString() }];
     }
@@ -12823,7 +12951,7 @@ function defaultMachineName() {
 init_fs();
 
 // src/lib/logger.ts
-import { appendFile, mkdir as mkdir4, rename, stat as stat12 } from "node:fs/promises";
+import { appendFile, mkdir as mkdir4, rename, stat as stat13 } from "node:fs/promises";
 import { homedir as homedir2 } from "node:os";
 import path24 from "node:path";
 var MAX_BYTES = 1 * 1024 * 1024;
@@ -12841,7 +12969,7 @@ function serializeError(error) {
 }
 async function rotateIfNeeded(file) {
   try {
-    const info = await stat12(file);
+    const info = await stat13(file);
     if (info.size > MAX_BYTES) {
       await rename(file, `${file}.1`).catch(() => {
       });
@@ -13080,7 +13208,6 @@ async function deleteMachine(remote, id) {
 var BACKFILL_STATE_SCHEMA_VERSION = 6;
 
 // src/cli.ts
-var SESSION_REWRITE_DAYS = 7;
 function createRegistry() {
   const registry = new AdapterRegistry();
   registry.register(createCodexAdapter());
@@ -13160,7 +13287,7 @@ function createCli(ctx, registry) {
   cli.command("hook", "Read agent hook JSON from stdin and report a throttled event").option("--agent <name>", "Agent name").option("--project <name>", "Project name").option("--min-interval <seconds>", "Minimum seconds between similar hook reports").action((options) => hookCommand(normalizeOptions(options), ctx));
   cli.command("sync-local-trigger", "Trigger one background local sync with throttle and locking").option("--min-interval <seconds>", "Minimum seconds between sync triggers").action((options) => syncLocalTriggerCommand(normalizeOptions(options), ctx, registry));
   cli.command("sync-local-runner", "Internal background local sync runner").option("--lock-file <path>", "Lock file for the active sync").option("--state-file <path>", "State file for trigger metadata").action((options) => syncLocalRunnerCommand(normalizeOptions(options), ctx, registry));
-  cli.command("backfill [action]", "Inspect local history import candidates").option("--source <source>", "Backfill source").option("--since <time>", "Only include history after this time").option("--until <time>", "Only include history before this time").option("--project <name>", "Project filter").option("--source-root <path>", "Override source history root").option("--include-source-path", "Include local source paths in output").option("--import-run <id>", "Import run id for verify/resume workflows").option("--limit <count>", "Maximum session files to parse").option("--batch-size <count>", "Max rollups per request (also bounded by --batch-bytes)").option("--batch-bytes <bytes>", "Soft byte cap for the JSON body of a single ingest POST").option("--replace", "Replace conflicting records during import (default)").option("--skip-conflicts", "Skip conflicting records instead of replacing them").option("--force", "Force re-import of sessions active within the last 7 days").option("--purge-all", "With --force: unlock and replace history older than 7 days (DANGEROUS)").action((action, options) => backfillCommand({ ...normalizeOptions(options), action }, ctx, registry));
+  cli.command("backfill [action]", "Inspect local history import candidates").option("--source <source>", "Backfill source").option("--since <time>", "Only include history after this time").option("--until <time>", "Only include history before this time").option("--project <name>", "Project filter").option("--source-root <path>", "Override source history root").option("--include-source-path", "Include local source paths in output").option("--import-run <id>", "Import run id for verify/resume workflows").option("--limit <count>", "Maximum session files to parse").option("--batch-size <count>", "Max rollups per request (also bounded by --batch-bytes)").option("--batch-bytes <bytes>", "Soft byte cap for the JSON body of a single ingest POST").option("--replace", "Replace conflicting records during import (default)").option("--skip-conflicts", "Skip conflicting records instead of replacing them").option("--force", "Re-import everything and rewrite matching server rollups (history lock unlocked; nothing is deleted)").action((action, options) => backfillCommand({ ...normalizeOptions(options), action }, ctx, registry));
   cli.command("token [action] [value]", "Set, show, or clear the persisted API token").option("--remote <url>", "Override API base URL when setting a token").action((action, value, options) => tokenCommand(action, value, normalizeOptions(options), ctx));
   cli.command("machine [action]", "List or rename machines (requires login)").option("--name <name>", "New display name (used by `machine rename`)").option("--id <id>", "Machine id (defaults to current machine)").action((action, options) => machineCommand(action, normalizeOptions(options), ctx));
   return cli;
@@ -13179,8 +13306,7 @@ function normalizeOptions(options) {
     importRun: "import-run",
     batchSize: "batch-size",
     batchBytes: "batch-bytes",
-    skipConflicts: "skip-conflicts",
-    purgeAll: "purge-all"
+    skipConflicts: "skip-conflicts"
   };
   for (const [camel, dashed] of Object.entries(aliases)) {
     if (normalized[camel] !== void 0 && normalized[dashed] === void 0) {
@@ -13488,10 +13614,6 @@ async function backfillCommand(options, ctx, registry) {
   if (action === "verify") {
     return backfillVerifyCommand(options, ctx);
   }
-  if (options["purge-all"] && !options.force) {
-    write(ctx.stderr, "--purge-all requires --force\n");
-    return 1;
-  }
   if (action === "import" && !options["dry-run"]) {
     const requested = normalizeBackfillSource(stringOption(options.source) || "all");
     const supported = /* @__PURE__ */ new Set(["all", ...BACKFILL_SOURCE_IDS]);
@@ -13660,11 +13782,14 @@ async function listBackfillSourceFiles(source, options, ctx) {
   if (source.id === "zed") {
     return zedBackfillFiles(stringOption(options["source-root"]), resolveHome3(options, ctx), ctx.env);
   }
+  if (source.id === "pi") {
+    return piBackfillFiles(stringOption(options["source-root"]), resolveHome3(options, ctx), ctx.env);
+  }
   const roots = stringOption(options["source-root"]) ? [requiredOption(options, "source-root")] : source.paths;
   const fileLists = await Promise.all(roots.map((r) => listJsonlFiles(r)));
   const files = fileLists.flat().sort().slice(0, numberOption(options.limit) || void 0);
   return Promise.all(files.map(async (filePath) => {
-    const info = await stat13(filePath);
+    const info = await stat14(filePath);
     return { path: filePath, modifiedAt: info.mtime.toISOString() };
   }));
 }
@@ -13751,7 +13876,7 @@ async function importBackfillPlan(plan, options, ctx, registry) {
   const remote = resolveRemoteFromOptions(options, ctx);
   const remoteKey = backfillRemoteKey(remote?.baseUrl ?? DEFAULT_API_URL);
   if (options.force) {
-    await purgeForcedSources(sourceDefs, home, remoteKey, options, ctx);
+    await resetForcedWatermarks(home, remoteKey, options, ctx);
   }
   const incrementalState = shouldUseIncrementalBackfill(options) ? await readBackfillIncrementalState(home, remoteKey, ctx) : void 0;
   if (!options.json) {
@@ -13767,7 +13892,7 @@ async function importBackfillPlan(plan, options, ctx, registry) {
     options,
     ctx
   );
-  const rollups = selectRollupsForUpload(buildSessionRollups(canonicalEvents), options);
+  const rollups = buildSessionRollups(canonicalEvents);
   const counts = await uploadSessionRollups(rollups, canonicalEvents.length, options, ctx);
   const result = {
     importRunId: plan.importRun.importRunId,
@@ -13785,7 +13910,7 @@ async function importBackfillPlan(plan, options, ctx, registry) {
   }
   return counts.failed > 0 || counts.conflicts > 0 && !options["skip-conflicts"] ? 1 : 0;
 }
-async function purgeForcedSources(sourceDefs, home, remoteKey, options, ctx) {
+async function resetForcedWatermarks(home, remoteKey, options, ctx) {
   try {
     const file = await readBackfillIncrementalStateFile(home);
     delete file.remotes[remoteKey];
@@ -13794,20 +13919,6 @@ async function purgeForcedSources(sourceDefs, home, remoteKey, options, ctx) {
     debug(ctx, `Failed to clear backfill watermark: ${error.message}
 `);
   }
-  const preserveTokens = !options["purge-all"];
-  for (const item of sourceDefs) {
-    try {
-      const deleted = await deleteSessionRollupsBySourceAPI(item.id, options, ctx, preserveTokens);
-      if (!options.json) {
-        const suffix = preserveTokens ? " (token-bearing and sessions older than 7 days kept)" : "";
-        write(ctx.stdout, `purged ${item.id}: ${deleted} old rollups${suffix}
-`);
-      }
-    } catch (error) {
-      debug(ctx, `Failed to purge ${item.id} rollups: ${error.message}
-`);
-    }
-  }
 }
 async function collectCanonicalEvents(sourceDefs, registry, incrementalState, options, ctx) {
   const selectedFilesBySource = /* @__PURE__ */ new Map();
@@ -13927,7 +14038,7 @@ async function sendSessionRollupBatch(rollups, options, ctx) {
   const result = await postRollupBatch(remote, rollups, {
     replace: options["skip-conflicts"] !== true,
     machine,
-    allowHistoricalRewrite: options["purge-all"] === true
+    allowHistoricalRewrite: options.force === true
   });
   if (options.force && result.conflicts === 0) {
     for (const rollup of rollups) {
@@ -13935,7 +14046,7 @@ async function sendSessionRollupBatch(rollups, options, ctx) {
         try {
           await deleteRollupsBySource(remote, rollup.source, machine, {
             rollupKey: createImportKey(["rollup", rollup.source, sessionId]),
-            allowHistoricalRewrite: options["purge-all"] === true
+            allowHistoricalRewrite: options.force === true
           });
         } catch (error) {
           debug(ctx, `Failed to delete superseded ${rollup.source} session ${sessionId}: ${error.message}
@@ -13946,28 +14057,6 @@ async function sendSessionRollupBatch(rollups, options, ctx) {
   }
   return result;
 }
-async function deleteSessionRollupsBySourceAPI(source, options, ctx, preserveTokens) {
-  const remote = resolveRemoteFromOptions(options, ctx);
-  if (!remote) {
-    throw new Error("No fetch available for HTTP delete");
-  }
-  const home = resolveHome3(options, ctx);
-  return deleteRollupsBySource(remote, source, {
-    id: ensureLocalMachineId(home),
-    hostname: defaultMachineName(),
-    platform: process.platform
-  }, {
-    preserveTokens,
-    allowHistoricalRewrite: options["purge-all"] === true
-  });
-}
-function selectRollupsForUpload(rollups, options, now = /* @__PURE__ */ new Date()) {
-  if (!options.force || options["purge-all"]) {
-    return rollups;
-  }
-  const cutoff = now.getTime() - SESSION_REWRITE_DAYS * 24 * 60 * 60 * 1e3;
-  return rollups.filter((rollup) => Date.parse(rollup.lastEventAt) >= cutoff);
-}
 function shouldUseIncrementalBackfill(options) {
   return !stringOption(options.since) && !stringOption(options.until) && !stringOption(options["source-root"]) && numberOption(options.limit) === void 0;
 }
@@ -14252,7 +14341,7 @@ function syncLocalRunnerEntryArgs(cliPath) {
   return [path25.resolve(path25.dirname(cliPath), "../bin/vibetime.mjs")];
 }
 function resolveHome3(options, ctx) {
-  return path25.resolve(stringOption(options.home) || ctx.env.HOME || os11.homedir());
+  return path25.resolve(stringOption(options.home) || ctx.env.HOME || os12.homedir());
 }
 function requestedTargets(options) {
   const value = options.target || options.targets;
@@ -14426,7 +14515,7 @@ Usage:
   vibetime uninstall [--target codex,claude,opencode,pi] [--all] [--dry-run] [--home <path>]
   vibetime upgrade [--check]
   vibetime hook --agent <name>
-  vibetime backfill discover|plan|import|verify --source codex|claude-code|opencode|pi|all --dry-run [--json] [--batch-size <count>] [--force [--purge-all]]
+  vibetime backfill discover|plan|import|verify --source codex|claude-code|opencode|pi|all --dry-run [--json] [--batch-size <count>] [--force]
   vibetime token set <token>
   vibetime token show
   vibetime token clear
@@ -14460,10 +14549,8 @@ Environment:
 `;
 }
 export {
-  SESSION_REWRITE_DAYS,
   run,
   selectBackfillFilesForImport,
-  selectRollupsForUpload,
   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.53",
+  "version": "0.1.55",
   "description": "vibetime CLI — install AI-agent hooks (Claude Code, Codex, OpenCode, Pi) and report activity to vibetime.",
   "license": "MIT",
   "publishConfig": {