@yhong91/vibetime 0.1.40 → 0.1.42

package/bin/vibetime.mjs

@@ -1928,7 +1928,7 @@ function countTextLines(text) {
 }
 
 // src/lib/constants.ts
-var PACKAGE_VERSION = true ? "0.1.40" : "0.1.1";
+var PACKAGE_VERSION = true ? "0.1.42" : "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;
@@ -3308,7 +3308,11 @@ async function isHooksJsonInstalled(filePath, command) {
 }
 
 // src/adapters/claude-code.ts
+init_fs();
 async function parseClaudeCodeSessionFile(filePath, options) {
+  if (path7.basename(filePath) === "usage.jsonl" && path7.basename(path7.dirname(filePath)) === ".viberouter") {
+    return parseClaudeRouterUsageFile(filePath, options);
+  }
   const text = await readFile3(filePath, "utf8");
   const lines = text.split("\n").filter(Boolean);
   const projectContext = await claudeProjectContextFromLines(filePath, lines, options);
@@ -3575,6 +3579,86 @@ async function parseClaudeCodeSessionFile(filePath, options) {
   }
   return state.events.filter((event) => validateCanonicalEvent(event).valid);
 }
+async function parseClaudeRouterUsageFile(filePath, options) {
+  const rows = (await readFile3(filePath, "utf8")).split("\n").map(parseJsonLine).filter((row) => Boolean(
+    row && row.surface === "claude" && (numberField(row, "timestamp") ?? 0) > 0 && Object.keys(objectField(row, "usage")).length > 0
+  ));
+  if (rows.length === 0) {
+    return [];
+  }
+  const timestamps = rows.map((row) => numberField(row, "timestamp") ?? 0);
+  const firstTs = Math.min(...timestamps) - 6e4;
+  const lastTs = Math.max(...timestamps) + 6e4;
+  const home = path7.resolve(stringOption(options.home) || path7.dirname(path7.dirname(filePath)));
+  const transcriptCounts = /* @__PURE__ */ new Map();
+  for (const transcript of await listJsonlFiles(path7.join(claudeConfigDir(home, process.env), "projects"))) {
+    const seen = /* @__PURE__ */ new Set();
+    for (const line of (await readFile3(transcript, "utf8")).split("\n")) {
+      const raw = parseJsonLine(line);
+      const ts = raw ? Date.parse(timestampFrom(raw.timestamp) || "") : Number.NaN;
+      if (!raw || stringField(raw, "type") !== "assistant" || ts < firstTs || ts > lastTs) {
+        continue;
+      }
+      const message = objectField(raw, "message");
+      const messageId = stringField(message, "id");
+      const usageKey = messageId ? `${messageId}:${stringField(raw, "requestId")}` : null;
+      if (usageKey && seen.has(usageKey)) {
+        continue;
+      }
+      if (usageKey) {
+        seen.add(usageKey);
+      }
+      const usage = claudeUsageFromMessage(message);
+      if (!usage) {
+        continue;
+      }
+      const key = `${usage.tokensInput || 0}:${usage.tokensOutput || 0}`;
+      transcriptCounts.set(key, (transcriptCounts.get(key) || 0) + 1);
+    }
+  }
+  const sourcePathHash = `sha256:${createStableHash(filePath)}`;
+  const events = [];
+  for (const row of rows) {
+    const usage = objectField(row, "usage");
+    const input = numberField(usage, "inputTokens") || 0;
+    const output = numberField(usage, "outputTokens") || 0;
+    const key = `${input}:${output}`;
+    const matched = transcriptCounts.get(key) || 0;
+    if (matched > 0) {
+      transcriptCounts.set(key, matched - 1);
+      continue;
+    }
+    const timestamp = numberField(row, "timestamp") ?? 0;
+    const requestId = stringField(row, "requestId") || createStableHash(row).slice(0, 24);
+    const cacheCreation = numberField(usage, "cacheCreationInputTokens") || 0;
+    const cacheRead = numberField(usage, "cacheReadInputTokens") || 0;
+    const cached = numberField(usage, "cachedInputTokens") || cacheCreation + cacheRead;
+    const event = baseClaudeEvent({
+      ts: new Date(timestamp).toISOString(),
+      type: "model.usage",
+      sessionId: `viberouter:${new Date(timestamp).toISOString().slice(0, 10)}`,
+      project: "unknown",
+      model: stringField(row, "resolvedModel") || stringField(row, "requestedModel") || stringField(row, "model"),
+      provider: stringField(row, "provider"),
+      confidence: "exact",
+      metrics: {
+        tokensInput: input || void 0,
+        tokensCachedInput: cached || void 0,
+        tokensCacheCreationInput: cacheCreation || void 0,
+        tokensCacheReadInput: cacheRead || void 0,
+        tokensOutput: output || void 0,
+        tokensReasoningOutput: numberField(usage, "reasoningOutputTokens") || void 0,
+        tokensTotal: numberField(usage, "totalTokens") || input + output || void 0,
+        modelCalls: 1
+      },
+      refs: stringRefs({ sourceId: requestId, sourcePathHash, importKey: `claude-code:viberouter:${requestId}` })
+    });
+    if (validateCanonicalEvent(event).valid) {
+      events.push(event);
+    }
+  }
+  return events;
+}
 function baseClaudeEvent(event) {
   return {
     schemaVersion: AGENT_TIME_SCHEMA_VERSION,
@@ -3911,6 +3995,7 @@ function createClaudeCodeAdapter() {
       const base = claudeConfigDir(home, env);
       return [
         path7.join(base, "projects"),
+        path7.join(home, ".viberouter", "usage.jsonl"),
         path7.join(base, ".claude.json"),
         path7.join(home, ".claude.json")
       ];
@@ -7491,6 +7576,11 @@ function createPiAdapter() {
   };
 }
 
+// src/adapters/qoder-cn.ts
+import { readdir as readdir7, readFile as readFile10, stat as stat8 } from "node:fs/promises";
+import os8 from "node:os";
+import path17 from "node:path";
+
 // src/adapters/qoder-local-db.ts
 import { access } from "node:fs/promises";
 import os7 from "node:os";
@@ -7537,6 +7627,7 @@ async function loadQoderDbModelCalls(appDirName, sessionId, modelMap) {
     }
     const db = new DatabaseSync(dbPath, { readOnly: true });
     try {
+      calls.rootSessionId = resolveRootSessionId(db, sessionId);
       const preferredModel = resolveSessionPreferredModel(db, sessionId, modelMap);
       const rows = db.prepare(
         `select request_id, token_info, model_info from chat_message where session_id = ? and role = 'assistant' and token_info != '' order by gmt_create asc`
@@ -7570,6 +7661,18 @@ async function loadQoderDbModelCalls(appDirName, sessionId, modelMap) {
   }
   return calls;
 }
+function resolveRootSessionId(db, sessionId) {
+  let current = sessionId;
+  for (let depth = 0; depth < 5; depth += 1) {
+    const row = db.prepare("select parent_session_id from chat_session where session_id = ?").get(current);
+    const parent = row ? stringField(row, "parent_session_id") : void 0;
+    if (!parent) {
+      return current === sessionId ? void 0 : current;
+    }
+    current = parent;
+  }
+  return current === sessionId ? void 0 : current;
+}
 function resolveSessionPreferredModel(db, sessionId, modelMap) {
   let current = sessionId;
   for (let depth = 0; depth < 5 && current; depth++) {
@@ -7595,9 +7698,6 @@ function resolveSessionPreferredModel(db, sessionId, modelMap) {
 }
 
 // src/adapters/qoder-cn.ts
-import { readdir as readdir7, readFile as readFile10, stat as stat8 } from "node:fs/promises";
-import os8 from "node:os";
-import path17 from "node:path";
 function parseQoderCnPaths(filePath) {
   const parts = filePath.split(path17.sep);
   const subagentsIdx = parts.lastIndexOf("subagents");
@@ -7715,7 +7815,8 @@ async function loadQoderCnSegmentModelCalls(filePath, isSubagentSession, modelMa
 async function parseQoderCnSessionFile(filePath, options) {
   const text = await readFile10(filePath, "utf8");
   const lines = text.split("\n").filter(Boolean);
-  const { configDir: configDir2 } = parseQoderCnPaths(filePath);
+  const parsedPaths = parseQoderCnPaths(filePath);
+  const { configDir: configDir2 } = parsedPaths;
   const projectContext = await qoderCnProjectContextFromLines(filePath, lines, options, configDir2);
   const pendingTools = /* @__PURE__ */ new Map();
   const seenUsageKeys = /* @__PURE__ */ new Set();
@@ -8043,6 +8144,16 @@ async function parseQoderCnSessionFile(filePath, options) {
       });
     }
   }
+  dbModelCalls ??= await loadQoderDbModelCalls("QoderCN", parsedPaths.sessionId, modelMap);
+  if (dbModelCalls.rootSessionId) {
+    const parentPath = path17.join(path17.dirname(filePath), `${dbModelCalls.rootSessionId}.jsonl`);
+    const parentSourcePathHash = `sha256:${createStableHash(parentPath)}`;
+    return validEvents.map((event) => rebuildEventIdentity2({
+      ...event,
+      sessionId: dbModelCalls.rootSessionId,
+      refs: { ...event.refs, sourcePathHash: parentSourcePathHash }
+    }));
+  }
   return validEvents;
 }
 function baseQoderCnEvent(event) {
@@ -8530,7 +8641,8 @@ async function loadQoderSegmentModelCalls(filePath, isSubagentSession, modelMap)
 async function parseQoderSessionFile(filePath, options) {
   const text = await readFile11(filePath, "utf8");
   const lines = text.split("\n").filter(Boolean);
-  const { configDir: configDir2 } = parseQoderPaths(filePath);
+  const parsedPaths = parseQoderPaths(filePath);
+  const { configDir: configDir2 } = parsedPaths;
   const projectContext = await qoderProjectContextFromLines(filePath, lines, options, configDir2);
   const pendingTools = /* @__PURE__ */ new Map();
   const seenUsageKeys = /* @__PURE__ */ new Set();
@@ -8858,6 +8970,16 @@ async function parseQoderSessionFile(filePath, options) {
       });
     }
   }
+  dbModelCalls ??= await loadQoderDbModelCalls("Qoder", parsedPaths.sessionId, modelMap);
+  if (dbModelCalls.rootSessionId) {
+    const parentPath = path18.join(path18.dirname(filePath), `${dbModelCalls.rootSessionId}.jsonl`);
+    const parentSourcePathHash = `sha256:${createStableHash(parentPath)}`;
+    return validEvents.map((event) => rebuildEventIdentity3({
+      ...event,
+      sessionId: dbModelCalls.rootSessionId,
+      refs: { ...event.refs, sourcePathHash: parentSourcePathHash }
+    }));
+  }
   return validEvents;
 }
 function baseQoderEvent(event) {
@@ -9893,7 +10015,7 @@ function modelMetrics(row) {
     toolCalls: numberField(row, "tool_call_count")
   };
 }
-function resolveRootSessionId(sessionId, sessions) {
+function resolveRootSessionId2(sessionId, sessions) {
   let current = sessionId;
   const visited = /* @__PURE__ */ new Set();
   while (true) {
@@ -9915,7 +10037,7 @@ function sessionContext(row, sessions) {
   const session = sessions.get(sessionId);
   const cwd = stringField(session, "directory");
   const project = projectFromDirectory(cwd);
-  const rootSessionId = resolveRootSessionId(sessionId, sessions);
+  const rootSessionId = resolveRootSessionId2(sessionId, sessions);
   return {
     rawSessionId: sessionId,
     sessionId: `zcode:${rootSessionId}`,
@@ -11275,7 +11397,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();
@@ -11289,9 +11415,10 @@ async function postRollupBatch(remote, rollups, options = {}) {
     failed: 0
   };
 }
-async function deleteRollupsBySource(remote, source, machine) {
+async function deleteRollupsBySource(remote, source, machine, options = {}) {
+  const query = `source=${encodeURIComponent(source)}${options.preserveTokens ? "&preserveTokens=1" : ""}${options.allowHistoricalRewrite ? "&allowHistoricalRewrite=1" : ""}`;
   const response = await remote.fetchImpl(
-    joinUrl(remote.baseUrl, `/v3/agent/sessions?source=${encodeURIComponent(source)}`),
+    joinUrl(remote.baseUrl, `/v3/agent/sessions?${query}`),
     { method: "DELETE", headers: buildHeaders(remote.token, machine) }
   );
   if (!response.ok) {
@@ -11337,6 +11464,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());
@@ -11414,7 +11542,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").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;
@@ -11433,7 +11561,8 @@ function normalizeOptions(options) {
     importRun: "import-run",
     batchSize: "batch-size",
     batchBytes: "batch-bytes",
-    skipConflicts: "skip-conflicts"
+    skipConflicts: "skip-conflicts",
+    purgeAll: "purge-all"
   };
   for (const [camel, dashed] of Object.entries(aliases)) {
     if (normalized[camel] !== void 0 && normalized[dashed] === void 0) {
@@ -11703,6 +11832,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]);
@@ -11978,7 +12111,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,
@@ -12005,11 +12138,13 @@ 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);
+      const deleted = await deleteSessionRollupsBySourceAPI(item.id, options, ctx, preserveTokens);
       if (!options.json) {
-        write(ctx.stdout, `purged ${item.id}: ${deleted} old rollups
+        const suffix = preserveTokens ? " (token-bearing and sessions older than 7 days kept)" : "";
+        write(ctx.stdout, `purged ${item.id}: ${deleted} old rollups${suffix}
 `);
       }
     } catch (error) {
@@ -12135,11 +12270,12 @@ 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;
 }
-async function deleteSessionRollupsBySourceAPI(source, options, ctx) {
+async function deleteSessionRollupsBySourceAPI(source, options, ctx, preserveTokens) {
   const remote = resolveRemoteFromOptions(options, ctx);
   if (!remote) {
     throw new Error("No fetch available for HTTP delete");
@@ -12149,8 +12285,18 @@ async function deleteSessionRollupsBySourceAPI(source, options, ctx) {
     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;
 }
@@ -12608,7 +12754,7 @@ Usage:
   vibetime install [--target codex,claude,opencode,pi] [--all] [--dry-run] [--force] [--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>]
+  vibetime backfill discover|plan|import|verify --source codex|claude-code|opencode|pi|all --dry-run [--json] [--batch-size <count>] [--force [--purge-all]]
   vibetime token set <token>
   vibetime token show
   vibetime token clear
@@ -12641,8 +12787,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.40",
+  "version": "0.1.42",
   "description": "vibetime CLI — install AI-agent hooks (Claude Code, Codex, OpenCode, Pi) and report activity to vibetime.",
   "license": "MIT",
   "publishConfig": {