@yhong91/vibetime 0.1.54 → 0.1.56

package/bin/vibetime.mjs

@@ -2047,7 +2047,7 @@ function claudeStyleFileMetrics(tool, input) {
 }
 
 // src/lib/constants.ts
-var PACKAGE_VERSION = true ? "0.1.54" : "0.1.1";
+var PACKAGE_VERSION = true ? "0.1.56" : "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;
@@ -8154,6 +8154,29 @@ import { readdir as readdir7, readFile as readFile10, stat as stat8 } from "node
 import os7 from "node:os";
 import path16 from "node:path";
 init_fs();
+function piHostSessionIdFromBasename(basename) {
+  const withoutExt = basename.endsWith(".jsonl") ? basename.slice(0, -".jsonl".length) : basename;
+  if (!withoutExt || withoutExt === "session") {
+    return void 0;
+  }
+  const underscore = withoutExt.indexOf("_");
+  if (underscore <= 0 || underscore === withoutExt.length - 1) {
+    return withoutExt;
+  }
+  return withoutExt.slice(underscore + 1);
+}
+function resolvePiBackfillGroupId(filePath) {
+  const normalized = filePath.replaceAll("\\", "/");
+  const base = path16.basename(filePath);
+  const nest = normalized.match(/([^/]+)\/[^/]+\/run-\d+\/session\.jsonl$/);
+  if (nest) {
+    return piHostSessionIdFromBasename(nest[1]);
+  }
+  if (base.endsWith(".jsonl") && base !== "session.jsonl") {
+    return piHostSessionIdFromBasename(base);
+  }
+  return void 0;
+}
 function parsePiSubagentLink(filePath, headerParentSession) {
   if (headerParentSession) {
     const parentFile = path16.isAbsolute(headerParentSession) ? headerParentSession : void 0;
@@ -8805,6 +8828,17 @@ function piSessionDir(home, env) {
 function piWorkflowProjectsDir(home) {
   return path16.join(home, ".pi", "workflows", "projects");
 }
+async function workflowRunGroupId(filePath) {
+  try {
+    const raw = JSON.parse(await readFile10(filePath, "utf8"));
+    if (!isPlainObject(raw)) {
+      return void 0;
+    }
+    return stringField(raw, "sessionId");
+  } catch {
+    return void 0;
+  }
+}
 async function piBackfillFiles(sourceRoot, home = os7.homedir(), env) {
   const lists = sourceRoot ? [await listFilesByExtensions(sourceRoot, [".jsonl", ".json"])] : await Promise.all([
     listFilesByExtensions(piSessionDir(home, env), [".jsonl"]),
@@ -8813,7 +8847,15 @@ async function piBackfillFiles(sourceRoot, home = os7.homedir(), env) {
   const files = lists.flat().sort();
   return Promise.all(files.map(async (filePath) => {
     const info = await stat8(filePath);
-    return { path: filePath, modifiedAt: info.mtime.toISOString() };
+    let groupId = resolvePiBackfillGroupId(filePath);
+    if (!groupId && filePath.endsWith(".json")) {
+      groupId = await workflowRunGroupId(filePath);
+    }
+    return {
+      path: filePath,
+      modifiedAt: info.mtime.toISOString(),
+      ...groupId ? { groupId } : {}
+    };
   }));
 }
 function createPiAdapter() {
@@ -9532,10 +9574,11 @@ async function parseQoderCnSessionFile(filePath, options) {
     const { sessionId: parentSessionId, mainTranscriptPath } = parseQoderCnPaths(filePath);
     if (parentSessionId && mainTranscriptPath) {
       const parentSourcePathHash = `sha256:${createStableHash(mainTranscriptPath)}`;
-      return validEvents.map((event) => {
+      return withoutSubagentTurnEvents(validEvents).map((event) => {
         const mapped = {
           ...event,
           sessionId: parentSessionId,
+          turnId: void 0,
           refs: {
             ...event.refs,
             sourcePathHash: parentSourcePathHash,
@@ -9550,9 +9593,10 @@ async function parseQoderCnSessionFile(filePath, options) {
   if (dbModelCalls.rootSessionId) {
     const parentPath = path18.join(path18.dirname(filePath), `${dbModelCalls.rootSessionId}.jsonl`);
     const parentSourcePathHash = `sha256:${createStableHash(parentPath)}`;
-    return validEvents.map((event) => rebuildEventIdentity3({
+    return withoutSubagentTurnEvents(validEvents).map((event) => rebuildEventIdentity3({
       ...event,
       sessionId: dbModelCalls.rootSessionId,
+      turnId: void 0,
       refs: {
         ...event.refs,
         sourcePathHash: parentSourcePathHash,
@@ -10386,10 +10430,11 @@ async function parseQoderSessionFile(filePath, options) {
     const { sessionId: parentSessionId, mainTranscriptPath } = parseQoderPaths(filePath);
     if (parentSessionId && mainTranscriptPath) {
       const parentSourcePathHash = `sha256:${createStableHash(mainTranscriptPath)}`;
-      return validEvents.map((event) => {
+      return withoutSubagentTurnEvents(validEvents).map((event) => {
         const mapped = {
           ...event,
           sessionId: parentSessionId,
+          turnId: void 0,
           refs: {
             ...event.refs,
             sourcePathHash: parentSourcePathHash,
@@ -10404,9 +10449,10 @@ async function parseQoderSessionFile(filePath, options) {
   if (dbModelCalls.rootSessionId) {
     const parentPath = path19.join(path19.dirname(filePath), `${dbModelCalls.rootSessionId}.jsonl`);
     const parentSourcePathHash = `sha256:${createStableHash(parentPath)}`;
-    return validEvents.map((event) => rebuildEventIdentity4({
+    return withoutSubagentTurnEvents(validEvents).map((event) => rebuildEventIdentity4({
       ...event,
       sessionId: dbModelCalls.rootSessionId,
+      turnId: void 0,
       refs: {
         ...event.refs,
         sourcePathHash: parentSourcePathHash,
@@ -13205,10 +13251,9 @@ async function deleteMachine(remote, id) {
 }
 
 // src/lib/types.ts
-var BACKFILL_STATE_SCHEMA_VERSION = 6;
+var BACKFILL_STATE_SCHEMA_VERSION = 7;
 
 // src/cli.ts
-var SESSION_REWRITE_DAYS = 7;
 function createRegistry() {
   const registry = new AdapterRegistry();
   registry.register(createCodexAdapter());
@@ -13288,7 +13333,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;
@@ -13307,8 +13352,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) {
@@ -13616,10 +13660,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]);
@@ -13882,7 +13922,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) {
@@ -13898,7 +13938,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,
@@ -13916,7 +13956,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];
@@ -13925,20 +13965,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();
@@ -14058,7 +14084,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) {
@@ -14066,7 +14092,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}
@@ -14077,28 +14103,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;
 }
@@ -14557,7 +14561,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
@@ -14591,10 +14595,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.54",
+  "version": "0.1.56",
   "description": "vibetime CLI — install AI-agent hooks (Claude Code, Codex, OpenCode, Pi) and report activity to vibetime.",
   "license": "MIT",
   "publishConfig": {