@yhong91/vibetime 0.1.41 → 0.1.43

package/bin/vibetime.mjs

@@ -1928,7 +1928,7 @@ function countTextLines(text) {
 }
 
 // src/lib/constants.ts
-var PACKAGE_VERSION = true ? "0.1.41" : "0.1.1";
+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;
@@ -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";
@@ -10751,6 +10763,8 @@ function buildSessionRollup(rollupKey, events) {
   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 +10780,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 +10999,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 +11032,15 @@ 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))
   };
   return {
     ...baseRollup,
@@ -11397,7 +11435,11 @@ async function postRollupBatch(remote, rollups, options = {}) {
   const response = await remote.fetchImpl(joinUrl(remote.baseUrl, "/v3/agent/ingest"), {
     method: "POST",
     headers: buildHeaders(remote.token, options.machine),
-    body: JSON.stringify({ rollups, replace: options.replace !== false })
+    body: JSON.stringify({
+      rollups,
+      replace: options.replace !== false,
+      allowHistoricalRewrite: options.allowHistoricalRewrite === true
+    })
   });
   if (!response.ok) {
     const body = await response.text();
@@ -11412,7 +11454,7 @@ async function postRollupBatch(remote, rollups, options = {}) {
   };
 }
 async function deleteRollupsBySource(remote, source, machine, options = {}) {
-  const query = `source=${encodeURIComponent(source)}${options.preserveTokens ? "&preserveTokens=1" : ""}`;
+  const query = `source=${encodeURIComponent(source)}${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) }
@@ -11460,6 +11502,7 @@ 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());
@@ -11537,7 +11580,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 full re-import: clear watermark and re-process all files (keeps server rollups that already have tokens)").option("--purge-all", "With --force: also delete token-bearing server rollups before re-importing (DANGEROUS \u2014 tokens whose local sources were rotated away are lost forever)").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", "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("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;
@@ -11827,6 +11870,10 @@ 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]);
@@ -12102,7 +12149,7 @@ async function importBackfillPlan(plan, options, ctx, registry) {
     options,
     ctx
   );
-  const rollups = buildSessionRollups(canonicalEvents);
+  const rollups = selectRollupsForUpload(buildSessionRollups(canonicalEvents), options);
   const counts = await uploadSessionRollups(rollups, canonicalEvents.length, options, ctx);
   const result = {
     importRunId: plan.importRun.importRunId,
@@ -12134,7 +12181,7 @@ async function purgeForcedSources(sourceDefs, home, remoteKey, options, ctx) {
     try {
       const deleted = await deleteSessionRollupsBySourceAPI(item.id, options, ctx, preserveTokens);
       if (!options.json) {
-        const suffix = preserveTokens ? " (token-bearing rollups kept)" : "";
+        const suffix = preserveTokens ? " (token-bearing and sessions older than 7 days kept)" : "";
         write(ctx.stdout, `purged ${item.id}: ${deleted} old rollups${suffix}
 `);
       }
@@ -12261,7 +12308,8 @@ async function sendSessionRollupBatch(rollups, options, ctx) {
   };
   const result = await postRollupBatch(remote, rollups, {
     replace: options["skip-conflicts"] !== true,
-    machine
+    machine,
+    allowHistoricalRewrite: options["purge-all"] === true
   });
   return result;
 }
@@ -12275,7 +12323,17 @@ async function deleteSessionRollupsBySourceAPI(source, options, ctx, preserveTok
     id: ensureLocalMachineId(home),
     hostname: defaultMachineName(),
     platform: process.platform
-  }, { preserveTokens });
+  }, {
+    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;
@@ -12767,8 +12825,10 @@ 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.41",
+  "version": "0.1.43",
   "description": "vibetime CLI — install AI-agent hooks (Claude Code, Codex, OpenCode, Pi) and report activity to vibetime.",
   "license": "MIT",
   "publishConfig": {