@vibe-cafe/vibe-usage 0.10.19 → 0.10.20

package/src/index.js

@@ -2,6 +2,12 @@ import { loadConfig, saveConfig, getConfigPath } from './config.js';
 import { detectInstalledTools, TOOLS } from './tools.js';
 import { existsSync } from 'node:fs';
 import { validateExtraCodexHome } from './codex-roots.js';
+import {
+  EXTRA_ROOT_SOURCES,
+  extraRootList,
+  normalizeExtraRoot,
+  validateExtraRoot,
+} from './extra-roots.js';
 import { failure, smallHeader } from './output.js';
 
 function printSmallHeader() {
@@ -24,10 +30,18 @@ async function showStatus() {
     if (config.codexExtraHome) {
       console.log(`  Extra Codex Home: ${config.codexExtraHome}`);
     }
+    for (const source of EXTRA_ROOT_SOURCES) {
+      for (const root of extraRootList(config.extraRoots?.[source])) {
+        console.log(`  Extra ${source} Root: ${root}`);
+      }
+    }
   }
 
   console.log('\n  Detected tools:');
-  const toolOptions = { codexExtraHome: config?.codexExtraHome };
+  const toolOptions = {
+    codexExtraHome: config?.codexExtraHome,
+    extraRoots: config?.extraRoots,
+  };
   const detected = detectInstalledTools(toolOptions);
   if (detected.length === 0) {
     console.log('    (none)\n');
@@ -103,9 +117,59 @@ function handleConfig(args) {
       }
       break;
     }
+    case 'add-root': {
+      const source = args[1];
+      const value = args[2];
+      if (!source || value === undefined) {
+        console.error('Usage: vibe-usage config add-root <codex|grok|antigravity> <path>');
+        process.exit(1);
+      }
+      const validation = validateExtraRoot(source, value);
+      if (!validation.ok) {
+        console.error(failure(`额外 ${source} 根目录无效（${validation.reason}）: ${validation.path}`));
+        process.exit(1);
+      }
+      const config = loadConfig() || {};
+      if (!config.extraRoots || typeof config.extraRoots !== 'object' || Array.isArray(config.extraRoots)) {
+        config.extraRoots = {};
+      }
+      const roots = extraRootList(config.extraRoots[source]);
+      config.extraRoots[source] = [...new Set([...roots, validation.path])];
+      saveConfig(config);
+      break;
+    }
+    case 'remove-root': {
+      const source = args[1];
+      const value = args[2];
+      if (!EXTRA_ROOT_SOURCES.includes(source) || value === undefined) {
+        console.error('Usage: vibe-usage config remove-root <codex|grok|antigravity> <path>');
+        process.exit(1);
+      }
+      const config = loadConfig() || {};
+      const path = normalizeExtraRoot(value);
+      const roots = extraRootList(config.extraRoots?.[source])
+        .filter(root => normalizeExtraRoot(root) !== path);
+      if (config.extraRoots && typeof config.extraRoots === 'object' && !Array.isArray(config.extraRoots)) {
+        if (roots.length > 0) config.extraRoots[source] = roots;
+        else delete config.extraRoots[source];
+        if (Object.keys(config.extraRoots).length === 0) delete config.extraRoots;
+      }
+      saveConfig(config);
+      break;
+    }
+    case 'roots': {
+      const config = loadConfig();
+      const roots = config?.extraRoots;
+      console.log(JSON.stringify(
+        roots && typeof roots === 'object' && !Array.isArray(roots) ? roots : {},
+        null,
+        2,
+      ));
+      break;
+    }
     default:
       console.error(`Unknown config subcommand: ${sub || '(none)'}`);
-      console.error('Usage: vibe-usage config <get|set|show>');
+      console.error('Usage: vibe-usage config <get|set|show|add-root|remove-root|roots>');
       process.exit(1);
   }
 }
@@ -219,7 +283,7 @@ export async function run(rawArgs) {
     npx @vibe-cafe/vibe-usage summary       Print last 7 days as markdown (cost/tokens/model/project)
     npx @vibe-cafe/vibe-usage summary --days N   Same, but over the last N days (1-90)
     npx @vibe-cafe/vibe-usage daemon       Continuous sync (every 30m, foreground)
-    npx @vibe-cafe/vibe-usage daemon install    Install background service (systemd/launchd)
+    npx @vibe-cafe/vibe-usage daemon install    Install background service (systemd/launchd/Task Scheduler)
     npx @vibe-cafe/vibe-usage daemon uninstall  Remove background service
     npx @vibe-cafe/vibe-usage daemon status     Show background service status
     npx @vibe-cafe/vibe-usage daemon stop       Stop background service
@@ -233,6 +297,9 @@ export async function run(rawArgs) {
     npx @vibe-cafe/vibe-usage config get <key>   Get a config value
     npx @vibe-cafe/vibe-usage config set <key> <value>  Set a config value
     npx @vibe-cafe/vibe-usage config set codexExtraHome <path>  Persist another Codex Home
+    npx @vibe-cafe/vibe-usage config add-root <tool> <path>  Add a Codex, Grok, or Antigravity data root
+    npx @vibe-cafe/vibe-usage config remove-root <tool> <path>  Remove an added data root
+    npx @vibe-cafe/vibe-usage config roots  Show added data roots as JSON
     npx @vibe-cafe/vibe-usage help         Show this help
 `);
       break;

package/src/init.js

@@ -27,7 +27,7 @@ function openBrowser(url) {
 }
 
 function isDaemonPlatform() {
-  return process.platform === 'linux' || process.platform === 'darwin';
+  return process.platform === 'linux' || process.platform === 'darwin' || process.platform === 'win32';
 }
 
 export async function runInit(options = {}) {
@@ -81,10 +81,14 @@ export async function runInit(options = {}) {
     apiUrl,
     hostname: host,
     ...(existing?.codexExtraHome ? { codexExtraHome: existing.codexExtraHome } : {}),
+    ...(existing?.extraRoots ? { extraRoots: existing.extraRoots } : {}),
   };
   saveConfig(config);
 
-  const tools = detectInstalledTools({ codexExtraHome: config.codexExtraHome });
+  const tools = detectInstalledTools({
+    codexExtraHome: config.codexExtraHome,
+    extraRoots: config.extraRoots,
+  });
   if (tools.length > 0) {
     console.log(success(`检测到 ${tools.length} 款工具: ${dim(tools.map(t => t.name).join(' · '))}`));
   } else {

package/src/parsers/antigravity-db.js

@@ -200,14 +200,15 @@ function queryCascadeDb(conversationsDir, cascadeId, sql) {
 }
 
 /** List cascade IDs backed by a `.db` file in a conversations directory. */
-export function listDbCascades(conversationsDir) {
+export function listDbCascades(conversationsDir, { strict = false } = {}) {
   try {
     const out = [];
     for (const f of readdirSync(conversationsDir)) {
       if (f.endsWith('.db') && f !== 'db.sqlite') out.push(f.slice(0, -3));
     }
     return out;
-  } catch {
+  } catch (err) {
+    if (strict) throw err;
     return [];
   }
 }
@@ -217,12 +218,12 @@ export function listDbCascades(conversationsDir) {
  * records. blob is fetched as hex text so it round-trips through both the
  * node:sqlite and sqlite3-CLI backends uniformly.
  */
-export function readDbUsageRecords(conversationsDir, cascadeId) {
+export function readDbUsageRecords(conversationsDir, cascadeId, { strict = false } = {}) {
   let rows;
   try {
     rows = queryCascadeDb(conversationsDir, cascadeId, 'SELECT idx, hex(data) AS h FROM gen_metadata ORDER BY idx');
   } catch (err) {
-    if (isSqliteUnavailableError(err)) throw err;
+    if (isSqliteUnavailableError(err) || strict) throw err;
     return [];
   }
   const records = [];
@@ -247,7 +248,7 @@ export function readDbUsageRecords(conversationsDir, cascadeId) {
  * system/tool steps that parseStepMetadata skips. Used to timestamp 3.7
  * gen_metadata rows that no longer embed chatStartMetadata.
  */
-export function readDbStepTimestamps(conversationsDir, cascadeId) {
+export function readDbStepTimestamps(conversationsDir, cascadeId, { strict = false } = {}) {
   let rows;
   try {
     rows = queryCascadeDb(
@@ -256,7 +257,7 @@ export function readDbStepTimestamps(conversationsDir, cascadeId) {
       'SELECT idx, hex(metadata) AS h FROM steps WHERE metadata IS NOT NULL ORDER BY idx',
     );
   } catch (err) {
-    if (isSqliteUnavailableError(err)) throw err;
+    if (isSqliteUnavailableError(err) || strict) throw err;
     return new Map();
   }
   const byIdx = new Map();
@@ -331,7 +332,7 @@ export function parseStepMetadata(buf) {
  * Read session timing events (user/assistant turns) for a cascade from the
  * steps table, chronological by idx.
  */
-export function readDbSessionEvents(conversationsDir, cascadeId) {
+export function readDbSessionEvents(conversationsDir, cascadeId, { strict = false } = {}) {
   let rows;
   try {
     rows = queryCascadeDb(
@@ -340,7 +341,7 @@ export function readDbSessionEvents(conversationsDir, cascadeId) {
       'SELECT hex(metadata) AS h FROM steps WHERE metadata IS NOT NULL ORDER BY idx',
     );
   } catch (err) {
-    if (isSqliteUnavailableError(err)) throw err;
+    if (isSqliteUnavailableError(err) || strict) throw err;
     return [];
   }
   const events = [];

package/src/parsers/antigravity.js

@@ -1,7 +1,8 @@
 import { execSync } from 'node:child_process';
-import { readdirSync } from 'node:fs';
-import { join } from 'node:path';
+import { readdirSync, statSync } from 'node:fs';
+import { delimiter, join } from 'node:path';
 import { homedir } from 'node:os';
+import { antigravityConversationDirs, normalizeExtraRoot } from '../extra-roots.js';
 import { aggregateToBuckets, extractSessions } from './aggregate.js';
 import { listDbCascades, readDbUsageRecords, readDbWorkspaceUri, readDbSessionEvents, readDbStepTimestamps, resolveUsageTimestamp } from './antigravity-db.js';
 
@@ -295,10 +296,10 @@ function projectFromUri(uri) {
  * List cascade IDs backed by a legacy `.pb` file (App history). `.db` cascades
  * are handled separately via offline parsing.
  */
-function listPbCascades() {
+function listPbCascades(conversationsDir = CONVERSATIONS_DIR) {
   try {
     const out = [];
-    for (const f of readdirSync(CONVERSATIONS_DIR)) {
+    for (const f of readdirSync(conversationsDir)) {
       if (f.endsWith('.pb')) out.push(f.slice(0, -3));
     }
     return out;
@@ -316,19 +317,88 @@ function modelFromRecord(rec) {
   return 'unknown';
 }
 
-export async function parse() {
+export async function parse({ extraRoots = [] } = {}) {
   const entries = [];
   const sessionEvents = [];
   const seenResponseIds = new Set();
 
+  const extraDirs = [];
+  for (const root of extraRoots) {
+    const dirs = antigravityConversationDirs(root);
+    let found = false;
+    for (const dir of dirs) {
+      try {
+        readdirSync(dir);
+        extraDirs.push(dir);
+        found = true;
+      } catch (err) {
+        if (err?.code === 'ENOENT') continue;
+        return {
+          buckets: [],
+          sessions: [],
+          skipped: true,
+          warnings: [`antigravity: 额外根目录读取失败，已保留上次同步数据: ${normalizeExtraRoot(root)}`],
+        };
+      }
+    }
+    if (!found) {
+      return {
+        buckets: [],
+        sessions: [],
+        skipped: true,
+        warnings: [`antigravity: 额外根目录不可用，已跳过本次 Antigravity 同步: ${normalizeExtraRoot(root)}`],
+      };
+    }
+  }
+
   // ── Path 1: offline .db parsing (App 2.0 + agy CLI, no process needed) ──
   const dbHandled = new Set();
-  for (const dir of [CONVERSATIONS_DIR, CLI_CONVERSATIONS_DIR]) {
-    for (const cascadeId of listDbCascades(dir)) {
-      const records = readDbUsageRecords(dir, cascadeId);
+  const fixtureDirs = process.env.VIBE_USAGE_ANTIGRAVITY_DIRS?.trim();
+  const defaultDirs = fixtureDirs
+    ? fixtureDirs.split(delimiter).filter(Boolean)
+    : [CONVERSATIONS_DIR, CLI_CONVERSATIONS_DIR];
+  const strictDirs = new Set(extraDirs);
+  const conversationDirs = [...new Set([...defaultDirs, ...extraDirs])];
+  const candidates = [];
+  for (const dir of conversationDirs) {
+    const strict = strictDirs.has(dir);
+    try {
+      for (const cascadeId of listDbCascades(dir, { strict })) {
+        candidates.push({ dir, cascadeId, strict });
+      }
+    } catch {
+      return {
+        buckets: [], sessions: [], skipped: true,
+        warnings: [`antigravity: 额外根目录读取失败，已保留上次同步数据: ${dir}`],
+      };
+    }
+  }
+  const configuredCascadeIds = new Set(
+    candidates.filter(candidate => candidate.strict).map(candidate => candidate.cascadeId),
+  );
+  const selectedConfiguredCopies = new Map();
+  for (const candidate of candidates) {
+    if (!configuredCascadeIds.has(candidate.cascadeId)) continue;
+    let size = 0;
+    try {
+      size = statSync(join(candidate.dir, `${candidate.cascadeId}.db`)).size;
+    } catch {
+      // The DB may move between discovery and stat; the read below will fail
+      // open in the existing offline reader.
+    }
+    const previous = selectedConfiguredCopies.get(candidate.cascadeId);
+    if (!previous || size > previous.size) selectedConfiguredCopies.set(candidate.cascadeId, { ...candidate, size });
+  }
+
+  for (const { dir, cascadeId, strict } of candidates) {
+    const selected = selectedConfiguredCopies.get(cascadeId);
+    if (selected && selected.dir !== dir) continue;
+    try {
+      const options = { strict };
+      const records = readDbUsageRecords(dir, cascadeId, options);
       const project = projectFromUri(readDbWorkspaceUri(dir, cascadeId)) || 'unknown';
       const stepTimestampsByIdx = records.some((rec) => !rec.timestamp || isNaN(rec.timestamp.getTime()))
-        ? readDbStepTimestamps(dir, cascadeId)
+        ? readDbStepTimestamps(dir, cascadeId, options)
         : new Map();
 
       if (records.length > 0) {
@@ -355,7 +425,7 @@ export async function parse() {
       }
 
       // Session timing from steps (independent of token usage presence).
-      for (const ev of readDbSessionEvents(dir, cascadeId)) {
+      for (const ev of readDbSessionEvents(dir, cascadeId, options)) {
         sessionEvents.push({
           sessionId: cascadeId,
           source: SOURCE,
@@ -364,11 +434,18 @@ export async function parse() {
           role: ev.role,
         });
       }
+    } catch (err) {
+      if (!strict) throw err;
+      return {
+        buckets: [], sessions: [], skipped: true,
+        warnings: [`antigravity: 额外根目录读取失败，已保留上次同步数据: ${dir}`],
+      };
     }
   }
 
   // ── Path 2: RPC fallback, only for legacy .pb cascades not already parsed ──
-  const pbCascades = listPbCascades().filter((id) => !dbHandled.has(id));
+  const pbDir = defaultDirs[0] || CONVERSATIONS_DIR;
+  const pbCascades = listPbCascades(pbDir).filter((id) => !dbHandled.has(id));
   if (pbCascades.length > 0) {
     const server = findLanguageServer();
     const ports = server ? findListeningPorts(server.pid) : [];

package/src/parsers/codex.js

@@ -17,6 +17,7 @@ import {
   resolveCodexHomes,
   validateExtraCodexHome,
 } from '../codex-roots.js';
+import { discoverCodexHomes } from '../extra-roots.js';
 import {
   codexCacheEnabled,
   fileSignature,
@@ -62,20 +63,22 @@ function decorateCodexModel(model, serviceTier, timestampMs) {
  * Recursively find all .jsonl files under a directory.
  * Codex CLI stores sessions as: ~/.codex/sessions/YYYY/MM/DD/rollout-*.jsonl
  */
-function findJsonlFiles(dir) {
+function findJsonlFiles(dir, strict = false) {
   const results = [];
   if (!existsSync(dir)) return results;
   try {
     for (const entry of readdirSync(dir, { withFileTypes: true })) {
       const fullPath = join(dir, entry.name);
       if (entry.isDirectory()) {
-        for (const nested of findJsonlFiles(fullPath)) results.push(nested);
+        for (const nested of findJsonlFiles(fullPath, strict)) results.push(nested);
       } else if (entry.name.endsWith('.jsonl')) {
         results.push(fullPath);
       }
     }
-  } catch {
-    // ignore unreadable directories
+  } catch (err) {
+    if (strict && err?.code !== 'ENOENT') throw err;
+    // Default roots are best-effort; configured roots must never look empty
+    // merely because a directory became unreadable between syncs.
   }
   return results;
 }
@@ -837,7 +840,8 @@ function mergeFileResults(results) {
   return { buckets: aggregateToBuckets(entries), sessions };
 }
 
-async function parseNativeCodex({ codexExtraHome } = {}) {
+async function parseNativeCodex({ codexExtraHome, extraRoots = [] } = {}) {
+  let extraCodexHomePath = null;
   if (codexExtraHome?.trim()) {
     const validation = validateExtraCodexHome(codexExtraHome);
     if (!validation.ok) {
@@ -848,11 +852,31 @@ async function parseNativeCodex({ codexExtraHome } = {}) {
         warnings: [`codex: 额外 Codex Home 不可用，已跳过本次 Codex 同步: ${validation.path}`],
       };
     }
+    extraCodexHomePath = validation.path;
   }
 
-  const codexHomes = resolveCodexHomes(codexExtraHome);
+  const configuredHomes = [];
+  for (const root of extraRoots) {
+    const discovered = discoverCodexHomes(root);
+    if (!discovered.readable || discovered.homes.length === 0) {
+      return {
+        buckets: [],
+        sessions: [],
+        skipped: true,
+        warnings: [`codex: 额外根目录不可用，已跳过本次 Codex 同步: ${discovered.root}`],
+      };
+    }
+    configuredHomes.push(...discovered.homes);
+  }
+
+  const strictHomes = new Set(configuredHomes);
+  if (extraCodexHomePath) strictHomes.add(extraCodexHomePath);
+  const codexHomes = [...new Set([
+    ...resolveCodexHomes(codexExtraHome),
+    ...configuredHomes,
+  ])];
   const dirs = codexHomes.flatMap(codexHome => (
-    codexSessionDirs(codexHome).map(dir => ({ codexHome, dir }))
+    codexSessionDirs(codexHome).map(dir => ({ codexHome, dir, strict: strictHomes.has(codexHome) }))
   ));
   if (!dirs.some(({ dir }) => existsSync(dir))) return { buckets: [], sessions: [] };
 
@@ -868,8 +892,17 @@ async function parseNativeCodex({ codexExtraHome } = {}) {
     audited: 0,
   };
   const files = [];
-  for (const { codexHome, dir } of dirs) {
-    for (const filePath of findJsonlFiles(dir)) {
+  for (const { codexHome, dir, strict } of dirs) {
+    let filePaths;
+    try {
+      filePaths = findJsonlFiles(dir, strict);
+    } catch {
+      return {
+        buckets: [], sessions: [], skipped: true,
+        warnings: [`codex: 额外根目录读取失败，已保留上次同步数据: ${codexHome}`],
+      };
+    }
+    for (const filePath of filePaths) {
       try {
         const stat = statSync(filePath);
         if (stat.size <= 0) continue;
@@ -880,6 +913,7 @@ async function parseNativeCodex({ codexExtraHome } = {}) {
         const file = {
           codexHome,
           filePath,
+          strict,
           snapshotSize: stat.size,
           signature,
           cache,
@@ -890,9 +924,14 @@ async function parseNativeCodex({ codexExtraHome } = {}) {
         };
         if (!cache && priorCache) file.appendTail = tailStateFor(file);
         files.push(file);
-      } catch {
+      } catch (err) {
         // The file may move to archived_sessions between discovery and stat.
-        // Its archived copy will be picked up on the next sync.
+        if (strict && err?.code !== 'ENOENT') {
+          return {
+            buckets: [], sessions: [], skipped: true,
+            warnings: [`codex: 额外根目录读取失败，已保留上次同步数据: ${codexHome}`],
+          };
+        }
       }
     }
   }
@@ -928,6 +967,12 @@ async function parseNativeCodex({ codexExtraHome } = {}) {
         cacheStats.filesRead++;
         updateFileCache(file, { header: file.header });
       } catch {
+        if (file.strict) {
+          return {
+            buckets: [], sessions: [], skipped: true,
+            warnings: [`codex: 额外根目录读取失败，已保留上次同步数据: ${file.codexHome}`],
+          };
+        }
         continue;
       }
     }
@@ -981,6 +1026,12 @@ async function parseNativeCodex({ codexExtraHome } = {}) {
         cacheStats.filesRead++;
         updateFileCache(file, { index: meta });
       } catch {
+        if (file.strict) {
+          return {
+            buckets: [], sessions: [], skipped: true,
+            warnings: [`codex: 额外根目录读取失败，已保留上次同步数据: ${file.codexHome}`],
+          };
+        }
         continue;
       }
     }

package/src/parsers/cursor.js

@@ -68,7 +68,19 @@ function decodeJwtSub(token) {
   }
 }
 
-const FETCH_TIMEOUT_MS = 10_000;
+// Under full sync many parsers hammer disk concurrently; cursor.com's CSV
+// export can still succeed but take >10s. A short timeout caused silent skips.
+const DEFAULT_FETCH_TIMEOUT_MS = 30_000;
+const MAX_FETCH_TIMEOUT_MS = 2_147_483_647;
+
+export function resolveCursorFetchTimeout(value) {
+  const timeout = Number(value);
+  return Number.isInteger(timeout) && timeout > 0 && timeout <= MAX_FETCH_TIMEOUT_MS
+    ? timeout
+    : DEFAULT_FETCH_TIMEOUT_MS;
+}
+
+const FETCH_TIMEOUT_MS = resolveCursorFetchTimeout(process.env.VIBE_USAGE_CURSOR_FETCH_TIMEOUT_MS);
 
 async function fetchUsageCsv(token) {
   const url = `${(process.env.CURSOR_WEB_BASE_URL?.trim() || 'https://cursor.com').replace(/\/+$/, '')}/api/dashboard/export-usage-events-csv?strategy=tokens`;
@@ -190,7 +202,14 @@ export async function parse() {
     // Auth failure → bubble up so user sees they need to re-login in Cursor.
     // Tell sync.js this was not a successful empty snapshot so it preserves
     // Cursor's incremental state instead of pruning it as dead history.
-    if (err && err.skip) return { buckets: [], sessions: [], skipped: true };
+    if (err && err.skip) {
+      return {
+        buckets: [],
+        sessions: [],
+        skipped: true,
+        warnings: [`cursor: ${err.message}`],
+      };
+    }
     throw err;
   }
   const rows = parseCsv(csv);