@vibe-cafe/vibe-usage 0.9.3 → 0.9.5

package/README.md

@@ -63,7 +63,7 @@ npx @vibe-cafe/vibe-usage status       # Show config & detected tools
 | Amp | `~/.local/share/amp/threads/` |
 | Droid | `~/.factory/sessions/` |
 | Hermes | `~/.hermes/state.db` + `~/.hermes/profiles/<name>/state.db` (SQLite, multi-profile) |
-| Kiro | `~/Library/Application Support/Kiro/User/globalStorage/kiro.kiroagent/dev_data/devdata.sqlite` (SQLite, JSONL fallback; model name resolved from `.chat` timeline) |
+| Kiro | `~/Library/Application Support/Kiro/logs/**/kiro.kiroAgent/q-client.log` (`GetUsageLimitsCommand` credit snapshots; emits incremental `kiro-credits`, because Kiro bills by Credits / `INVOCATIONS`, not local model tokens). Legacy `dev_data/devdata.sqlite` token telemetry is available only with `VIBE_USAGE_KIRO_LEGACY_TOKENS=1` |
 | Cline | `<host>/User/globalStorage/saoudrizwan.claude-dev/{state/taskHistory.json,tasks/<id>/ui_messages.json}` (walks all VSCode-fork hosts: Code, Cursor, Windsurf, VSCodium, Trae, ...) |
 | Roo Code | `<host>/User/globalStorage/rooveterinaryinc.roo-cline/{tasks/_index.json,tasks/<id>/{history_item,ui_messages}.json}` (walks all VSCode-fork hosts) |
 | Antigravity | `~/.gemini/antigravity/conversations/*.pb` to discover cascades, then reads token usage + sessions from the running language server via Connect RPC (process discovered with `ps`/`lsof` on macOS/Linux, PowerShell CIM with a `wmic` fallback on Windows) |

package/package.json

@@ -1,8 +1,11 @@
 {
   "name": "@vibe-cafe/vibe-usage",
-  "version": "0.9.3",
+  "version": "0.9.5",
   "description": "Track your AI coding tool token usage and sync to vibecafe.ai",
   "type": "module",
+  "scripts": {
+    "test": "node --test"
+  },
   "bin": {
     "vibe-usage": "bin/vibe-usage.js"
   },

package/src/parsers/kimi-code.js

@@ -1,33 +1,209 @@
 import { readdirSync, readFileSync, existsSync } from 'node:fs';
-import { join } from 'node:path';
+import { join, basename } from 'node:path';
 import { homedir } from 'node:os';
 import { createHash } from 'node:crypto';
 import { aggregateToBuckets, extractSessions } from './index.js';
 
 /**
- * Kimi CLI parser (a.k.a. "Kimi Code"). MoonshotAI/kimi-cli.
+ * Kimi Code CLI parser. MoonshotAI/kimi-cli (a.k.a. "Kimi Code").
  *
- * Wire protocol JSONL at ~/.kimi/sessions/<md5(workdir)>/<session-id>/wire.jsonl
- * - First line is a metadata header: {"type":"metadata","protocol_version":"1.9"}
- * - Each subsequent line (1.9):  {"timestamp": <float seconds>, "message": {"type", "payload"}}
- * - Legacy 1.1 line:             {"type", "payload"}  (no message wrapper, ts may live in payload)
+ * Two on-disk layouts are supported:
  *
- * Token data: StatusUpdate.payload.token_usage
- *   = {input_other, output, input_cache_read, input_cache_creation}
+ * 1. Current ("~/.kimi-code", protocol >= 1.4). Sessions live at
+ *      ~/.kimi-code/sessions/wd_<slug>_<hash>/session_<id>/agents/<agentId>/wire.jsonl
+ *    Each line is a self-describing event with a top-level integer-ms `time`:
+ *      {"type":"usage.record","model":"kimi-code/kimi-for-coding",
+ *       "usage":{"inputOther","output","inputCacheRead","inputCacheCreation"},
+ *       "usageScope":"turn","time":<ms>}
+ *    `usage.record` events are per-step deltas (one per assistant step), so they
+ *    sum to the session total. The model name rides on each record — no config
+ *    lookup needed. User turns are `turn.prompt` with origin.kind === "user".
+ *    The real working directory per session is recorded in
+ *      ~/.kimi-code/session_index.jsonl  -> {sessionId, sessionDir, workDir}
+ *    which gives an accurate project name (last path component of workDir).
  *
- * Model name is NOT present on StatusUpdate events; we read it from
- * ~/.kimi/config.toml (default_model, falling back to first [models.X] table).
- *
- * Project name comes from ~/.kimi/kimi.json -> work_dirs[].path; the dir name
- * under sessions/ is md5(path).
+ * 2. Legacy ("~/.kimi", protocol 1.1 / 1.9). Sessions live at
+ *      ~/.kimi/sessions/<md5(workdir)>/<session-id>/wire.jsonl
+ *    with a different envelope (StatusUpdate.payload.token_usage, float-second
+ *    `timestamp`) and the model in ~/.kimi/config.toml. Kept for users who have
+ *    not migrated; see parseLegacyKimi() below.
+ */
+
+// ---------------------------------------------------------------------------
+// Current format: ~/.kimi-code
+// ---------------------------------------------------------------------------
+
+const KIMI_CODE_DIR = join(homedir(), '.kimi-code');
+const KIMI_CODE_SESSIONS_DIR = join(KIMI_CODE_DIR, 'sessions');
+const KIMI_CODE_SESSION_INDEX = join(KIMI_CODE_DIR, 'session_index.jsonl');
+
+function projectNameFromPath(path) {
+  if (typeof path !== 'string' || !path) return null;
+  return basename(path.replace(/[/\\]+$/, '')) || path;
+}
+
+/**
+ * Map each session directory (absolute path) to a project name, read from
+ * ~/.kimi-code/session_index.jsonl. Falls back gracefully if the file is
+ * missing or malformed — callers default to the wd_ bucket name.
  */
+function loadSessionIndex() {
+  const map = new Map();
+  if (!existsSync(KIMI_CODE_SESSION_INDEX)) return map;
+
+  let content;
+  try {
+    content = readFileSync(KIMI_CODE_SESSION_INDEX, 'utf-8');
+  } catch {
+    return map;
+  }
+
+  for (const line of content.split('\n')) {
+    if (!line.trim()) continue;
+    let entry;
+    try { entry = JSON.parse(line); } catch { continue; }
+    const dir = entry?.sessionDir;
+    const project = projectNameFromPath(entry?.workDir);
+    if (typeof dir === 'string' && dir && project) map.set(dir, project);
+  }
+  return map;
+}
+
+// Strip the trailing _<hash> from a "wd_<slug>_<hash>" bucket name so the slug
+// can serve as a last-resort project label when session_index has no entry.
+function projectFromBucketName(name) {
+  const m = /^wd_(.+)_[0-9a-f]+$/.exec(name);
+  return m ? m[1] : name;
+}
+
+// Collect every agents/<id>/wire.jsonl under sessions/wd_<...>/session_<...>/.
+function findKimiCodeWireFiles(baseDir) {
+  const results = [];
+  if (!existsSync(baseDir)) return results;
+
+  let workDirs;
+  try {
+    workDirs = readdirSync(baseDir, { withFileTypes: true });
+  } catch {
+    return results;
+  }
+
+  for (const workDir of workDirs) {
+    if (!workDir.isDirectory()) continue;
+    const workDirPath = join(baseDir, workDir.name);
+    const bucketProject = projectFromBucketName(workDir.name);
+
+    let sessions;
+    try {
+      sessions = readdirSync(workDirPath, { withFileTypes: true });
+    } catch {
+      continue;
+    }
+
+    for (const session of sessions) {
+      if (!session.isDirectory()) continue;
+      const sessionDir = join(workDirPath, session.name);
+      const agentsDir = join(sessionDir, 'agents');
+
+      let agents;
+      try {
+        agents = readdirSync(agentsDir, { withFileTypes: true });
+      } catch {
+        continue;
+      }
+
+      for (const agent of agents) {
+        if (!agent.isDirectory()) continue;
+        const wireFile = join(agentsDir, agent.name, 'wire.jsonl');
+        if (existsSync(wireFile)) {
+          results.push({ wireFile, sessionDir, bucketProject });
+        }
+      }
+    }
+  }
+  return results;
+}
+
+function parseKimiCode() {
+  const wireFiles = findKimiCodeWireFiles(KIMI_CODE_SESSIONS_DIR);
+  if (wireFiles.length === 0) return null;
+
+  const sessionIndex = loadSessionIndex();
+  const entries = [];
+  const sessionEvents = [];
+
+  for (const { wireFile, sessionDir, bucketProject } of wireFiles) {
+    let content;
+    try {
+      content = readFileSync(wireFile, 'utf-8');
+    } catch {
+      continue;
+    }
+
+    const project = sessionIndex.get(sessionDir) || bucketProject || 'unknown';
+
+    for (const line of content.split('\n')) {
+      if (!line.trim()) continue;
+      let evt;
+      try { evt = JSON.parse(line); } catch { continue; }
+
+      const type = evt.type;
+      // Top-level `time` is integer milliseconds since epoch.
+      const time = typeof evt.time === 'number' ? evt.time : null;
+
+      // Session timing: a user turn vs. anything the model emits.
+      if (type === 'turn.prompt' && evt.origin?.kind === 'user' && time) {
+        const ts = new Date(time);
+        if (!isNaN(ts.getTime())) {
+          sessionEvents.push({ sessionId: wireFile, source: 'kimi-code', project, timestamp: ts, role: 'user' });
+        }
+        continue;
+      }
+
+      if (type !== 'usage.record') continue;
+
+      const usage = evt.usage;
+      if (!usage) continue;
+
+      const inputTokens = usage.inputOther || 0;
+      const outputTokens = usage.output || 0;
+      const cachedInputTokens = usage.inputCacheRead || 0;
+      if (!inputTokens && !outputTokens && !cachedInputTokens) continue;
+
+      const ts = time ? new Date(time) : new Date();
+
+      entries.push({
+        source: 'kimi-code',
+        model: evt.model || 'unknown',
+        project,
+        timestamp: ts,
+        inputTokens,
+        outputTokens,
+        cachedInputTokens,
+        reasoningOutputTokens: 0,
+      });
+
+      // Each usage.record marks an assistant step completing — use it as an
+      // assistant timing event so active-time math has both sides of a turn.
+      if (time && !isNaN(ts.getTime())) {
+        sessionEvents.push({ sessionId: wireFile, source: 'kimi-code', project, timestamp: ts, role: 'assistant' });
+      }
+    }
+  }
+
+  return { buckets: aggregateToBuckets(entries), sessions: extractSessions(sessionEvents) };
+}
+
+// ---------------------------------------------------------------------------
+// Legacy format: ~/.kimi  (kept for users who haven't migrated to ~/.kimi-code)
+// ---------------------------------------------------------------------------
 
 const KIMI_DIR = join(homedir(), '.kimi');
 const KIMI_SESSIONS_DIR = join(KIMI_DIR, 'sessions');
 const KIMI_WORKDIRS_JSON = join(KIMI_DIR, 'kimi.json');
 const KIMI_CONFIG_TOML = join(KIMI_DIR, 'config.toml');
 
-function findWireFiles(baseDir) {
+function findLegacyWireFiles(baseDir) {
   const results = [];
   if (!existsSync(baseDir)) return results;
 
@@ -54,12 +230,7 @@ function findWireFiles(baseDir) {
   return results;
 }
 
-function projectNameFromPath(path) {
-  const parts = path.split('/').filter(Boolean);
-  return parts[parts.length - 1] || path;
-}
-
-function loadProjectMap() {
+function loadLegacyProjectMap() {
   const map = new Map();
   if (!existsSync(KIMI_WORKDIRS_JSON)) return map;
 
@@ -70,7 +241,6 @@ function loadProjectMap() {
     return map;
   }
 
-  // 1.9 schema: { work_dirs: [{ path, kaos, last_session_id }] }
   if (Array.isArray(config.work_dirs)) {
     for (const entry of config.work_dirs) {
       const path = entry?.path;
@@ -80,7 +250,6 @@ function loadProjectMap() {
     }
   }
 
-  // Legacy schemas keyed by hash
   for (const key of ['workspaces', 'projects']) {
     const obj = config[key];
     if (!obj || typeof obj !== 'object') continue;
@@ -93,13 +262,10 @@ function loadProjectMap() {
   return map;
 }
 
-// Matches both bare-key `[models.kimi-for-coding]` and quoted
-// `[models."kimi-code/kimi-for-coding"]` forms (TOML bare keys can't
-// contain `/`, so quoting is mandatory for hierarchical names).
 const TOML_MODEL_SECTION_RE = /^\s*\[models\.(?:"([^"]+)"|([A-Za-z0-9_-]+))\]/m;
 const TOML_DEFAULT_MODEL_RE = /^\s*default_model\s*=\s*["']([^"']+)["']/m;
 
-function loadModelFromConfig() {
+function loadLegacyModelFromConfig() {
   if (!existsSync(KIMI_CONFIG_TOML)) return 'unknown';
 
   let content;
@@ -118,14 +284,14 @@ function loadModelFromConfig() {
   return 'unknown';
 }
 
-const USER_EVENT_TYPES = new Set(['TurnBegin', 'UserMessage', 'user_message', 'Input']);
+const LEGACY_USER_EVENT_TYPES = new Set(['TurnBegin', 'UserMessage', 'user_message', 'Input']);
 
-export async function parse() {
-  const wireFiles = findWireFiles(KIMI_SESSIONS_DIR);
+function parseLegacyKimi() {
+  const wireFiles = findLegacyWireFiles(KIMI_SESSIONS_DIR);
   if (wireFiles.length === 0) return { buckets: [], sessions: [] };
 
-  const projectMap = loadProjectMap();
-  const defaultModel = loadModelFromConfig();
+  const projectMap = loadLegacyProjectMap();
+  const defaultModel = loadLegacyModelFromConfig();
   const entries = [];
   const sessionEvents = [];
   const seenMessageIds = new Set();
@@ -147,15 +313,11 @@ export async function parse() {
       let raw;
       try { raw = JSON.parse(line); } catch { continue; }
 
-      // Unwrap 1.9 envelope; fall through to top-level for legacy 1.1.
-      // Metadata header line has no payload and is filtered by the next check.
       const envelope = raw.message || raw;
       const type = envelope.type || raw.type;
       const payload = envelope.payload || raw.payload;
       if (!payload) continue;
 
-      // 1.9 puts timestamp at the outer level (Unix seconds, float).
-      // Legacy 1.1 sometimes puts it inside payload.
       if (typeof raw.timestamp === 'number') {
         lastTimestamp = raw.timestamp * 1000;
       } else if (typeof payload.timestamp === 'number') {
@@ -171,7 +333,7 @@ export async function parse() {
             source: 'kimi-code',
             project,
             timestamp: evTs,
-            role: USER_EVENT_TYPES.has(type) ? 'user' : 'assistant',
+            role: LEGACY_USER_EVENT_TYPES.has(type) ? 'user' : 'assistant',
           });
         }
       }
@@ -205,3 +367,11 @@ export async function parse() {
 
   return { buckets: aggregateToBuckets(entries), sessions: extractSessions(sessionEvents) };
 }
+
+export async function parse() {
+  // Prefer the current ~/.kimi-code layout; fall back to legacy ~/.kimi only
+  // when no kimi-code sessions exist, so migrated users aren't double-counted.
+  const current = parseKimiCode();
+  if (current) return current;
+  return parseLegacyKimi();
+}

package/src/parsers/kiro.js

@@ -1,5 +1,6 @@
 import {
   copyFileSync,
+  createReadStream,
   existsSync,
   mkdtempSync,
   readFileSync,
@@ -7,23 +8,30 @@ import {
   rmSync,
   statSync,
 } from 'node:fs';
-import { join, resolve } from 'node:path';
+import { createInterface } from 'node:readline';
+import { dirname, join, resolve } from 'node:path';
 import { homedir, tmpdir } from 'node:os';
 import { aggregateToBuckets } from './index.js';
 import { queryDbJson } from './sqlite.js';
 
-const KIROAGENT_RELATIVE = join('User', 'globalStorage', 'kiro.kiroagent');
+const KIRO_AGENT_RELATIVE = join('User', 'globalStorage', 'kiro.kiroagent');
+const KIRO_USER_RELATIVE = 'User';
+const CREDIT_MODEL = 'kiro-credits';
 
-function getDefaultBasePath() {
+function getDefaultAppPath() {
   if (process.platform === 'darwin') {
-    return join(homedir(), 'Library', 'Application Support', 'Kiro', KIROAGENT_RELATIVE);
+    return join(homedir(), 'Library', 'Application Support', 'Kiro');
   }
   if (process.platform === 'win32') {
     const appData = process.env.APPDATA?.trim() || join(homedir(), 'AppData', 'Roaming');
-    return join(appData, 'Kiro', KIROAGENT_RELATIVE);
+    return join(appData, 'Kiro');
   }
   const xdgConfigHome = process.env.XDG_CONFIG_HOME?.trim() || join(homedir(), '.config');
-  return join(xdgConfigHome, 'Kiro', KIROAGENT_RELATIVE);
+  return join(xdgConfigHome, 'Kiro');
+}
+
+function getDefaultUserPath() {
+  return join(getDefaultAppPath(), KIRO_USER_RELATIVE);
 }
 
 export function getKiroBasePath() {
@@ -32,7 +40,25 @@ export function getKiroBasePath() {
     const r = resolve(explicit);
     return existsSync(r) ? r : null;
   }
-  const def = getDefaultBasePath();
+  const def = join(getDefaultAppPath(), KIRO_AGENT_RELATIVE);
+  return existsSync(def) ? def : null;
+}
+
+export function getKiroUserPath() {
+  const explicitUser = process.env.KIRO_USER_PATH?.trim();
+  if (explicitUser) {
+    const r = resolve(explicitUser);
+    return existsSync(r) ? r : null;
+  }
+
+  const explicitBase = process.env.KIRO_BASE_PATH?.trim();
+  if (explicitBase) {
+    const base = resolve(explicitBase);
+    const userPath = resolve(base, '..', '..');
+    return existsSync(userPath) ? userPath : null;
+  }
+
+  const def = getDefaultUserPath();
   return existsSync(def) ? def : null;
 }
 
@@ -50,12 +76,11 @@ const TOKENS_SQL =
   'WHERE tokens_prompt > 0 OR tokens_generated > 0 ' +
   'ORDER BY id ASC';
 
-function readDb(dbPath) {
+function readLegacyDb(dbPath) {
   try {
     return queryDb(dbPath, TOKENS_SQL);
   } catch (err) {
     if (!isLockError(err)) throw err;
-    // Kiro app holds a write lock; snapshot WAL set to a temp dir and retry.
     const snapshotDir = mkdtempSync(join(tmpdir(), 'vibe-usage-kiro-'));
     const queryPath = join(snapshotDir, 'devdata.sqlite');
     copyFileSync(dbPath, queryPath);
@@ -71,10 +96,10 @@ function readDb(dbPath) {
   }
 }
 
-// JSONL fallback: tokens_generated.jsonl. Each line:
-// {"model":"agent","provider":"kiro","promptTokens":N,"generatedTokens":N}
-// No per-row timestamp — bucket all rows under the file mtime.
-function readJsonl(jsonlPath) {
+// Legacy Kiro dev telemetry fallback. This is opt-in because recent Kiro builds
+// bill by server-side credits, while this table is often empty, estimated, or
+// populated with placeholder model names such as "agent".
+function readLegacyJsonl(jsonlPath) {
   let raw;
   try { raw = readFileSync(jsonlPath, 'utf-8'); } catch { return []; }
   const lines = raw.split('\n').map(l => l.trim()).filter(Boolean);
@@ -88,7 +113,7 @@ function readJsonl(jsonlPath) {
       const obj = JSON.parse(lines[i]);
       rows.push({
         id: i + 1,
-        model: obj.model || 'agent',
+        model: obj.model || 'kiro-token-estimate',
         tokens_prompt: obj.promptTokens || 0,
         tokens_generated: obj.generatedTokens || 0,
         timestamp: ts,
@@ -100,102 +125,26 @@ function readJsonl(jsonlPath) {
   return rows;
 }
 
-// Walk workspace dirs under kiro.kiroagent/ and collect every .chat file's
-// modelId + start/end window. Used to attribute each tokens_generated row to
-// a real model (the SQLite `model` column is usually the literal "agent").
-function buildModelTimeline(base) {
-  const timeline = [];
-  let entries;
-  try { entries = readdirSync(base, { withFileTypes: true }); } catch { return timeline; }
-  for (const entry of entries) {
-    if (!entry.isDirectory() || entry.name === 'dev_data') continue;
-    const dirPath = join(base, entry.name);
-    let files;
-    try {
-      files = readdirSync(dirPath).filter(f => f.endsWith('.chat'));
-    } catch {
-      continue;
-    }
-    for (const file of files) {
-      try {
-        const data = JSON.parse(readFileSync(join(dirPath, file), 'utf-8'));
-        const meta = data?.metadata;
-        if (!meta?.modelId || !meta?.startTime) continue;
-        const startMs = Number(meta.startTime);
-        const endMs = Number(meta.endTime || meta.startTime);
-        if (!Number.isFinite(startMs) || !Number.isFinite(endMs)) continue;
-        timeline.push({ startMs, endMs, model: String(meta.modelId) });
-      } catch {
-        // skip unreadable / malformed chat files
-      }
-    }
-  }
-  timeline.sort((a, b) => a.startMs - b.startMs);
-  return timeline;
-}
-
-function resolveModel(timeline, ts) {
-  if (!timeline.length || !ts) return null;
-  const t = ts.getTime();
-  if (!Number.isFinite(t)) return null;
-  let best = null;
-  let bestDist = Infinity;
-  for (const e of timeline) {
-    if (t >= e.startMs && t <= e.endMs) return e.model;
-    const d = Math.min(Math.abs(t - e.startMs), Math.abs(t - e.endMs));
-    if (d < bestDist) { bestDist = d; best = e.model; }
-  }
-  // 10-minute tolerance — beyond that, treat as no match.
-  return bestDist < 10 * 60 * 1000 ? best : null;
+function parseDbTimestamp(value) {
+  if (!value) return null;
+  const s = String(value).trim();
+  const hasZone = /(?:Z|[+-]\d\d:?\d\d)$/.test(s);
+  const d = new Date(hasZone ? s.replace(' ', 'T') : `${s.replace(' ', 'T')}Z`);
+  return isNaN(d.getTime()) ? null : d;
 }
 
-// "CLAUDE_SONNET_4_20250514_V1_0" -> "claude-sonnet-4"
-function normalizeModelName(raw) {
-  if (!raw || typeof raw !== 'string') return null;
-  const trimmed = raw.trim();
-  if (!trimmed) return null;
-  if (trimmed === trimmed.toLowerCase() && trimmed.includes('-')) return trimmed;
-  const cleaned = trimmed
+function normalizeLegacyModel(raw) {
+  const model = typeof raw === 'string' ? raw.trim() : '';
+  if (!model || model.toLowerCase() === 'agent') return 'kiro-token-estimate';
+  if (model === model.toLowerCase() && model.includes('-')) return model;
+  return model
     .replace(/_\d{8}_V\d+_\d+$/i, '')
     .replace(/_V\d+$/i, '')
     .toLowerCase()
-    .replace(/_/g, '-');
-  return cleaned || null;
+    .replace(/_/g, '-') || 'kiro-token-estimate';
 }
 
-function parseDbTimestamp(value) {
-  if (!value) return null;
-  // SQLite CURRENT_TIMESTAMP: "2026-01-09 15:25:30" (UTC, naive — append Z).
-  const d = new Date(String(value).trim().replace(' ', 'T') + 'Z');
-  return isNaN(d.getTime()) ? null : d;
-}
-
-export async function parse() {
-  const base = getKiroBasePath();
-  if (!base) return { buckets: [], sessions: [] };
-
-  const dbPath = join(base, 'dev_data', 'devdata.sqlite');
-  const jsonlPath = join(base, 'dev_data', 'tokens_generated.jsonl');
-
-  let rows;
-  try {
-    if (existsSync(dbPath)) {
-      rows = readDb(dbPath);
-    } else if (existsSync(jsonlPath)) {
-      rows = readJsonl(jsonlPath);
-    } else {
-      return { buckets: [], sessions: [] };
-    }
-  } catch (err) {
-    if (err && typeof err.message === 'string' && err.message.includes('ENOENT')) {
-      throw new Error('sqlite3 CLI not found. Install sqlite3 (or use Node >= 22.5) to sync Kiro data.');
-    }
-    throw err;
-  }
-
-  if (!rows.length) return { buckets: [], sessions: [] };
-
-  const timeline = buildModelTimeline(base);
+function rowsToLegacyEntries(rows) {
   const entries = [];
   for (const row of rows) {
     const inputTokens = Math.max(0, Number(row.tokens_prompt) || 0);
@@ -203,21 +152,9 @@ export async function parse() {
     if (inputTokens === 0 && outputTokens === 0) continue;
     const timestamp = parseDbTimestamp(row.timestamp);
     if (!timestamp) continue;
-
-    // Prefer the .chat timeline; fall back to the row's literal model (skip
-    // the placeholder "agent"); then "kiro-agent".
-    let model = normalizeModelName(resolveModel(timeline, timestamp));
-    if (!model) {
-      const literal = (row.model || '').trim();
-      if (literal && literal.toLowerCase() !== 'agent') {
-        model = normalizeModelName(literal);
-      }
-    }
-    if (!model) model = 'kiro-agent';
-
     entries.push({
       source: 'kiro',
-      model,
+      model: normalizeLegacyModel(row.model),
       project: 'unknown',
       timestamp,
       inputTokens,
@@ -226,6 +163,203 @@ export async function parse() {
       reasoningOutputTokens: 0,
     });
   }
+  return entries;
+}
+
+function parseLogTimestamp(raw) {
+  const d = new Date(String(raw).replace(' ', 'T'));
+  return isNaN(d.getTime()) ? null : d;
+}
+
+function parseLogLine(line) {
+  const match = /^(\d{4}-\d\d-\d\d \d\d:\d\d:\d\d\.\d{3}) \[[^\]]+\] (\{.*\})$/.exec(line);
+  if (!match) return null;
+  const timestamp = parseLogTimestamp(match[1]);
+  if (!timestamp) return null;
+  try {
+    return { timestamp, obj: JSON.parse(match[2]) };
+  } catch {
+    return null;
+  }
+}
+
+function usageBreakdownsFromCommand(obj) {
+  if (obj?.commandName !== 'GetUsageLimitsCommand') return [];
+  const out = obj.output || {};
+  if (Array.isArray(out.usageBreakdownList)) return out.usageBreakdownList;
+  if (Array.isArray(out.usageBreakdowns)) return out.usageBreakdowns;
+  return [];
+}
+
+function numberFrom(...values) {
+  for (const value of values) {
+    const n = Number(value);
+    if (Number.isFinite(n)) return n;
+  }
+  return null;
+}
+
+function maxNumberFrom(...values) {
+  const nums = values
+    .map(value => Number(value))
+    .filter(Number.isFinite);
+  if (nums.length === 0) return null;
+  return Math.max(...nums);
+}
+
+function snapshotFromBreakdown(timestamp, breakdown) {
+  const type = String(breakdown.resourceType || breakdown.type || '').toUpperCase();
+  const unit = String(breakdown.unit || '').toUpperCase();
+  if (type !== 'CREDIT' || unit !== 'INVOCATIONS') return null;
+
+  const currentUsage = maxNumberFrom(
+    breakdown.currentUsageWithPrecision,
+    breakdown.currentUsage,
+    breakdown.freeTrialInfo?.currentUsageWithPrecision,
+    breakdown.freeTrialInfo?.currentUsage,
+    breakdown.freeTrialUsage?.currentUsage,
+  );
+  if (currentUsage === null) return null;
+
+  return {
+    timestamp,
+    currentUsage,
+    resetDate: String(breakdown.nextDateReset || breakdown.resetDate || ''),
+    usageLimit: numberFrom(
+      breakdown.usageLimitWithPrecision,
+      breakdown.usageLimit,
+      breakdown.freeTrialInfo?.usageLimitWithPrecision,
+      breakdown.freeTrialInfo?.usageLimit,
+      breakdown.freeTrialUsage?.usageLimit,
+    ),
+  };
+}
+
+function findQClientLogs(logsRoot) {
+  const files = [];
+  const stack = [logsRoot];
+  while (stack.length) {
+    const dir = stack.pop();
+    let entries;
+    try { entries = readdirSync(dir, { withFileTypes: true }); } catch { continue; }
+    for (const entry of entries) {
+      const p = join(dir, entry.name);
+      if (entry.isDirectory()) {
+        stack.push(p);
+      } else if (entry.isFile() && /^q-client\.log(?:\.\d+)?$/.test(entry.name)) {
+        files.push(p);
+      }
+    }
+  }
+  return files.sort();
+}
+
+async function readLogSnapshots(logPath) {
+  const snapshots = [];
+  const rl = createInterface({
+    input: createReadStream(logPath, { encoding: 'utf-8' }),
+    crlfDelay: Infinity,
+  });
+  for await (const line of rl) {
+    const parsed = parseLogLine(line);
+    if (!parsed) continue;
+    for (const breakdown of usageBreakdownsFromCommand(parsed.obj)) {
+      const snapshot = snapshotFromBreakdown(parsed.timestamp, breakdown);
+      if (snapshot) snapshots.push(snapshot);
+    }
+  }
+  return snapshots;
+}
+
+async function readUsageSnapshots(userPath) {
+  const appPath = dirname(userPath);
+  const logsRoot = join(appPath, 'logs');
+  const files = findQClientLogs(logsRoot);
+  const snapshots = [];
+  for (const file of files) {
+    try {
+      snapshots.push(...await readLogSnapshots(file));
+    } catch {
+      // skip unreadable / concurrently rotated logs
+    }
+  }
+  return snapshots;
+}
+
+function dedupeSnapshots(snapshots) {
+  const map = new Map();
+  for (const s of snapshots) {
+    const key = `${s.timestamp.toISOString()}|${s.resetDate}|${s.currentUsage}`;
+    map.set(key, s);
+  }
+  return Array.from(map.values()).sort((a, b) => a.timestamp - b.timestamp);
+}
+
+export function snapshotsToCreditEntries(snapshots) {
+  const ordered = dedupeSnapshots(snapshots);
+  const entries = [];
+  let prev = null;
+
+  for (const snapshot of ordered) {
+    if (!prev || snapshot.resetDate !== prev.resetDate || snapshot.currentUsage < prev.currentUsage) {
+      prev = snapshot;
+      continue;
+    }
+
+    const delta = Number((snapshot.currentUsage - prev.currentUsage).toFixed(4));
+    if (delta > 0) {
+      entries.push({
+        source: 'kiro',
+        model: CREDIT_MODEL,
+        project: 'unknown',
+        timestamp: snapshot.timestamp,
+        inputTokens: 0,
+        outputTokens: delta,
+        cachedInputTokens: 0,
+        reasoningOutputTokens: 0,
+      });
+    }
+    prev = snapshot;
+  }
+
+  return entries;
+}
+
+function parseLegacyTokens(base) {
+  const dbPath = join(base, 'dev_data', 'devdata.sqlite');
+  const jsonlPath = join(base, 'dev_data', 'tokens_generated.jsonl');
+  let rows;
+  if (existsSync(dbPath)) {
+    rows = readLegacyDb(dbPath);
+  } else if (existsSync(jsonlPath)) {
+    rows = readLegacyJsonl(jsonlPath);
+  } else {
+    rows = [];
+  }
+  return rowsToLegacyEntries(rows);
+}
+
+export async function parse() {
+  const userPath = getKiroUserPath();
+  if (!userPath) return { buckets: [], sessions: [] };
+
+  const snapshots = await readUsageSnapshots(userPath);
+  const entries = snapshotsToCreditEntries(snapshots);
+  if (entries.length > 0) {
+    return { buckets: aggregateToBuckets(entries), sessions: [] };
+  }
+
+  // Keep old token telemetry available for explicit debugging, but do not use
+  // it by default: it is not Kiro's billing source and causes false model rows.
+  if (process.env.VIBE_USAGE_KIRO_LEGACY_TOKENS === '1') {
+    const base = getKiroBasePath();
+    if (!base) return { buckets: [], sessions: [] };
+    const legacyEntries = parseLegacyTokens(base);
+    return { buckets: aggregateToBuckets(legacyEntries), sessions: [] };
+  }
 
-  return { buckets: aggregateToBuckets(entries), sessions: [] };
+  // state.vscdb contains only the latest cumulative credit snapshot. The parser
+  // stays stateless, so a single cumulative point cannot be uploaded as a bucket
+  // without double-counting on later syncs.
+  return { buckets: [], sessions: [] };
 }

package/src/tools.js

@@ -104,6 +104,15 @@ function findCodexDataDirs() {
   ].filter(existsSync);
 }
 
+// Kimi Code moved its store from ~/.kimi to ~/.kimi-code; recognize either so
+// users on either version are detected. The parser prefers ~/.kimi-code.
+function findKimiCodeDataDirs() {
+  return [
+    join(homedir(), '.kimi-code', 'sessions'),
+    join(homedir(), '.kimi', 'sessions'),
+  ].filter(existsSync);
+}
+
 export const TOOLS = [
   {
     name: 'Antigravity',
@@ -167,7 +176,10 @@ export const TOOLS = [
   {
     name: 'Kimi Code',
     id: 'kimi-code',
-    dataDir: join(homedir(), '.kimi', 'sessions'),
+    // Current layout is ~/.kimi-code/sessions; ~/.kimi/sessions is the legacy
+    // path. The parser reads whichever exists (preferring ~/.kimi-code).
+    dataDir: join(homedir(), '.kimi-code', 'sessions'),
+    detectDataDirs: findKimiCodeDataDirs,
   },
   {
     name: 'Amp',