@yhong91/vibetime 0.1.74 → 0.1.76

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 mkdir6, open, rm, stat as stat18, writeFile as writeFile5 } from "node:fs/promises";
-import os14 from "node:os";
+import { mkdir as mkdir6, open, rm, stat as stat17, writeFile as writeFile5 } from "node:fs/promises";
+import os13 from "node:os";
 import path27 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.74" : "0.1.1";
+var PACKAGE_VERSION = true ? "0.1.76" : "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;
@@ -2103,6 +2103,9 @@ function msToIso(ms) {
 }
 
 // src/lib/backfill.ts
+function rollupKeyForSourceSession(source, sessionId) {
+  return createImportKey(["rollup", source, sessionId]);
+}
 function withBackfillRefs(event, context) {
   const importKey = createImportKey([
     event.source,
@@ -4936,8 +4939,8 @@ async function codebuddyBackfillFiles(sourceRoot, home, env) {
           }
           const filePath = path9.join(traceDir, entry);
           try {
-            const stat19 = await import("node:fs/promises").then((fs) => fs.stat(filePath));
-            files.push({ path: filePath, modifiedAt: stat19.mtime.toISOString(), groupId: pidDir.name });
+            const stat18 = await import("node:fs/promises").then((fs) => fs.stat(filePath));
+            files.push({ path: filePath, modifiedAt: stat18.mtime.toISOString(), groupId: pidDir.name });
           } catch {
           }
         }
@@ -6500,10 +6503,10 @@ function cloudAgentSessionFromEvents(conversationId, events) {
   };
 }
 function hookUncachedInputTokens(turn) {
-  return Math.max(0, (turn.tokensInput || 0) - (turn.tokensCacheReadInput || 0));
+  return Math.max(0, (turn.tokensInput || 0) - (turn.tokensCacheReadInput || 0) - (turn.tokensCacheCreationInput || 0));
 }
 function cloudEventMatchesHookTurn(event, turn) {
-  return event.tokensInput === hookUncachedInputTokens(turn) && event.tokensOutput === (turn.tokensOutput || 0) && event.tokensCacheReadInput === (turn.tokensCacheReadInput || 0);
+  return event.tokensInput === hookUncachedInputTokens(turn) && event.tokensOutput === (turn.tokensOutput || 0) && event.tokensCacheReadInput === (turn.tokensCacheReadInput || 0) && event.tokensCacheCreationInput === (turn.tokensCacheCreationInput || 0);
 }
 function unmatchedCloudEvents(events, turns) {
   const used = /* @__PURE__ */ new Set();
@@ -6846,6 +6849,11 @@ async function loadCursorCloudUsageMap(options, filePath) {
     return cached;
   }
   const home = stringOption(options.home) || os6.homedir();
+  if (options.skipCursorCloud) {
+    return cloudUsageMapFromSessions(
+      parseCursorCloudUsageCache(await readJsonIfExists(cursorCloudUsageCachePath(home)))
+    );
+  }
   const intervalSeconds = cursorCloudFetchIntervalSeconds();
   if (intervalSeconds > 0 && !options.force) {
     const lastFetchedMs = await readLastCloudFetchAt(home);
@@ -6967,7 +6975,7 @@ async function writeCursorCloudUsageCache(cachePath, sessions) {
   const info = await stat8(cachePath);
   return info.mtime.toISOString();
 }
-function parseCursorCloudAgentSessions(filePath, options, sessions, localIds, identity) {
+function parseCursorCloudAgentSessions(filePath, options, sessions, localIds) {
   const events = [];
   const sourcePathHash = `sha256:${createStableHash(filePath)}`;
   const project = CURSOR_CLOUD_AGENT_PROJECT;
@@ -6984,8 +6992,8 @@ function parseCursorCloudAgentSessions(filePath, options, sessions, localIds, id
       lineNumber += 1;
       const event = {
         schemaVersion: AGENT_TIME_SCHEMA_VERSION,
-        source: identity.source,
-        agent: identity.agent,
+        source: SOURCE_ID,
+        agent: AGENT_NAME,
         workspaceId,
         project,
         model: lastModel,
@@ -7042,7 +7050,7 @@ function parseCursorCloudAgentSessions(filePath, options, sessions, localIds, id
   }
   return events;
 }
-async function parseCursorCloudAgentFile(filePath, options, identity) {
+async function parseCursorCloudAgentFile(filePath, options) {
   const home = stringOption(options.home) || os6.homedir();
   const env = {
     CURSOR_HOME: process.env.CURSOR_HOME,
@@ -7054,7 +7062,7 @@ async function parseCursorCloudAgentFile(filePath, options, identity) {
     return session ? [session] : [];
   }) : parseCursorCloudUsageCache(await readJsonIfExists(filePath));
   const localIds = await listLocalCursorSessionIds(home, env);
-  return parseCursorCloudAgentSessions(filePath, options, sessions, localIds, identity);
+  return parseCursorCloudAgentSessions(filePath, options, sessions, localIds);
 }
 function decodeKv(value) {
   if (typeof value === "string") {
@@ -7913,6 +7921,9 @@ async function parseCursorSessionFile(filePath, options) {
   if (base.endsWith(".jsonl")) {
     return parseCursorTranscriptFile(filePath, options);
   }
+  if (base === CURSOR_CLOUD_USAGE_FILENAME) {
+    return parseCursorCloudAgentFile(filePath, options);
+  }
   if (base === "store.db") {
     return [];
   }
@@ -8147,7 +8158,36 @@ function parseComposer(db, composer, filePath, sourcePathHash, options, persiste
   emitPersistedCursorUsage(push, persistedUsage, endedAt || startedAt, currentTurnId, model, sessionId, events.some((event) => event.type === "model.usage"));
   return events;
 }
-async function cursorBackfillFiles(sourceRoot, home = os6.homedir(), env) {
+async function cursorCloudUsageBackfillFiles(home, options) {
+  if (options?.skipCursorCloud || cursorCloudUsageDisabled()) {
+    return [];
+  }
+  const cachePath = cursorCloudUsageCachePath(home);
+  if (!options) {
+    const info = await stat8(cachePath).catch(() => null);
+    return info ? [{ path: cachePath, modifiedAt: info.mtime.toISOString() }] : [];
+  }
+  const map = await loadCursorCloudUsageMap(options);
+  if (map.size === 0) {
+    const info = await stat8(cachePath).catch(() => null);
+    return info ? [{ path: cachePath, modifiedAt: info.mtime.toISOString() }] : [];
+  }
+  const sessions = [];
+  for (const [conversationId, events] of map) {
+    const session = cloudAgentSessionFromEvents(conversationId, events);
+    if (session) {
+      sessions.push(session);
+    }
+  }
+  if (sessions.length === 0) {
+    return [];
+  }
+  return [{
+    path: cachePath,
+    modifiedAt: await writeCursorCloudUsageCache(cachePath, sessions)
+  }];
+}
+async function cursorBackfillFiles(sourceRoot, home = os6.homedir(), env, options) {
   if (sourceRoot) {
     const info = await stat8(sourceRoot).catch(() => null);
     if (!info) {
@@ -8177,6 +8217,9 @@ async function cursorBackfillFiles(sourceRoot, home = os6.homedir(), env) {
       files2.push(...await collectCursorTranscriptFiles(sourceRoot, home, skipIds2));
       return files2;
     }
+    if (path13.basename(sourceRoot) === CURSOR_CLOUD_USAGE_FILENAME) {
+      return [{ path: sourceRoot, modifiedAt: info.mtime.toISOString() }];
+    }
     if (path13.basename(sourceRoot) === "store.db") {
       return [];
     }
@@ -8214,6 +8257,7 @@ async function cursorBackfillFiles(sourceRoot, home = os6.homedir(), env) {
     break;
   }
   files.push(...await collectCursorTranscriptFiles(cursorProjectsDir(home, env), home, skipIds));
+  files.push(...await cursorCloudUsageBackfillFiles(home, options));
   return files;
 }
 function cursorHookConfig() {
@@ -8251,85 +8295,22 @@ function createCursorAdapter() {
       return [
         ...cursorStateDbCandidates(home, env),
         cursorProjectsDir(home, env),
-        cursorChatsDir(home, env)
+        cursorChatsDir(home, env),
+        cursorCloudUsageCachePath(home)
       ];
     },
     parseSessionFile: parseCursorSessionFile
   };
 }
 
-// src/adapters/grok-bot.ts
-import { stat as stat9 } from "node:fs/promises";
-import os7 from "node:os";
-var SOURCE_ID2 = "grok-bot";
-var AGENT_NAME2 = "grok-bot";
-var IDENTITY = { source: SOURCE_ID2, agent: AGENT_NAME2 };
-async function grokBotBackfillFiles(sourceRoot, home = os7.homedir(), _env, options) {
-  if (sourceRoot) {
-    const info = await stat9(sourceRoot).catch(() => null);
-    return info ? [{ path: sourceRoot, modifiedAt: info.mtime.toISOString() }] : [];
-  }
-  if (!options) {
-    return [];
-  }
-  const cachePath = cursorCloudUsageCachePath(home);
-  const map = await loadCursorCloudUsageMap(options);
-  if (map.size === 0) {
-    const info = await stat9(cachePath).catch(() => null);
-    return info ? [{ path: cachePath, modifiedAt: info.mtime.toISOString() }] : [];
-  }
-  const sessions = [];
-  for (const [conversationId, events] of map) {
-    const session = cloudAgentSessionFromEvents(conversationId, events);
-    if (session) {
-      sessions.push(session);
-    }
-  }
-  if (sessions.length === 0) {
-    return [];
-  }
-  return [{
-    path: cachePath,
-    modifiedAt: await writeCursorCloudUsageCache(cachePath, sessions)
-  }];
-}
-function createGrokBotAdapter() {
-  return {
-    id: SOURCE_ID2,
-    label: "Grok Bot",
-    agentName: AGENT_NAME2,
-    kind: "agent",
-    // No hooks to install — data arrives via the Cursor dashboard API.
-    // The cache file stands in as the detect/install marker.
-    detectPath(home) {
-      return cursorCloudUsageCachePath(home);
-    },
-    installedPath(home) {
-      return cursorCloudUsageCachePath(home);
-    },
-    async isInstalled() {
-      return false;
-    },
-    installEntries() {
-      return [];
-    },
-    sourcePaths(home) {
-      return [cursorCloudUsageCachePath(home)];
-    },
-    parseSessionFile(filePath, options) {
-      return parseCursorCloudAgentFile(filePath, options, IDENTITY);
-    }
-  };
-}
-
 // src/adapters/grok-build.ts
-import { readdir as readdir7, readFile as readFile9, stat as stat10 } from "node:fs/promises";
+import { readdir as readdir7, readFile as readFile9, stat as stat9 } from "node:fs/promises";
 import path14 from "node:path";
 init_fs();
 var GROK_COST_TICKS_PER_USD = 1e9;
-var SOURCE_ID3 = "grok-build";
-var AGENT_NAME3 = "grok-build";
-var HOOK_COMMAND2 = `vibetime hook --agent ${SOURCE_ID3}`;
+var SOURCE_ID2 = "grok-build";
+var AGENT_NAME2 = "grok-build";
+var HOOK_COMMAND2 = `vibetime hook --agent ${SOURCE_ID2}`;
 function grokHome(home, env) {
   const override = env?.GROK_HOME;
   if (override && override.trim()) {
@@ -8363,7 +8344,7 @@ async function grokBackfillFiles(sourceRoot, home, env) {
         continue;
       }
       try {
-        const info = await stat10(entryPath);
+        const info = await stat9(entryPath);
         files.push({ path: entryPath, modifiedAt: info.mtime.toISOString() });
       } catch {
       }
@@ -8415,8 +8396,8 @@ async function parseGrokSessionFile(filePath, options) {
   };
   const base = (partial) => ({
     schemaVersion: AGENT_TIME_SCHEMA_VERSION,
-    source: SOURCE_ID3,
-    agent: AGENT_NAME3,
+    source: SOURCE_ID2,
+    agent: AGENT_NAME2,
     workspaceId,
     project,
     cwd,
@@ -8976,7 +8957,7 @@ async function loadHunkFileActivities(hunkPath, cwd) {
   }
   return activities;
 }
-var grokHandler = (msg) => hookHandler(SOURCE_ID3, msg);
+var grokHandler = (msg) => hookHandler(SOURCE_ID2, msg);
 function hookConfig5() {
   const anyTool = [{ matcher: ".*", hooks: [grokHandler("Reporting tool activity")] }];
   return {
@@ -8998,9 +8979,9 @@ function hookConfig5() {
 }
 function createGrokBuildAdapter() {
   return {
-    id: SOURCE_ID3,
+    id: SOURCE_ID2,
     label: "Grok Build",
-    agentName: AGENT_NAME3,
+    agentName: AGENT_NAME2,
     kind: "agent",
     detectPath(home, env) {
       return grokHome(home, env);
@@ -9026,7 +9007,7 @@ function createGrokBuildAdapter() {
 }
 
 // src/adapters/hermes.ts
-import { readdir as readdir8, stat as stat11 } from "node:fs/promises";
+import { readdir as readdir8, stat as stat10 } from "node:fs/promises";
 import path15 from "node:path";
 init_fs();
 var SOURCE = "hermes";
@@ -9319,11 +9300,11 @@ function hermesToolAlias(tool) {
 }
 async function sqliteMtime(filePath) {
   try {
-    const info = await stat11(filePath);
+    const info = await stat10(filePath);
     let modifiedMs = info.mtimeMs;
     for (const suffix of ["-wal", "-shm"]) {
       try {
-        const sidecar = await stat11(`${filePath}${suffix}`);
+        const sidecar = await stat10(`${filePath}${suffix}`);
         modifiedMs = Math.max(modifiedMs, sidecar.mtimeMs);
       } catch {
       }
@@ -10616,7 +10597,7 @@ function createKimiCodeAdapter() {
 }
 
 // src/adapters/opencode.ts
-import os8 from "node:os";
+import os7 from "node:os";
 import path17 from "node:path";
 async function parseOpenCodeSessionFile(dbPath, options) {
   const { DatabaseSync } = await import("node:sqlite");
@@ -11071,20 +11052,20 @@ function opencodeDataCandidates(home, env) {
   const primary = xdgData && xdgData.trim() ? path17.join(path17.resolve(xdgData), "opencode", "opencode.db") : path17.join(home, ".local", "share", "opencode", "opencode.db");
   return [primary, path17.join(home, ".opencode", "opencode.db")];
 }
-async function opencodeBackfillFiles(sourceRoot, home = os8.homedir(), env) {
-  const { stat: stat19 } = await import("node:fs/promises");
+async function opencodeBackfillFiles(sourceRoot, home = os7.homedir(), env) {
+  const { stat: stat18 } = await import("node:fs/promises");
   if (sourceRoot) {
     if (!sourceRoot.endsWith(".db")) {
       return [];
     }
-    const info = await stat19(sourceRoot).catch(() => null);
+    const info = await stat18(sourceRoot).catch(() => null);
     if (!info) {
       return [];
     }
     return [{ path: sourceRoot, modifiedAt: info.mtime.toISOString() }];
   }
   for (const candidatePath of opencodeDataCandidates(home, env)) {
-    const info = await stat19(candidatePath).catch(() => null);
+    const info = await stat18(candidatePath).catch(() => null);
     if (info) {
       return [{ path: candidatePath, modifiedAt: info.mtime.toISOString() }];
     }
@@ -11184,8 +11165,8 @@ function createOpenCodeAdapter() {
 }
 
 // src/adapters/pi.ts
-import { readdir as readdir9, readFile as readFile11, stat as stat12 } from "node:fs/promises";
-import os9 from "node:os";
+import { readdir as readdir9, readFile as readFile11, stat as stat11 } from "node:fs/promises";
+import os8 from "node:os";
 import path18 from "node:path";
 init_fs();
 function piHostSessionIdFromBasename(basename) {
@@ -11596,7 +11577,7 @@ async function parsePiWorkflowRunFile(filePath, options) {
   return state.events.filter((event) => matchesBackfillFilters(event, options));
 }
 async function findPiSessionFileById(sessionId, options) {
-  const sessionsDir = piSessionDir(path18.resolve(stringOption(options.home) || os9.homedir()));
+  const sessionsDir = piSessionDir(path18.resolve(stringOption(options.home) || os8.homedir()));
   try {
     const projectDirs = await readdir9(sessionsDir, { withFileTypes: true });
     for (const dir of projectDirs) {
@@ -11873,14 +11854,14 @@ async function workflowRunGroupId(filePath) {
     return void 0;
   }
 }
-async function piBackfillFiles(sourceRoot, home = os9.homedir(), env) {
+async function piBackfillFiles(sourceRoot, home = os8.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 stat12(filePath);
+    const info = await stat11(filePath);
     let groupId = resolvePiBackfillGroupId(filePath);
     if (!groupId && filePath.endsWith(".json")) {
       groupId = await workflowRunGroupId(filePath);
@@ -11927,13 +11908,13 @@ function createPiAdapter() {
 }
 
 // src/adapters/qoder-cn.ts
-import { readdir as readdir10, readFile as readFile12, stat as stat13 } from "node:fs/promises";
-import os11 from "node:os";
+import { readdir as readdir10, readFile as readFile12, stat as stat12 } from "node:fs/promises";
+import os10 from "node:os";
 import path20 from "node:path";
 
 // src/adapters/qoder-local-db.ts
 import { access } from "node:fs/promises";
-import os10 from "node:os";
+import os9 from "node:os";
 import path19 from "node:path";
 function takeQoderDbModelCall(calls, requestId, blockStart) {
   if (requestId) {
@@ -11951,7 +11932,7 @@ function takeQoderDbModelCall(calls, requestId, blockStart) {
   }
   return calls.ordered.shift();
 }
-function appDataRoot(appDirName, home = os10.homedir()) {
+function appDataRoot(appDirName, home = os9.homedir()) {
   if (process.platform === "darwin") {
     return path19.join(home, "Library", "Application Support", appDirName);
   }
@@ -12058,7 +12039,7 @@ async function loadQoderDbModelCalls(appDirName, sessionId, modelMap) {
         const modelInfo = parseJsonLine(stringField(row, "model_info") || "") || {};
         const modelKey = stringField(modelInfo, "model_key");
         const call = {
-          model: modelKey ? modelMap[modelKey] || modelKey : preferredModel,
+          model: mappedQoderModel(modelKey, modelMap) || preferredModel,
           inputTokens: numberField(usage, "prompt_tokens") || 0,
           outputTokens: numberField(usage, "completion_tokens") || 0,
           cachedTokens: numberField(usage, "cached_tokens") || 0
@@ -12094,7 +12075,14 @@ function resolveRootSessionId(db, sessionId) {
   }
   return current === sessionId ? void 0 : current;
 }
+function mappedQoderModel(raw, modelMap) {
+  if (!raw) {
+    return void 0;
+  }
+  return modelMap[raw] || raw;
+}
 function resolveSessionPreferredModel(db, sessionId, modelMap) {
+  const chain = [];
   let current = sessionId;
   for (let depth = 0; depth < 5 && current; depth++) {
     let row;
@@ -12106,15 +12094,36 @@ function resolveSessionPreferredModel(db, sessionId, modelMap) {
       return void 0;
     }
     if (!row) {
-      return void 0;
+      break;
     }
+    chain.push(current);
     const info = parseJsonLine(stringField(row, "preferred_model_info") || "") || {};
-    const preferred = stringField(info, "preferred_model");
+    const preferred = mappedQoderModel(stringField(info, "preferred_model"), modelMap);
     if (preferred) {
-      return modelMap[preferred] || preferred;
+      return preferred;
     }
     current = stringField(row, "parent_session_id");
   }
+  return resolveModelKeyFromAncestorMessages(db, chain, modelMap);
+}
+function resolveModelKeyFromAncestorMessages(db, sessionIds, modelMap) {
+  for (const sid of sessionIds) {
+    let rows;
+    try {
+      rows = db.prepare(
+        `select model_info from chat_message where session_id = ? and role = 'assistant' and instr(model_info, 'model_key') > 0 order by gmt_create desc limit 20`
+      ).all(sid);
+    } catch {
+      continue;
+    }
+    for (const row of rows) {
+      const info = parseJsonLine(stringField(row, "model_info") || "") || {};
+      const mapped = mappedQoderModel(stringField(info, "model_key"), modelMap);
+      if (mapped) {
+        return mapped;
+      }
+    }
+  }
   return void 0;
 }
 
@@ -12227,8 +12236,8 @@ async function loadQoderCnSegmentModelCalls(filePath, isSubagentSession, modelMa
           }
           if (type === "model.response.completed") {
             const ts = stringField(raw, "ts") || "";
-            const rawModel = stringField(data, "model") || "unknown";
-            const modelName = modelMap[rawModel] || rawModel;
+            const rawModel = stringField(data, "model");
+            const modelName = rawModel ? modelMap[rawModel] || rawModel : void 0;
             modelCalls.push({
               ts,
               isSubagent: currentTurnIsSubagent,
@@ -12260,7 +12269,7 @@ async function parseQoderCnSessionFile(filePath, options) {
   let cwd;
   let project = projectContext.project;
   let model;
-  const home = path20.resolve(stringOption(options.home) || os11.homedir());
+  const home = path20.resolve(stringOption(options.home) || os10.homedir());
   const modelMap = await loadQoderCnModelNames(configDir2, home);
   const isSubagentSession = filePath.includes("subagents");
   const segmentModelCalls = await loadQoderCnSegmentModelCalls(filePath, isSubagentSession, modelMap);
@@ -12830,7 +12839,7 @@ async function gitRootFromCwds2(cwds) {
     while (!seen.has(current)) {
       seen.add(current);
       try {
-        await stat13(path20.join(current, ".git"));
+        await stat12(path20.join(current, ".git"));
         return current;
       } catch {
       }
@@ -12864,7 +12873,7 @@ function encodeQoderCnProjectPath(value) {
 }
 async function qoderCnProjectFromFilePath(filePath, options) {
   const projectDir = path20.basename(path20.dirname(filePath));
-  const home = options ? path20.resolve(stringOption(options.home) || os11.homedir()) : os11.homedir();
+  const home = options ? path20.resolve(stringOption(options.home) || os10.homedir()) : os10.homedir();
   const resolved = await resolveQoderCnProjectPath(projectDir, home);
   if (resolved) {
     return path20.basename(resolved);
@@ -12980,8 +12989,8 @@ function createQoderCnAdapter() {
 
 // src/adapters/qoder.ts
 import { existsSync } from "node:fs";
-import { readdir as readdir11, readFile as readFile13, stat as stat14 } from "node:fs/promises";
-import os12 from "node:os";
+import { readdir as readdir11, readFile as readFile13, stat as stat13 } from "node:fs/promises";
+import os11 from "node:os";
 import path21 from "node:path";
 function parseQoderPaths(filePath) {
   const parts = filePath.split(path21.sep);
@@ -13113,8 +13122,8 @@ async function loadQoderSegmentModelCalls(filePath, isSubagentSession, modelMap)
           }
           if (type === "model.response.completed") {
             const ts = stringField(raw, "ts") || "";
-            const rawModel = stringField(data, "model") || "unknown";
-            const modelName = modelMap[rawModel] || rawModel;
+            const rawModel = stringField(data, "model");
+            const modelName = rawModel ? modelMap[rawModel] || rawModel : void 0;
             modelCalls.push({
               ts,
               isSubagent: currentTurnIsSubagent,
@@ -13146,7 +13155,7 @@ async function parseQoderSessionFile(filePath, options) {
   let cwd;
   let project = projectContext.project;
   let model;
-  const home = path21.resolve(stringOption(options.home) || os12.homedir());
+  const home = path21.resolve(stringOption(options.home) || os11.homedir());
   const modelMap = await loadQoderModelNames(configDir2, home);
   const qwenworkRoot = isQwenworkConfigRoot(configDir2);
   const isSubagentSession = filePath.includes("subagents");
@@ -13682,7 +13691,7 @@ async function gitRootFromCwds3(cwds) {
     while (!seen.has(current)) {
       seen.add(current);
       try {
-        await stat14(path21.join(current, ".git"));
+        await stat13(path21.join(current, ".git"));
         return current;
       } catch {
       }
@@ -13734,7 +13743,7 @@ function qoderEncodedProjectSuffix(projectDir, home) {
 }
 async function qoderProjectFromFilePath(filePath, options) {
   const projectDir = path21.basename(path21.dirname(filePath));
-  const home = options ? path21.resolve(stringOption(options.home) || os12.homedir()) : os12.homedir();
+  const home = options ? path21.resolve(stringOption(options.home) || os11.homedir()) : os11.homedir();
   const resolved = await resolveQoderProjectPath(projectDir, home);
   if (resolved) {
     return path21.basename(resolved);
@@ -13886,11 +13895,14 @@ function normalizeId(id) {
   if (id === "claude") {
     return "claude-code";
   }
+  if (id === "grok-bot") {
+    return "cursor";
+  }
   return id;
 }
 
 // src/adapters/workbuddy.ts
-import { readdir as readdir12, readFile as readFile14, stat as stat15 } from "node:fs/promises";
+import { readdir as readdir12, readFile as readFile14, stat as stat14 } from "node:fs/promises";
 import path22 from "node:path";
 function workbuddyProjectsDir(home, env) {
   const override = env?.WORKBUDDY_PROJECTS_DIR || env?.WORKBUDDY_HOME;
@@ -14343,7 +14355,7 @@ async function workbuddyBackfillFiles(sourceRoot, home, env) {
       for (const entry of entries) {
         if (entry.isFile() && entry.name.endsWith(".jsonl")) {
           const filePath = path22.join(projectDir, entry.name);
-          const info = await stat15(filePath);
+          const info = await stat14(filePath);
           files.push({ path: filePath, modifiedAt: info.mtime.toISOString() });
         }
       }
@@ -14404,7 +14416,7 @@ function createWorkbuddyAdapter() {
 
 // src/adapters/zcode.ts
 import { execFile } from "node:child_process";
-import { readFile as readFile15, stat as stat16 } from "node:fs/promises";
+import { readFile as readFile15, stat as stat15 } from "node:fs/promises";
 import path23 from "node:path";
 import { promisify as promisify2 } from "node:util";
 var execFileAsync = promisify2(execFile);
@@ -14443,7 +14455,7 @@ var providerNameCache = null;
 async function loadProviderNames(configPath2) {
   let fileMtime = 0;
   try {
-    const info = await stat16(configPath2);
+    const info = await stat15(configPath2);
     fileMtime = info.mtimeMs;
   } catch {
     return /* @__PURE__ */ new Map();
@@ -14671,7 +14683,7 @@ async function parseZCodeDb(filePath, options) {
   for (let i = 0; i < 12; i++) {
     const probe = path23.join(candidate, ".zcode", "v2", "config.json");
     try {
-      await stat16(probe);
+      await stat15(probe);
       configPath2 = probe;
       break;
     } catch {
@@ -14905,11 +14917,11 @@ async function zcodeBackfillFiles(sourceRoot, home, env) {
   const candidate = sourceRoot || zcodeDbPath(home, env);
   const filePath = candidate.endsWith(".sqlite") ? candidate : path23.join(candidate, "db", "db.sqlite");
   try {
-    const info = await stat16(filePath);
+    const info = await stat15(filePath);
     let modifiedMs = info.mtimeMs;
     for (const suffix of ["-wal", "-shm"]) {
       try {
-        const sidecar = await stat16(`${filePath}${suffix}`);
+        const sidecar = await stat15(`${filePath}${suffix}`);
         modifiedMs = Math.max(modifiedMs, sidecar.mtimeMs);
       } catch {
       }
@@ -14952,7 +14964,7 @@ function createZCodeAdapter() {
 }
 
 // src/adapters/zed.ts
-import os13 from "node:os";
+import os12 from "node:os";
 import path24 from "node:path";
 function zedThreadsCandidates(home, env) {
   const candidates = [];
@@ -15304,20 +15316,20 @@ async function parseZedSessionFile(dbPath, options) {
   }
   return events.filter((event) => matchesBackfillFilters(event, options));
 }
-async function zedBackfillFiles(sourceRoot, home = os13.homedir(), env) {
-  const { stat: stat19 } = await import("node:fs/promises");
+async function zedBackfillFiles(sourceRoot, home = os12.homedir(), env) {
+  const { stat: stat18 } = await import("node:fs/promises");
   if (sourceRoot) {
     if (!sourceRoot.endsWith(".db")) {
       return [];
     }
-    const info = await stat19(sourceRoot).catch(() => null);
+    const info = await stat18(sourceRoot).catch(() => null);
     if (!info) {
       return [];
     }
     return [{ path: sourceRoot, modifiedAt: info.mtime.toISOString() }];
   }
   for (const candidatePath of zedThreadsCandidates(home, env)) {
-    const info = await stat19(candidatePath).catch(() => null);
+    const info = await stat18(candidatePath).catch(() => null);
     if (info) {
       return [{ path: candidatePath, modifiedAt: info.mtime.toISOString() }];
     }
@@ -16208,7 +16220,7 @@ function defaultMachineName() {
 init_fs();
 
 // src/lib/logger.ts
-import { appendFile, mkdir as mkdir5, rename as rename2, stat as stat17 } from "node:fs/promises";
+import { appendFile, mkdir as mkdir5, rename as rename2, stat as stat16 } from "node:fs/promises";
 import { homedir as homedir2 } from "node:os";
 import path26 from "node:path";
 var MAX_BYTES = 1 * 1024 * 1024;
@@ -16226,7 +16238,7 @@ function serializeError(error) {
 }
 async function rotateIfNeeded(file) {
   try {
-    const info = await stat17(file);
+    const info = await stat16(file);
     if (info.size > MAX_BYTES) {
       await rename2(file, `${file}.1`).catch(() => {
       });
@@ -16462,7 +16474,7 @@ async function deleteMachine(remote, id) {
 }
 
 // src/lib/types.ts
-var BACKFILL_STATE_SCHEMA_VERSION = 10;
+var BACKFILL_STATE_SCHEMA_VERSION = 11;
 
 // src/cli.ts
 function createRegistry() {
@@ -16483,7 +16495,6 @@ function createRegistry() {
   registry.register(createZedAdapter());
   registry.register(createKimiCodeAdapter());
   registry.register(createCursorAdapter());
-  registry.register(createGrokBotAdapter());
   registry.register(createHermesAdapter());
   return registry;
 }
@@ -17044,10 +17055,14 @@ async function listBackfillSourceFiles(source, options, ctx) {
     return zedBackfillFiles(stringOption(options["source-root"]), resolveHome3(options, ctx), ctx.env);
   }
   if (source.id === "cursor") {
-    return cursorBackfillFiles(stringOption(options["source-root"]), resolveHome3(options, ctx), ctx.env);
-  }
-  if (source.id === "grok-bot") {
-    return grokBotBackfillFiles(stringOption(options["source-root"]), resolveHome3(options, ctx), ctx.env, options);
+    const requested = normalizeBackfillSource(stringOption(options.source) || "all");
+    const skipCursorCloud = requested === "all" && disabledBackfillSourceSet(readConfig(resolveHome3(options, ctx))).has("grok-bot");
+    return cursorBackfillFiles(
+      stringOption(options["source-root"]),
+      resolveHome3(options, ctx),
+      ctx.env,
+      { ...options, skipCursorCloud }
+    );
   }
   if (source.id === "hermes") {
     return hermesBackfillFiles(stringOption(options["source-root"]), resolveHome3(options, ctx), ctx.env);
@@ -17059,7 +17074,7 @@ async function listBackfillSourceFiles(source, options, ctx) {
   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 stat18(filePath);
+    const info = await stat17(filePath);
     return { path: filePath, modifiedAt: info.mtime.toISOString() };
   }));
 }
@@ -17310,20 +17325,36 @@ async function sendSessionRollupBatch(rollups, options, ctx) {
     machine,
     allowHistoricalRewrite: options.force === 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.force === true
-          });
-        } catch (error) {
-          debug(ctx, `Failed to delete superseded ${rollup.source} session ${sessionId}: ${error.message}
+  if (result.conflicts === 0) {
+    if (options.force) {
+      for (const rollup of rollups) {
+        for (const sessionId of rollup.supersededSessionIds ?? []) {
+          try {
+            await deleteRollupsBySource(remote, rollup.source, machine, {
+              rollupKey: rollupKeyForSourceSession(rollup.source, sessionId),
+              allowHistoricalRewrite: true
+            });
+          } catch (error) {
+            debug(ctx, `Failed to delete superseded ${rollup.source} session ${sessionId}: ${error.message}
 `);
+          }
         }
       }
     }
+    for (const rollup of rollups) {
+      if (rollup.source !== "cursor") {
+        continue;
+      }
+      try {
+        await deleteRollupsBySource(remote, "grok-bot", machine, {
+          rollupKey: rollupKeyForSourceSession("grok-bot", rollup.sessionId),
+          allowHistoricalRewrite: true
+        });
+      } catch (error) {
+        debug(ctx, `Failed to delete grok-bot twin of cursor session ${rollup.sessionId}: ${error.message}
+`);
+      }
+    }
   }
   return result;
 }
@@ -17611,7 +17642,7 @@ function syncLocalRunnerEntryArgs(cliPath) {
   return [path27.resolve(path27.dirname(cliPath), "../bin/vibetime.mjs")];
 }
 function resolveHome3(options, ctx) {
-  return path27.resolve(stringOption(options.home) || ctx.env.HOME || os14.homedir());
+  return path27.resolve(stringOption(options.home) || ctx.env.HOME || os13.homedir());
 }
 function requestedTargets(options) {
   const value = options.target || options.targets;
@@ -17621,7 +17652,13 @@ function requestedTargets(options) {
   return valuesOption(value).flatMap((item) => item.split(",")).map((t) => t.trim()).filter(Boolean);
 }
 function normalizeBackfillSource(source) {
-  return source === "claude" ? "claude-code" : source;
+  if (source === "claude") {
+    return "claude-code";
+  }
+  if (source === "grok-bot") {
+    return "cursor";
+  }
+  return source;
 }
 function requiredOption(options, name) {
   const value = stringOption(options[name]);

package/package.json

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