@juliantanx/aiusage 1.5.7 → 1.5.8

package/dist/index.js

@@ -13,8 +13,8 @@ import { execSync as execSync5 } from "child_process";
 
 // src/commands/serve.ts
 import http2 from "http";
-import { readFileSync as readFileSync10, existsSync as existsSync11, statSync as statSync4, writeFileSync as writeFileSync6, unlinkSync as unlinkSync4 } from "fs";
-import { join as join12, extname as extname2, dirname as dirname5 } from "path";
+import { readFileSync as readFileSync11, existsSync as existsSync12, statSync as statSync4, writeFileSync as writeFileSync6, unlinkSync as unlinkSync4 } from "fs";
+import { join as join13, extname as extname2, dirname as dirname6 } from "path";
 import { fileURLToPath } from "url";
 
 // src/api/server.ts
@@ -872,7 +872,39 @@ function sanitizeModel(value, fallback) {
   const model = lastPathSegment(value);
   return model || fallback;
 }
-function usageFromAny(parsed) {
+function codeBuddyUsage(parsed) {
+  const ru = parsed?.providerData?.rawUsage;
+  if (ru && typeof ru === "object") {
+    const hit = num(ru.prompt_cache_hit_tokens ?? ru.prompt_tokens_details?.cached_tokens);
+    const miss = ru.prompt_cache_miss_tokens;
+    const prompt2 = num(ru.prompt_tokens ?? ru.input_tokens);
+    return {
+      inputTokens: miss != null ? num(miss) : Math.max(0, prompt2 - hit),
+      outputTokens: num(ru.completion_tokens ?? ru.output_tokens),
+      cacheReadTokens: hit,
+      cacheWriteTokens: num(ru.prompt_cache_write_tokens ?? ru.cache_creation_input_tokens),
+      thinkingTokens: num(ru.completion_thinking_tokens ?? ru.completion_tokens_details?.reasoning_tokens)
+    };
+  }
+  const mu = parsed?.message?.usage;
+  if (mu && typeof mu === "object") {
+    const cacheRead = num(mu.cache_read_input_tokens ?? mu.prompt_tokens_details?.cached_tokens);
+    const rawInput = num(mu.input_tokens ?? mu.prompt_tokens);
+    return {
+      inputTokens: Math.max(0, rawInput - cacheRead),
+      outputTokens: num(mu.output_tokens ?? mu.completion_tokens),
+      cacheReadTokens: cacheRead,
+      cacheWriteTokens: num(mu.cache_creation_input_tokens ?? mu.cache_write_input_tokens),
+      thinkingTokens: num(mu.thinking_tokens ?? mu.reasoning_tokens)
+    };
+  }
+  return null;
+}
+function usageFromAny(parsed, tool) {
+  if (tool === "codebuddy") {
+    const cb = codeBuddyUsage(parsed);
+    if (cb) return cb;
+  }
   const usage = parsed?.message?.usage ?? parsed?.usage ?? parsed?.event?.usage ?? parsed?.payload?.token_usage ?? parsed?.message?.payload?.token_usage ?? parsed?.providerData?.rawUsage ?? parsed?.data?.usage;
   if (!usage || typeof usage !== "object") return null;
   const details = usage.prompt_tokens_details ?? usage.input_tokens_details ?? {};
@@ -942,7 +974,7 @@ var GenericJsonlParser = class {
     }
     const normalized = parsed?.type === "context.append_loop_event" && parsed.event ? { ...parsed.event, time: parsed.time } : parsed;
     if (!shouldAccept(this.tool, normalized)) return null;
-    const usage = usageFromAny(normalized);
+    const usage = usageFromAny(normalized, this.tool);
     if (!usage) return null;
     const total = usage.inputTokens + usage.outputTokens + usage.cacheReadTokens + usage.cacheWriteTokens + usage.thinkingTokens;
     if (total === 0) return null;
@@ -1603,6 +1635,55 @@ function probeCodeBuddy(ctx) {
   const dir = join3(ctx.env.CODEBUDDY_HOME ?? join3(ctx.home, ".codebuddy"), "projects");
   return existsSync3(dir) ? dir : null;
 }
+function codeBuddyIdeRoots(ctx) {
+  const roots = [];
+  if (platform() === "darwin") {
+    roots.push(join3(ctx.home, "Library", "Application Support", "CodeBuddyExtension", "Data"));
+  } else if (platform() === "win32") {
+    const appData = ctx.env.APPDATA ?? join3(ctx.home, "AppData", "Roaming");
+    roots.push(join3(appData, "CodeBuddyExtension", "Data"));
+  } else {
+    const config = ctx.env.XDG_CONFIG_HOME ?? join3(ctx.home, ".config");
+    roots.push(join3(config, "CodeBuddyExtension", "Data"));
+  }
+  return unique(roots);
+}
+function probeCodeBuddyIde(ctx) {
+  const override = envOverride("codebuddy-ide", ctx.env);
+  if (override) return override;
+  const legacy = ctx.legacySources?.["codebuddy-ide"];
+  if (legacy) return legacy;
+  for (const root of codeBuddyIdeRoots(ctx)) {
+    if (existsSync3(root)) return root;
+  }
+  return null;
+}
+function countCodeBuddyIdeConversations(dir) {
+  let count = 0;
+  const walk = (root, depth) => {
+    if (depth > 12) return;
+    let entries;
+    try {
+      entries = readdirSync(root, { withFileTypes: true });
+    } catch {
+      return;
+    }
+    for (const entry of entries) {
+      if (!entry.isDirectory()) continue;
+      const full = join3(root, entry.name);
+      if (entry.name === "messages") {
+        try {
+          if (readdirSync(full).some((f) => f.endsWith(".json"))) count++;
+        } catch {
+        }
+        continue;
+      }
+      walk(full, depth + 1);
+    }
+  };
+  walk(dir, 0);
+  return count;
+}
 function probeKiro(ctx) {
   const override = envOverride("kiro", ctx.env);
   if (override) return override;
@@ -1810,6 +1891,7 @@ var TOOL_REGISTRY = [
   { tool: "gemini", sourceKey: "gemini", label: "Gemini CLI", probe: probeGemini },
   { tool: "kimi", sourceKey: "kimi", label: "Kimi Code", probe: probeKimi },
   { tool: "codebuddy", sourceKey: "codebuddy", label: "CodeBuddy", probe: probeCodeBuddy },
+  { tool: "codebuddy", sourceKey: "codebuddy-ide", label: "CodeBuddy (IDE)", probe: probeCodeBuddyIde },
   { tool: "kiro", sourceKey: "kiro", label: "Kiro", probe: probeKiro },
   { tool: "grok", sourceKey: "grok", label: "Grok Build", probe: probeGrok },
   { tool: "antigravity", sourceKey: "antigravity", label: "Antigravity", probe: probeAntigravity },
@@ -1839,7 +1921,9 @@ function discoverTools(env = process.env) {
       try {
         const stat2 = statSync(detectedPath);
         if (stat2.isDirectory()) {
-          if (entry.sourceKey === "roocode" || entry.sourceKey === "kilocode") {
+          if (entry.sourceKey === "codebuddy-ide") {
+            fileCount += countCodeBuddyIdeConversations(detectedPath);
+          } else if (entry.sourceKey === "roocode" || entry.sourceKey === "kilocode") {
             fileCount += findJsonFiles(detectedPath).filter((p) => basename(p) === "ui_messages.json").length;
           } else if (entry.sourceKey === "kelivo") {
             fileCount += findJsonFiles(detectedPath).filter((p) => basename(p) === "chats.json").length + findZipFiles(detectedPath).length;
@@ -3176,6 +3260,17 @@ function migrateV11(db) {
   `);
 }
 
+// src/db/migrations/v12.ts
+function migrateV12(db) {
+  db.prepare(`
+    UPDATE records
+    SET updated_at = ?
+    WHERE source_file NOT LIKE 'synced/%'
+      AND (cwd != '' OR source_file LIKE '%:session:%')
+  `).run(Date.now());
+  db.prepare("INSERT INTO schema_version (version) VALUES (12)").run();
+}
+
 // src/db/migrations/index.ts
 var MIGRATIONS = [
   { version: 1, migrate: migrateV1 },
@@ -3188,7 +3283,8 @@ var MIGRATIONS = [
   { version: 8, migrate: migrateV8 },
   { version: 9, migrate: migrateV9 },
   { version: 10, migrate: migrateV10 },
-  { version: 11, migrate: migrateV11 }
+  { version: 11, migrate: migrateV11 },
+  { version: 12, migrate: migrateV12 }
 ];
 function runMigrations(db) {
   createSchemaVersionTable(db);
@@ -4031,10 +4127,10 @@ function getClientPlatform() {
 }
 function getCliVersion() {
   try {
-    const { readFileSync: readFileSync13 } = __require("fs");
-    const { join: join17 } = __require("path");
-    const pkgPath = join17(__dirname, "../../package.json");
-    const pkg = JSON.parse(readFileSync13(pkgPath, "utf-8"));
+    const { readFileSync: readFileSync14 } = __require("fs");
+    const { join: join18 } = __require("path");
+    const pkgPath = join18(__dirname, "../../package.json");
+    const pkg = JSON.parse(readFileSync14(pkgPath, "utf-8"));
     return pkg.version || "0.0.0";
   } catch {
     return "0.0.0";
@@ -6245,8 +6341,8 @@ function createApiServer(db, options) {
 
 // src/commands/parse.ts
 import Database2 from "better-sqlite3";
-import { readFileSync as readFileSync9, statSync as statSync3, existsSync as existsSync9, openSync, readSync, closeSync } from "fs";
-import { join as join8, dirname as dirname4 } from "path";
+import { readFileSync as readFileSync10, statSync as statSync3, existsSync as existsSync10, openSync, readSync, closeSync } from "fs";
+import { join as join9, dirname as dirname5 } from "path";
 import { hostname as hostname2 } from "os";
 
 // src/watermark.ts
@@ -6297,7 +6393,7 @@ var WatermarkManager = class {
       if (parsed && typeof parsed === "object" && !("files" in parsed)) {
         return { files: { ...defaultFileData(), ...parsed } };
       }
-      return { files: { ...defaultFileData(), ...parsed.files ?? {} }, opencode: parsed.opencode ?? null, hermes: parsed.hermes ?? null, qoder: parsed.qoder ?? null, cursor: parsed.cursor ?? null, goose: parsed.goose ?? null, zed: parsed.zed ?? null, kiro: parsed.kiro ?? null, zcode: parsed.zcode ?? null, zcodeTools: parsed.zcodeTools ?? null, trae: parsed.trae ?? null };
+      return { files: { ...defaultFileData(), ...parsed.files ?? {} }, opencode: parsed.opencode ?? null, hermes: parsed.hermes ?? null, qoder: parsed.qoder ?? null, cursor: parsed.cursor ?? null, goose: parsed.goose ?? null, zed: parsed.zed ?? null, kiro: parsed.kiro ?? null, zcode: parsed.zcode ?? null, zcodeTools: parsed.zcodeTools ?? null, trae: parsed.trae ?? null, codebuddyIde: parsed.codebuddyIde ?? null };
     } catch {
       return { files: defaultFileData() };
     }
@@ -6384,6 +6480,12 @@ var WatermarkManager = class {
   setTraeLastImported(ts3) {
     this.data.trae = ts3;
   }
+  getCodeBuddyIdeCursor() {
+    return this.data.codebuddyIde ?? 0;
+  }
+  setCodeBuddyIdeCursor(ts3) {
+    this.data.codebuddyIde = ts3;
+  }
 };
 
 // src/commands/parse-opencode.ts
@@ -7430,6 +7532,173 @@ function runParseTrae(options) {
   return { records, toolCalls, lastImportedAt: latestTs, errors };
 }
 
+// src/commands/parse-codebuddy.ts
+import { existsSync as existsSync9, readdirSync as readdirSync3, readFileSync as readFileSync9 } from "fs";
+import { join as join8, basename as basename4, dirname as dirname4 } from "path";
+function num3(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : 0;
+}
+function toMs(iso) {
+  if (typeof iso !== "string") return 0;
+  const ms = Date.parse(iso);
+  return Number.isFinite(ms) ? ms : 0;
+}
+var WORKSPACE_FOLDER_RE = /Workspace Folder:\s*(.+)/;
+function userMessageText(raw) {
+  try {
+    const inner = JSON.parse(raw);
+    if (Array.isArray(inner.content)) {
+      return inner.content.filter((block) => block?.type === "text" && typeof block.text === "string").map((block) => block.text).join("\n");
+    }
+  } catch {
+  }
+  return raw;
+}
+function findMessagesDirs(root, depth = 0) {
+  if (depth > 12) return [];
+  let entries;
+  try {
+    entries = readdirSync3(root, { withFileTypes: true });
+  } catch {
+    return [];
+  }
+  const out = [];
+  for (const entry of entries) {
+    if (!entry.isDirectory()) continue;
+    const full = join8(root, entry.name);
+    if (entry.name === "messages") {
+      out.push(full);
+      continue;
+    }
+    out.push(...findMessagesDirs(full, depth + 1));
+  }
+  return out;
+}
+function readConversation(messagesDir) {
+  let files;
+  try {
+    files = readdirSync3(messagesDir).filter((f) => f.endsWith(".json"));
+  } catch {
+    return null;
+  }
+  if (files.length === 0) return null;
+  const parsed = [];
+  for (const file of files) {
+    try {
+      const data = JSON.parse(readFileSync9(join8(messagesDir, file), "utf-8"));
+      if (data && typeof data === "object") parsed.push(data);
+    } catch {
+    }
+  }
+  if (parsed.length === 0) return null;
+  let cwd;
+  for (const msg of parsed) {
+    if (msg.role !== "user" || typeof msg.message !== "string") continue;
+    const match = WORKSPACE_FOLDER_RE.exec(userMessageText(msg.message));
+    if (match) {
+      cwd = match[1].trim();
+      break;
+    }
+  }
+  let latest = null;
+  for (const msg of parsed) {
+    if (msg.role !== "assistant" || typeof msg.extra !== "string") continue;
+    let extra2;
+    try {
+      extra2 = JSON.parse(msg.extra);
+    } catch {
+      continue;
+    }
+    const hasStats = extra2.statsSnapshot != null || extra2.lastStepInputTokens != null;
+    if (!hasStats) continue;
+    const ts3 = toMs(msg.createdAt);
+    if (!latest || ts3 >= latest.ts) latest = { ts: ts3, extra: extra2 };
+  }
+  if (!latest) return null;
+  const extra = latest.extra;
+  const snapshot = extra.statsSnapshot ?? {};
+  const cacheReadTokens = num3(snapshot.cachedInputTokens ?? extra.lastStepCachedInputTokens);
+  const inputTokens = snapshot.cacheMissTokens != null ? num3(snapshot.cacheMissTokens) : Math.max(0, num3(extra.lastStepInputTokens) - cacheReadTokens);
+  const outputTokens = num3(snapshot.lastOutputTokens ?? extra.lastStepOutputTokens);
+  const cacheWriteTokens = num3(snapshot.cacheWriteTokens);
+  const thinkingTokens = num3(snapshot.thinkingTokens);
+  const model = typeof extra.modelId === "string" && extra.modelId.trim() ? extra.modelId.trim() : "unknown";
+  return {
+    ts: latest.ts,
+    model,
+    inputTokens,
+    outputTokens,
+    cacheReadTokens,
+    cacheWriteTokens,
+    thinkingTokens,
+    cwd
+  };
+}
+function runParseCodeBuddy(options) {
+  const { dataDir, device, deviceInstanceId, platform: platform5, now, cursor, exchangeRate } = options;
+  const records = [];
+  const errors = [];
+  let nextCursor = cursor ?? 0;
+  if (!existsSync9(dataDir)) {
+    return { records, nextCursor, errors };
+  }
+  let messagesDirs;
+  try {
+    messagesDirs = findMessagesDirs(dataDir);
+  } catch (e) {
+    return { records, nextCursor, errors: [String(e)] };
+  }
+  for (const messagesDir of messagesDirs) {
+    const conversationDir = dirname4(messagesDir);
+    const sessionId = basename4(conversationDir);
+    let usage;
+    try {
+      usage = readConversation(messagesDir);
+    } catch (e) {
+      errors.push(`${messagesDir}: ${e instanceof Error ? e.message : e}`);
+      continue;
+    }
+    if (!usage) continue;
+    if (usage.inputTokens + usage.outputTokens + usage.cacheReadTokens === 0) continue;
+    if (cursor && usage.ts <= cursor) continue;
+    if (usage.ts > nextCursor) nextCursor = usage.ts;
+    const provider = inferProvider(usage.model);
+    const tokenArgs = {
+      inputTokens: usage.inputTokens,
+      outputTokens: usage.outputTokens,
+      cacheReadTokens: usage.cacheReadTokens,
+      cacheWriteTokens: usage.cacheWriteTokens,
+      thinkingTokens: usage.thinkingTokens
+    };
+    const cost = calculateCost(usage.model, tokenArgs, exchangeRate);
+    const recordId = generateRecordId(deviceInstanceId, conversationDir, usage.ts);
+    records.push({
+      id: recordId,
+      ts: usage.ts,
+      ingestedAt: now,
+      updatedAt: now,
+      lineOffset: 0,
+      tool: "codebuddy",
+      model: usage.model,
+      provider,
+      inputTokens: usage.inputTokens,
+      outputTokens: usage.outputTokens,
+      cacheReadTokens: usage.cacheReadTokens,
+      cacheWriteTokens: usage.cacheWriteTokens,
+      thinkingTokens: usage.thinkingTokens,
+      cost,
+      costSource: cost > 0 ? "pricing" : "unknown",
+      sessionId,
+      sourceFile: conversationDir,
+      cwd: usage.cwd,
+      device,
+      deviceInstanceId,
+      platform: platform5
+    });
+  }
+  return { records, nextCursor, errors };
+}
+
 // src/commands/parse.ts
 function extractCwdFromJson(data) {
   if (typeof data.cwd === "string" && data.cwd) return data.cwd;
@@ -7484,7 +7753,7 @@ function parseUiMessagesFile(options) {
   const errors = [];
   let messages;
   try {
-    const parsed = JSON.parse(readFileSync9(filePath, "utf-8"));
+    const parsed = JSON.parse(readFileSync10(filePath, "utf-8"));
     messages = Array.isArray(parsed) ? parsed : [];
   } catch (e) {
     return { records, errors: [`${filePath}: ${e instanceof Error ? e.message : e}`] };
@@ -7562,7 +7831,7 @@ function parseKiroSessionFile(options) {
   const errors = [];
   let parsed;
   try {
-    parsed = JSON.parse(readFileSync9(filePath, "utf-8"));
+    parsed = JSON.parse(readFileSync10(filePath, "utf-8"));
   } catch (e) {
     return { records, errors: [`${filePath}: ${e instanceof Error ? e.message : e}`] };
   }
@@ -7617,8 +7886,8 @@ function parseKiroWorkspaceSession(options) {
   const sessionId = parsed?.sessionId ?? extractSessionId2(filePath, "kiro");
   let sessionTs = now;
   try {
-    const dir = dirname4(filePath);
-    const sessionsJson = readFileSync9(join8(dir, "sessions.json"), "utf-8");
+    const dir = dirname5(filePath);
+    const sessionsJson = readFileSync10(join9(dir, "sessions.json"), "utf-8");
     const sessions = JSON.parse(sessionsJson);
     const match = Array.isArray(sessions) && sessions.find((s) => s.sessionId === sessionId);
     if (match?.dateCreated) {
@@ -7694,7 +7963,7 @@ async function runParse(db, filterTool, options) {
   const device = config?.device || hostname2() || state?.deviceInstanceId?.slice(0, 8) || "unknown";
   const deviceInstanceId = state?.deviceInstanceId ?? "unknown";
   const devicePlatform = config?.platform;
-  const watermarkPath = join8(AIUSAGE_DIR, "watermark.json");
+  const watermarkPath = join9(AIUSAGE_DIR, "watermark.json");
   const wm = new WatermarkManager(watermarkPath);
   const toolPaths = discoverLogFiles();
   const aggregator = new Aggregator();
@@ -7765,7 +8034,7 @@ async function runParse(db, filterTool, options) {
           continue;
         }
         if (tool === "kiro" && filePath.endsWith(".jsonl")) {
-          const content2 = readFileSync9(filePath, "utf-8");
+          const content2 = readFileSync10(filePath, "utf-8");
           const lines2 = content2.split("\n");
           let byteOffset2 = 0;
           for (const line of lines2) {
@@ -7895,7 +8164,7 @@ async function runParse(db, filterTool, options) {
           onProgress({ phase: "Parsing logs", tool, current: toolIndex, total: toolTotal, records: parsedCount, toolCalls: toolCallCount });
           continue;
         }
-        const content = readFileSync9(filePath, "utf-8");
+        const content = readFileSync10(filePath, "utf-8");
         const lines = content.split("\n");
         let byteOffset = 0;
         let fileCwd;
@@ -7959,7 +8228,7 @@ async function runParse(db, filterTool, options) {
           }
         }
         if (fileCwd) {
-          db.prepare(`UPDATE records SET cwd = ? WHERE source_file = ? AND cwd = ''`).run(fileCwd, filePath);
+          db.prepare(`UPDATE records SET cwd = ?, updated_at = ? WHERE source_file = ? AND cwd = ''`).run(fileCwd, Date.now(), filePath);
         }
         wm.setEntry(tool, filePath, {
           offset: stat2.size,
@@ -7974,7 +8243,7 @@ async function runParse(db, filterTool, options) {
     }
   }
   const openCodeDbPath = options?.openCodeDbPath ?? getDbPath("opencode") ?? "";
-  if ((!filterTool || filterTool === "opencode") && existsSync9(openCodeDbPath)) {
+  if ((!filterTool || filterTool === "opencode") && existsSync10(openCodeDbPath)) {
     try {
       const openCodeDb = new Database2(openCodeDbPath, { readonly: true });
       try {
@@ -8005,7 +8274,7 @@ async function runParse(db, filterTool, options) {
     }
   }
   const hermesDbPath = options?.hermesDbPath ?? getDbPath("hermes") ?? "";
-  if ((!filterTool || filterTool === "hermes") && existsSync9(hermesDbPath)) {
+  if ((!filterTool || filterTool === "hermes") && existsSync10(hermesDbPath)) {
     try {
       const hermesDb = new Database2(hermesDbPath, { readonly: true });
       try {
@@ -8036,7 +8305,7 @@ async function runParse(db, filterTool, options) {
     }
   }
   const qoderDbPath = options?.qoderDbPath ?? getDbPath("qoder-db") ?? "";
-  if ((!filterTool || filterTool === "qoder") && existsSync9(qoderDbPath)) {
+  if ((!filterTool || filterTool === "qoder") && existsSync10(qoderDbPath)) {
     try {
       const qoderDb = new Database2(qoderDbPath, { readonly: true });
       try {
@@ -8067,7 +8336,7 @@ async function runParse(db, filterTool, options) {
     }
   }
   const cursorDbPath = options?.cursorDbPath ?? getDbPath("cursor") ?? "";
-  if ((!filterTool || filterTool === "cursor") && existsSync9(cursorDbPath)) {
+  if ((!filterTool || filterTool === "cursor") && existsSync10(cursorDbPath)) {
     try {
       const cursorDb = new Database2(cursorDbPath, { readonly: true });
       try {
@@ -8097,7 +8366,7 @@ async function runParse(db, filterTool, options) {
     }
   }
   const kiloDbPath = getDbPath("kilocode-db") ?? "";
-  if ((!filterTool || filterTool === "kilocode") && existsSync9(kiloDbPath)) {
+  if ((!filterTool || filterTool === "kilocode") && existsSync10(kiloDbPath)) {
     try {
       const kiloDb = new Database2(kiloDbPath, { readonly: true });
       try {
@@ -8137,7 +8406,7 @@ async function runParse(db, filterTool, options) {
     }
   }
   const gooseDbPath = getDbPath("goose") ?? "";
-  if ((!filterTool || filterTool === "goose") && existsSync9(gooseDbPath)) {
+  if ((!filterTool || filterTool === "goose") && existsSync10(gooseDbPath)) {
     try {
       const gooseDb = new Database2(gooseDbPath, { readonly: true });
       try {
@@ -8195,7 +8464,7 @@ async function runParse(db, filterTool, options) {
     }
   }
   const zedDbPath = getDbPath("zed") ?? "";
-  if ((!filterTool || filterTool === "zed") && existsSync9(zedDbPath)) {
+  if ((!filterTool || filterTool === "zed") && existsSync10(zedDbPath)) {
     try {
       const zedDb = new Database2(zedDbPath, { readonly: true });
       try {
@@ -8225,7 +8494,7 @@ async function runParse(db, filterTool, options) {
   }
   if (!filterTool || filterTool === "zcode") {
     const zcodeDbPath = getDbPath("zcode") ?? "";
-    if (existsSync9(zcodeDbPath)) {
+    if (existsSync10(zcodeDbPath)) {
       try {
         const zcodeDb = new Database2(zcodeDbPath, { readonly: true });
         try {
@@ -8284,6 +8553,31 @@ async function runParse(db, filterTool, options) {
     }
     onProgress({ phase: "Parsing SQLite", tool: "trae", current: 1, total: 1, records: parsedCount, toolCalls: toolCallCount });
   }
+  const codeBuddyIdeDir = getDbPath("codebuddy-ide") ?? "";
+  if ((!filterTool || filterTool === "codebuddy") && existsSync10(codeBuddyIdeDir)) {
+    try {
+      const cbCursor = wm.getCodeBuddyIdeCursor();
+      const result = runParseCodeBuddy({
+        dataDir: codeBuddyIdeDir,
+        device,
+        deviceInstanceId,
+        platform: devicePlatform,
+        now: Date.now(),
+        cursor: cbCursor,
+        exchangeRate
+      });
+      for (const record of result.records) insertRecord(db, record);
+      parsedCount += result.records.length;
+      errors.push(...result.errors);
+      if (result.nextCursor > cbCursor) {
+        wm.setCodeBuddyIdeCursor(result.nextCursor);
+        wm.save();
+      }
+      onProgress({ phase: "Parsing logs", tool: "codebuddy", current: 1, total: 1, records: parsedCount, toolCalls: toolCallCount });
+    } catch (e) {
+      errors.push(`${codeBuddyIdeDir}: ${e instanceof Error ? e.message : e}`);
+    }
+  }
   if (deviceInstanceId !== "unknown") {
     db.prepare(
       `UPDATE records SET device_instance_id = ?, device = ? WHERE device_instance_id = 'unknown'`
@@ -8295,9 +8589,19 @@ async function runParse(db, filterTool, options) {
     ).run(devicePlatform);
   }
   backfillHermesSourceFiles(db);
+  backfillCwd(db);
+  backfillSkillNames(db);
+  backfillCodexModels(db);
+  backfillMissingToolCalls(db, exchangeRate);
+  return { parsedCount, toolCallCount, errors };
+}
+function backfillCwd(db) {
   const staleFiles = db.prepare(
     `SELECT DISTINCT source_file FROM records WHERE cwd = '' AND source_file NOT LIKE 'synced/%'`
   ).all();
+  const updateStmt = db.prepare(
+    `UPDATE records SET cwd = ?, updated_at = ? WHERE source_file = ? AND cwd = ''`
+  );
   for (const { source_file } of staleFiles) {
     try {
       const fd = openSync(source_file, "r");
@@ -8308,15 +8612,11 @@ async function runParse(db, filterTool, options) {
       const data = JSON.parse(firstLine);
       const cwd = extractCwdFromJson(data);
       if (cwd) {
-        db.prepare(`UPDATE records SET cwd = ? WHERE source_file = ? AND cwd = ''`).run(cwd, source_file);
+        updateStmt.run(cwd, Date.now(), source_file);
       }
     } catch {
     }
   }
-  backfillSkillNames(db);
-  backfillCodexModels(db);
-  backfillMissingToolCalls(db, exchangeRate);
-  return { parsedCount, toolCallCount, errors };
 }
 function backfillHermesSourceFiles(db) {
   const rows = db.prepare(`
@@ -8330,7 +8630,7 @@ function backfillHermesSourceFiles(db) {
   const dbPath = rows[0].source_file;
   let titleMap = /* @__PURE__ */ new Map();
   try {
-    if (existsSync9(dbPath)) {
+    if (existsSync10(dbPath)) {
       const hermesDb = new Database2(dbPath, { readonly: true });
       try {
         const sessions = hermesDb.prepare(
@@ -8343,11 +8643,11 @@ function backfillHermesSourceFiles(db) {
     }
   } catch {
   }
-  const updateStmt = db.prepare(`UPDATE records SET source_file = ? WHERE tool = 'hermes' AND session_id = ? AND source_file = ?`);
+  const updateStmt = db.prepare(`UPDATE records SET source_file = ?, updated_at = ? WHERE tool = 'hermes' AND session_id = ? AND source_file = ?`);
   for (const row of rows) {
     const title = (titleMap.get(row.session_id) || "").replace(/[/\\:]/g, "_").slice(0, 80);
     const newSourceFile = title ? `${row.source_file}:session:${row.session_id}:${title}` : `${row.source_file}:session:${row.session_id}`;
-    updateStmt.run(newSourceFile, row.session_id, row.source_file);
+    updateStmt.run(newSourceFile, Date.now(), row.session_id, row.source_file);
   }
 }
 function backfillSkillNames(db) {
@@ -8411,7 +8711,7 @@ function backfillCodexModels(db) {
   );
   for (const [sourceFile, fileRows] of byFile) {
     try {
-      const content = readFileSync9(sourceFile, "utf-8");
+      const content = readFileSync10(sourceFile, "utf-8");
       const lines = content.split("\n");
       const offsetToModel = /* @__PURE__ */ new Map();
       let currentModel = "";
@@ -8459,7 +8759,7 @@ function backfillMissingToolCalls(db, exchangeRate) {
   }
   for (const [sourceFile, fileRows] of rowsByFile) {
     try {
-      const content = readFileSync9(sourceFile, "utf-8");
+      const content = readFileSync10(sourceFile, "utf-8");
       const lines = content.split("\n");
       const aggregator = new Aggregator();
       const recordIdByOffset = /* @__PURE__ */ new Map();
@@ -8521,7 +8821,7 @@ function deriveSessionId(tool, sourceFile) {
 }
 
 // src/commands/sync.ts
-import { join as join10 } from "path";
+import { join as join11 } from "path";
 
 // src/db/synced-records.ts
 function insertSyncedRecord(db, record) {
@@ -8954,10 +9254,10 @@ async function cloudClear() {
 }
 function getClientVersion() {
   try {
-    const { readFileSync: readFileSync13 } = __require("fs");
-    const { join: join17 } = __require("path");
-    const pkgPath = join17(__dirname, "../../package.json");
-    const pkg = JSON.parse(readFileSync13(pkgPath, "utf-8"));
+    const { readFileSync: readFileSync14 } = __require("fs");
+    const { join: join18 } = __require("path");
+    const pkgPath = join18(__dirname, "../../package.json");
+    const pkg = JSON.parse(readFileSync14(pkgPath, "utf-8"));
     return pkg.version || "0.0.0";
   } catch {
     return "0.0.0";
@@ -9048,7 +9348,7 @@ var CloudSyncOrchestrator = class {
 import { execFile } from "child_process";
 import { promisify } from "util";
 import { readFile, writeFile, mkdir, readdir, stat, unlink, rm } from "fs/promises";
-import { join as join9 } from "path";
+import { join as join10 } from "path";
 var exec = promisify(execFile);
 var GitSyncBackend = class _GitSyncBackend {
   repo;
@@ -9060,7 +9360,7 @@ var GitSyncBackend = class _GitSyncBackend {
     this.repo = config.repo;
     this.token = config.token;
     this.cacheDir = config.cacheDir;
-    this.dataDir = join9(config.cacheDir, "data");
+    this.dataDir = join10(config.cacheDir, "data");
     this.branch = config.branch ?? "main";
   }
   get remoteUrl() {
@@ -9092,7 +9392,7 @@ var GitSyncBackend = class _GitSyncBackend {
   /** Clone or pull the repo to get latest remote state */
   async prepare() {
     try {
-      await stat(join9(this.cacheDir, ".git"));
+      await stat(join10(this.cacheDir, ".git"));
       await this.git(["fetch", "origin", this.branch, "--depth=1"]);
       await this.git(["reset", "--hard", `origin/${this.branch}`]);
     } catch {
@@ -9109,15 +9409,15 @@ var GitSyncBackend = class _GitSyncBackend {
   }
   async readFile(path3) {
     try {
-      const fullPath = join9(this.dataDir, path3);
+      const fullPath = join10(this.dataDir, path3);
       return await readFile(fullPath, "utf-8");
     } catch {
       return null;
     }
   }
   async writeFile(path3, content) {
-    const fullPath = join9(this.dataDir, path3);
-    await mkdir(join9(fullPath, ".."), { recursive: true });
+    const fullPath = join10(this.dataDir, path3);
+    await mkdir(join10(fullPath, ".."), { recursive: true });
     await writeFile(fullPath, content, "utf-8");
   }
   async listFiles() {
@@ -9128,7 +9428,7 @@ var GitSyncBackend = class _GitSyncBackend {
     }
   }
   async deleteFile(path3) {
-    const fullPath = join9(this.dataDir, path3);
+    const fullPath = join10(this.dataDir, path3);
     try {
       await unlink(fullPath);
     } catch {
@@ -9167,7 +9467,7 @@ var GitSyncBackend = class _GitSyncBackend {
     for (const entry of entries) {
       const relPath = prefix ? `${prefix}/${entry.name}` : entry.name;
       if (entry.isDirectory()) {
-        files.push(...await this.walkDir(join9(dir, entry.name), relPath));
+        files.push(...await this.walkDir(join10(dir, entry.name), relPath));
       } else if (entry.name.endsWith(".ndjson")) {
         files.push(relPath);
       }
@@ -9301,7 +9601,7 @@ function createBackend(config) {
     return new GitSyncBackend({
       repo: sync.repo,
       token,
-      cacheDir: join10(AIUSAGE_DIR, "sync-repo")
+      cacheDir: join11(AIUSAGE_DIR, "sync-repo")
     });
   }
   if (sync.backend === "s3") {
@@ -9396,8 +9696,8 @@ async function runSync(db, options) {
 }
 
 // src/commands/clean.ts
-import { unlinkSync as unlinkSync3, existsSync as existsSync10 } from "fs";
-import { join as join11 } from "path";
+import { unlinkSync as unlinkSync3, existsSync as existsSync11 } from "fs";
+import { join as join12 } from "path";
 function cleanOldData(db, days) {
   const cutoff = Date.now() - days * 864e5;
   const recordsResult = db.prepare("DELETE FROM records WHERE ts < ?").run(cutoff);
@@ -9418,9 +9718,9 @@ function cleanAll(db) {
   const syncedResult = db.prepare("DELETE FROM synced_records").run();
   const syncStateResult = db.prepare("DELETE FROM sync_record_state").run();
   const tombstonesResult = db.prepare("DELETE FROM sync_tombstones").run();
-  const watermarkPath = join11(AIUSAGE_DIR, "watermark.json");
+  const watermarkPath = join12(AIUSAGE_DIR, "watermark.json");
   let watermarkRemoved = false;
-  if (existsSync10(watermarkPath)) {
+  if (existsSync11(watermarkPath)) {
     unlinkSync3(watermarkPath);
     watermarkRemoved = true;
   }
@@ -9455,7 +9755,7 @@ function createBackend2(config) {
     return new GitSyncBackend({
       repo: config.sync.repo,
       token,
-      cacheDir: join11(AIUSAGE_DIR, "sync-repo")
+      cacheDir: join12(AIUSAGE_DIR, "sync-repo")
     });
   }
   if (config.sync.backend === "s3") {
@@ -9788,7 +10088,7 @@ var RuntimeSettingsController = class {
 
 // src/commands/serve.ts
 var MAX_PORT_ATTEMPTS = 10;
-var PORT_FILE = join12(AIUSAGE_DIR, ".serve-port");
+var PORT_FILE = join13(AIUSAGE_DIR, ".serve-port");
 var MIME_TYPES = {
   ".html": "text/html",
   ".js": "application/javascript",
@@ -9863,11 +10163,11 @@ function serve(options) {
     getDbWriteQueueStatus: () => dbWriteQueue.getStatus()
   });
   const webBuildDir = (() => {
-    const prodDir = join12(dirname5(fileURLToPath(import.meta.url)), "web");
-    if (existsSync11(prodDir)) return prodDir;
-    return join12(dirname5(fileURLToPath(import.meta.url)), "..", "..", "..", "web", "build");
+    const prodDir = join13(dirname6(fileURLToPath(import.meta.url)), "web");
+    if (existsSync12(prodDir)) return prodDir;
+    return join13(dirname6(fileURLToPath(import.meta.url)), "..", "..", "..", "web", "build");
   })();
-  if (!existsSync11(webBuildDir)) {
+  if (!existsSync12(webBuildDir)) {
     console.error("Web dashboard not found. Reinstall the package: npm install -g @juliantanx/aiusage");
     process.exit(1);
   }
@@ -9877,19 +10177,19 @@ function serve(options) {
       apiServer.emit("request", req, res);
       return;
     }
-    if (existsSync11(webBuildDir)) {
-      let filePath = join12(webBuildDir, url.pathname);
+    if (existsSync12(webBuildDir)) {
+      let filePath = join13(webBuildDir, url.pathname);
       try {
         if (statSync4(filePath).isDirectory()) {
-          filePath = join12(filePath, "index.html");
+          filePath = join13(filePath, "index.html");
         }
       } catch {
       }
-      if (!existsSync11(filePath)) {
-        filePath = join12(webBuildDir, "index.html");
+      if (!existsSync12(filePath)) {
+        filePath = join13(webBuildDir, "index.html");
       }
       try {
-        const content = readFileSync10(filePath);
+        const content = readFileSync11(filePath);
         const ext = extname2(filePath);
         const contentType = MIME_TYPES[ext] ?? "application/octet-stream";
         res.writeHead(200, { "Content-Type": contentType });
@@ -10071,9 +10371,9 @@ Consent recorded for schema v1.`
 }
 
 // src/commands/status.ts
-import { statSync as statSync5, existsSync as existsSync12 } from "fs";
+import { statSync as statSync5, existsSync as existsSync13 } from "fs";
 import { hostname as hostname3 } from "os";
-import { join as join13 } from "path";
+import { join as join14 } from "path";
 function formatFileSize(bytes) {
   if (bytes < 1024) return `${bytes} B`;
   if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`;
@@ -10091,9 +10391,9 @@ function generateStatus(db) {
   const schemaVersion = db.prepare("SELECT version FROM schema_version ORDER BY version DESC LIMIT 1").get()?.version ?? 0;
   const tableCount = db.prepare("SELECT COUNT(*) as count FROM sqlite_master WHERE type = 'table' AND name NOT LIKE 'sqlite_%'").get()?.count ?? 0;
   const viewCount = db.prepare("SELECT COUNT(*) as count FROM sqlite_master WHERE type = 'view'").get()?.count ?? 0;
-  const sizePath = join13(AIUSAGE_DIR, "cache.db");
+  const sizePath = join14(AIUSAGE_DIR, "cache.db");
   let databaseSize = "0 B";
-  if (existsSync12(sizePath)) {
+  if (existsSync13(sizePath)) {
     try {
       const stat2 = statSync5(sizePath);
       databaseSize = formatFileSize(stat2.size);
@@ -10316,10 +10616,10 @@ var SyncProgressReporter = class {
 };
 
 // src/commands/widget.ts
-import { existsSync as existsSync13, readFileSync as readFileSync11 } from "fs";
+import { existsSync as existsSync14, readFileSync as readFileSync12 } from "fs";
 import { spawn, execSync as execSync2 } from "child_process";
-import { join as join14 } from "path";
-var WIDGET_PID_PATH = join14(AIUSAGE_DIR, "widget.pid");
+import { join as join15 } from "path";
+var WIDGET_PID_PATH = join15(AIUSAGE_DIR, "widget.pid");
 async function launchWidget() {
   if (isWidgetRunning()) {
     console.log("aiusage widget is already running in the system tray.");
@@ -10341,10 +10641,10 @@ async function launchWidget() {
   console.log("aiusage widget started.");
 }
 function isWidgetRunning() {
-  if (!existsSync13(WIDGET_PID_PATH)) return false;
+  if (!existsSync14(WIDGET_PID_PATH)) return false;
   let pid;
   try {
-    pid = parseInt(readFileSync11(WIDGET_PID_PATH, "utf-8").trim(), 10);
+    pid = parseInt(readFileSync12(WIDGET_PID_PATH, "utf-8").trim(), 10);
   } catch {
     return false;
   }
@@ -10388,10 +10688,10 @@ function getDeviceName2() {
 }
 function getCliVersion2() {
   try {
-    const { readFileSync: readFileSync13 } = __require("fs");
-    const { join: join17 } = __require("path");
-    const pkgPath = join17(__dirname, "../../package.json");
-    const pkg = JSON.parse(readFileSync13(pkgPath, "utf-8"));
+    const { readFileSync: readFileSync14 } = __require("fs");
+    const { join: join18 } = __require("path");
+    const pkgPath = join18(__dirname, "../../package.json");
+    const pkg = JSON.parse(readFileSync14(pkgPath, "utf-8"));
     return pkg.version || "0.0.0";
   } catch {
     return "0.0.0";
@@ -10560,8 +10860,8 @@ function formatTokens(value) {
   return Number(value).toLocaleString();
 }
 function formatCost(value) {
-  const num3 = Number(value);
-  return Number.isFinite(num3) ? `$${num3.toFixed(4)}` : "$0.0000";
+  const num4 = Number(value);
+  return Number.isFinite(num4) ? `$${num4.toFixed(4)}` : "$0.0000";
 }
 function formatUpdatedAt(value) {
   const date = new Date(value);
@@ -10635,16 +10935,16 @@ async function runLeaderboardView(options = {}) {
 // src/commands/menu.ts
 import { createInterface } from "readline";
 import { spawn as spawn2, spawnSync as spawnSync2, execSync as execSync4 } from "child_process";
-import { existsSync as existsSync14, readFileSync as readFileSync12 } from "fs";
-import { join as join15 } from "path";
+import { existsSync as existsSync15, readFileSync as readFileSync13 } from "fs";
+import { join as join16 } from "path";
 var DEFAULT_PORT = 3847;
-var PORT_FILE2 = join15(AIUSAGE_DIR, ".serve-port");
+var PORT_FILE2 = join16(AIUSAGE_DIR, ".serve-port");
 function clearScreen() {
   process.stdout.write("\x1Bc");
 }
 function getPort() {
-  if (existsSync14(PORT_FILE2)) {
-    const raw = readFileSync12(PORT_FILE2, "utf-8").trim();
+  if (existsSync15(PORT_FILE2)) {
+    const raw = readFileSync13(PORT_FILE2, "utf-8").trim();
     const n = parseInt(raw, 10);
     if (!isNaN(n) && n > 0) return n;
   }
@@ -11133,10 +11433,10 @@ ${dashboardStatusLine()}
 }
 
 // src/cli.ts
-import { join as join16 } from "path";
-var DB_PATH2 = join16(AIUSAGE_DIR, "cache.db");
+import { join as join17 } from "path";
+var DB_PATH2 = join17(AIUSAGE_DIR, "cache.db");
 var program = new Command();
-program.name("aiusage").version(true ? "1.5.7" : "dev").description("CLI tool for AI usage statistics");
+program.name("aiusage").version(true ? "1.5.8" : "dev").description("CLI tool for AI usage statistics");
 program.action(() => {
   const unknownCommand = program.args.find((arg) => typeof arg === "string");
   if (unknownCommand) {
@@ -11423,7 +11723,7 @@ function hasWidget() {
   }
 }
 function buildPm2Config(includeWidget) {
-  const wrapperPath = join16(AIUSAGE_DIR, "pm2-server.cjs");
+  const wrapperPath = join17(AIUSAGE_DIR, "pm2-server.cjs");
   writeFileSync7(wrapperPath, [
     `// Auto-generated by aiusage pm2-start \u2014 do not edit`,
     `const { execSync, spawn } = require('child_process')`,
@@ -11470,7 +11770,7 @@ ${apps.join(",\n")}
 program.command("pm2-setup").description("Generate ecosystem.config.cjs for PM2 background services").option("--server-only", "Only include server, skip widget").action((options) => {
   const includeWidget = options.serverOnly ? false : hasWidget();
   const config = buildPm2Config(includeWidget);
-  const configPath = join16(AIUSAGE_DIR, "ecosystem.config.cjs");
+  const configPath = join17(AIUSAGE_DIR, "ecosystem.config.cjs");
   writeFileSync7(configPath, config, "utf-8");
   console.log(`Config created: ${configPath}`);
   if (!includeWidget) {
@@ -11480,7 +11780,7 @@ program.command("pm2-setup").description("Generate ecosystem.config.cjs for PM2
 program.command("pm2-start").description("Setup and start PM2 background services (requires pm2 installed globally)").option("--server-only", "Only start server, skip widget").action((options) => {
   const includeWidget = options.serverOnly ? false : hasWidget();
   const config = buildPm2Config(includeWidget);
-  const configPath = join16(AIUSAGE_DIR, "ecosystem.config.cjs");
+  const configPath = join17(AIUSAGE_DIR, "ecosystem.config.cjs");
   writeFileSync7(configPath, config, "utf-8");
   console.log(`Config: ${configPath}`);
   try {