@vibe-cafe/vibe-usage 0.9.5 → 0.9.7

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/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` |
+| Kiro | Kiro CLI native event streams `~/.kiro/sessions/cli/*.jsonl` (estimated tokens from message text: input = prompt + tool results, output = reply + tool calls, reasoning = thinking, cacheRead = re-sent context; thinking-block signatures excluded). Falls back to `~/Library/Application Support/kiro-cli/data.sqlite3` / `~/.local/share/kiro-cli/data.sqlite3` + optional `~/.kiro_sessions/*.json` archives, then IDE `q-client.log` credit deltas as `kiro-credits`; legacy IDE `dev_data/devdata.sqlite` token telemetry is opt-in 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,6 +1,6 @@
 {
   "name": "@vibe-cafe/vibe-usage",
-  "version": "0.9.5",
+  "version": "0.9.7",
   "description": "Track your AI coding tool token usage and sync to vibecafe.ai",
   "type": "module",
   "scripts": {

package/src/parsers/kiro.js

@@ -17,6 +17,27 @@ import { queryDbJson } from './sqlite.js';
 const KIRO_AGENT_RELATIVE = join('User', 'globalStorage', 'kiro.kiroagent');
 const KIRO_USER_RELATIVE = 'User';
 const CREDIT_MODEL = 'kiro-credits';
+const ESTIMATE_MODEL = 'kiro-token-estimate';
+const CHARS_PER_TOKEN = 4;
+const IMAGE_TOKENS = 1600;
+
+// The official Kiro CLI persists each conversation as a `{version, kind, data}`
+// event stream under ~/.kiro/sessions/cli/<uuid>.jsonl (companion <uuid>.json
+// holds cwd + model). It carries NO token counts, so tokens are estimated from
+// text length (chars/CHARS_PER_TOKEN), the same heuristic used elsewhere here.
+//
+// String values that are NOT linguistic tokens are excluded from the count.
+// The big one is `signature`: extended-thinking blocks carry a ~500-char crypto
+// signature; counting it as text inflates "output" by well over 100%.
+const NON_TEXT_KEYS = new Set([
+  'signature', 'redactedContent', 'toolUseId', 'modelId', 'message_id', 'format', 'id',
+]);
+
+// System prompt + tool JSON schemas are injected on every request but never
+// written to the session log, so the stream alone counts none of them. They are
+// a near-constant per-call overhead. Keep the default at 0 so the parser reports
+// only observed log text unless the user explicitly opts into an estimate.
+const DEFAULT_KIRO_CLI_SYSTEM_OVERHEAD_TOKENS = 0;
 
 function getDefaultAppPath() {
   if (process.platform === 'darwin') {
@@ -62,6 +83,45 @@ export function getKiroUserPath() {
   return existsSync(def) ? def : null;
 }
 
+export function getKiroCliDbPath() {
+  const explicit = process.env.KIRO_CLI_DB_PATH?.trim();
+  if (explicit) {
+    const r = resolve(explicit);
+    return existsSync(r) ? r : null;
+  }
+  let def;
+  if (process.platform === 'darwin') {
+    def = join(homedir(), 'Library', 'Application Support', 'kiro-cli', 'data.sqlite3');
+  } else if (process.platform === 'win32') {
+    const appData = process.env.APPDATA?.trim() || join(homedir(), 'AppData', 'Roaming');
+    def = join(appData, 'kiro-cli', 'data.sqlite3');
+  } else {
+    def = join(homedir(), '.local', 'share', 'kiro-cli', 'data.sqlite3');
+  }
+  return existsSync(def) ? def : null;
+}
+
+export function getKiroSessionsDir() {
+  const explicit = process.env.KIRO_SESSIONS_DIR?.trim();
+  if (explicit) {
+    const r = resolve(explicit);
+    return existsSync(r) ? r : null;
+  }
+  const def = join(homedir(), '.kiro_sessions');
+  return existsSync(def) ? def : null;
+}
+
+// Native Kiro CLI session event streams: ~/.kiro/sessions/cli/*.jsonl
+export function getKiroCliSessionsDir() {
+  const explicit = process.env.KIRO_CLI_SESSIONS_DIR?.trim();
+  if (explicit) {
+    const r = resolve(explicit);
+    return existsSync(r) ? r : null;
+  }
+  const def = join(homedir(), '.kiro', 'sessions', 'cli');
+  return existsSync(def) ? def : null;
+}
+
 function isLockError(err) {
   return err && typeof err.message === 'string' && /database is locked/i.test(err.message);
 }
@@ -70,32 +130,46 @@ function queryDb(dbPath, sql) {
   return queryDbJson(dbPath, sql);
 }
 
-const TOKENS_SQL =
-  'SELECT id, model, tokens_prompt, tokens_generated, timestamp ' +
-  'FROM tokens_generated ' +
-  'WHERE tokens_prompt > 0 OR tokens_generated > 0 ' +
-  'ORDER BY id ASC';
-
-function readLegacyDb(dbPath) {
+function queryDbSnapshotOnLock(dbPath, sql) {
   try {
-    return queryDb(dbPath, TOKENS_SQL);
+    return queryDb(dbPath, sql);
   } catch (err) {
     if (!isLockError(err)) throw err;
     const snapshotDir = mkdtempSync(join(tmpdir(), 'vibe-usage-kiro-'));
-    const queryPath = join(snapshotDir, 'devdata.sqlite');
+    const queryPath = join(snapshotDir, 'data.sqlite3');
     copyFileSync(dbPath, queryPath);
     for (const suffix of ['-shm', '-wal']) {
       const companion = `${dbPath}${suffix}`;
       if (existsSync(companion)) copyFileSync(companion, `${queryPath}${suffix}`);
     }
     try {
-      return queryDb(queryPath, TOKENS_SQL);
+      return queryDb(queryPath, sql);
     } finally {
       rmSync(snapshotDir, { recursive: true, force: true });
     }
   }
 }
 
+function queryOptionalDb(dbPath, sql) {
+  try {
+    return queryDbSnapshotOnLock(dbPath, sql);
+  } catch (err) {
+    const msg = err && typeof err.message === 'string' ? err.message : '';
+    if (/no such table|no such column/i.test(msg)) return [];
+    throw err;
+  }
+}
+
+const TOKENS_SQL =
+  'SELECT id, model, tokens_prompt, tokens_generated, timestamp ' +
+  'FROM tokens_generated ' +
+  'WHERE tokens_prompt > 0 OR tokens_generated > 0 ' +
+  'ORDER BY id ASC';
+
+function readLegacyDb(dbPath) {
+  return queryDbSnapshotOnLock(dbPath, TOKENS_SQL);
+}
+
 // 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".
@@ -113,7 +187,7 @@ function readLegacyJsonl(jsonlPath) {
       const obj = JSON.parse(lines[i]);
       rows.push({
         id: i + 1,
-        model: obj.model || 'kiro-token-estimate',
+        model: obj.model || ESTIMATE_MODEL,
         tokens_prompt: obj.promptTokens || 0,
         tokens_generated: obj.generatedTokens || 0,
         timestamp: ts,
@@ -135,13 +209,13 @@ function parseDbTimestamp(value) {
 
 function normalizeLegacyModel(raw) {
   const model = typeof raw === 'string' ? raw.trim() : '';
-  if (!model || model.toLowerCase() === 'agent') return 'kiro-token-estimate';
+  if (!model || model.toLowerCase() === 'agent') return ESTIMATE_MODEL;
   if (model === model.toLowerCase() && model.includes('-')) return model;
   return model
     .replace(/_\d{8}_V\d+_\d+$/i, '')
     .replace(/_V\d+$/i, '')
     .toLowerCase()
-    .replace(/_/g, '-') || 'kiro-token-estimate';
+    .replace(/_/g, '-') || ESTIMATE_MODEL;
 }
 
 function rowsToLegacyEntries(rows) {
@@ -166,6 +240,362 @@ function rowsToLegacyEntries(rows) {
   return entries;
 }
 
+function textLength(field) {
+  if (!field) return 0;
+  if (typeof field !== 'object' || Array.isArray(field)) return String(field).length;
+  let len = 0;
+  for (const [key, value] of Object.entries(field)) {
+    if (key === 'images') continue;
+    len += String(value ?? '').length;
+  }
+  return len;
+}
+
+function imageTokens(field) {
+  if (!field || typeof field !== 'object' || Array.isArray(field)) return 0;
+  const images = field.images;
+  if (!Array.isArray(images)) return 0;
+  let total = 0;
+  for (const image of images) {
+    const source = image && typeof image === 'object' ? image.source || {} : {};
+    const rawData = source.Bytes;
+    try {
+      let buf;
+      if (Array.isArray(rawData)) {
+        buf = Buffer.from(rawData);
+      } else if (typeof rawData === 'string') {
+        buf = Buffer.from(rawData, 'base64');
+      }
+      if (buf?.length >= 24 && buf.subarray(0, 4).equals(Buffer.from([0x89, 0x50, 0x4e, 0x47]))) {
+        total += Math.floor((buf.readUInt32BE(16) * buf.readUInt32BE(20)) / 750);
+        continue;
+      }
+    } catch {
+      // fall back below
+    }
+    total += 1600;
+  }
+  return total;
+}
+
+function estimateTextTokens(field) {
+  return Math.floor(textLength(field) / CHARS_PER_TOKEN);
+}
+
+function normalizeCliModel(raw) {
+  const model = typeof raw === 'string' ? raw.trim() : '';
+  return model || ESTIMATE_MODEL;
+}
+
+function parseMsTimestamp(value) {
+  const n = Number(value);
+  if (!Number.isFinite(n) || n <= 0) return null;
+  const d = new Date(n);
+  return isNaN(d.getTime()) ? null : d;
+}
+
+function extractConversationTimes(data) {
+  const turns = Array.isArray(data?.history) ? data.history : [];
+  const first = turns[0]?.request_metadata?.request_start_timestamp_ms;
+  const last = turns[turns.length - 1]?.request_metadata?.request_start_timestamp_ms;
+  return {
+    createdAt: Number(first) || 0,
+    updatedAt: Number(last) || Number(first) || 0,
+  };
+}
+
+function conversationToEntries(conversation) {
+  const data = conversation?.value;
+  const turns = Array.isArray(data?.history) ? data.history : [];
+  const summary = data?.latest_summary || [];
+  const summaryTokens = summary ? Math.floor(String(summary).length / CHARS_PER_TOKEN) : 0;
+  let cumulative = summaryTokens;
+  let prevAssistantTokens = 0;
+  const entries = [];
+
+  for (let i = 0; i < turns.length; i++) {
+    const turn = turns[i] || {};
+    const meta = turn.request_metadata || {};
+    const timestamp = parseMsTimestamp(meta.request_start_timestamp_ms);
+    if (!timestamp) continue;
+
+    const userTokens = estimateTextTokens(turn.user) + imageTokens(turn.user);
+    const assistantTokens = estimateTextTokens(turn.assistant);
+    const outputTokens = Array.isArray(meta.time_between_chunks) ? meta.time_between_chunks.length : 0;
+    const cachedInputTokens = i > 0 ? cumulative : 0;
+    const inputTokens = userTokens + (i > 0 ? prevAssistantTokens : 0);
+
+    cumulative += userTokens + assistantTokens;
+    prevAssistantTokens = assistantTokens;
+
+    if (inputTokens === 0 && outputTokens === 0 && cachedInputTokens === 0) continue;
+    entries.push({
+      source: 'kiro',
+      model: normalizeCliModel(meta.model_id),
+      project: conversation.cwd || 'unknown',
+      timestamp,
+      inputTokens,
+      outputTokens,
+      cachedInputTokens,
+      reasoningOutputTokens: 0,
+    });
+  }
+
+  return entries;
+}
+
+export function conversationsToEstimateEntries(conversations) {
+  const entries = [];
+  const byId = new Map();
+  for (const conversation of conversations) {
+    const id = conversation?.conversation_id;
+    if (!id) continue;
+    const updatedAt = Number(conversation.updated_at) || 0;
+    const existing = byId.get(id);
+    if (!existing || updatedAt >= (Number(existing.updated_at) || 0)) {
+      byId.set(id, conversation);
+    }
+  }
+  for (const conversation of byId.values()) {
+    entries.push(...conversationToEntries(conversation));
+  }
+  return entries;
+}
+
+function readArchivedConversations(sessionsDir) {
+  if (!sessionsDir) return [];
+  let files;
+  try {
+    files = readdirSync(sessionsDir).filter(f => f.endsWith('.json'));
+  } catch {
+    return [];
+  }
+  const conversations = [];
+  for (const file of files) {
+    try {
+      const obj = JSON.parse(readFileSync(join(sessionsDir, file), 'utf-8'));
+      if (obj?.conversation_id && obj?.value) conversations.push(obj);
+    } catch {
+      // skip malformed archives
+    }
+  }
+  return conversations;
+}
+
+function readCliDbConversations(dbPath) {
+  if (!dbPath) return [];
+  const conversations = [];
+  for (const row of queryOptionalDb(
+    dbPath,
+    'SELECT conversation_id, key as cwd, created_at, updated_at, value FROM conversations_v2',
+  )) {
+    try {
+      conversations.push({
+        conversation_id: row.conversation_id,
+        cwd: row.cwd || 'unknown',
+        created_at: Number(row.created_at) || 0,
+        updated_at: Number(row.updated_at) || 0,
+        value: JSON.parse(row.value),
+      });
+    } catch {
+      // skip malformed conversations
+    }
+  }
+
+  for (const row of queryOptionalDb(dbPath, 'SELECT key as cwd, value FROM conversations')) {
+    try {
+      const data = JSON.parse(row.value);
+      const conversationId = data?.conversation_id;
+      if (!conversationId) continue;
+      const { createdAt, updatedAt } = extractConversationTimes(data);
+      conversations.push({
+        conversation_id: conversationId,
+        cwd: row.cwd || 'unknown',
+        created_at: createdAt,
+        updated_at: updatedAt,
+        value: data,
+      });
+    } catch {
+      // skip malformed conversations
+    }
+  }
+  return conversations;
+}
+
+function readCliEstimateEntries() {
+  const conversations = [
+    ...readArchivedConversations(getKiroSessionsDir()),
+    ...readCliDbConversations(getKiroCliDbPath()),
+  ];
+  return conversationsToEstimateEntries(conversations);
+}
+
+// ---------------------------------------------------------------------------
+// Native Kiro CLI event-stream sessions: ~/.kiro/sessions/cli/<uuid>.jsonl
+// Each line is a {version, kind, data} event. Relevant kinds:
+//   Prompt           user turn; data.content[] (text/image); data.meta.timestamp
+//                    is the ONLY timestamp (epoch SECONDS).
+//   AssistantMessage data.content[] items: text (reply), thinking (reasoning +
+//                    modelId + crypto signature), toolUse (name + input).
+//   ToolResults      tool output fed back as context for the next turn.
+//   Compaction       context was summarized; resets the running context size.
+// ---------------------------------------------------------------------------
+
+// Sum of string-leaf character lengths, skipping non-linguistic keys.
+function textLeafChars(value) {
+  if (typeof value === 'string') return value.length;
+  if (Array.isArray(value)) {
+    let n = 0;
+    for (const v of value) n += textLeafChars(v);
+    return n;
+  }
+  if (value && typeof value === 'object') {
+    let n = 0;
+    for (const [k, v] of Object.entries(value)) {
+      if (NON_TEXT_KEYS.has(k)) continue;
+      n += textLeafChars(v);
+    }
+    return n;
+  }
+  return 0;
+}
+
+function estTokens(value) {
+  return Math.floor(textLeafChars(value) / CHARS_PER_TOKEN);
+}
+
+function getKiroCliSystemOverheadTokens() {
+  const raw = process.env.KIRO_CLI_SYSTEM_OVERHEAD_TOKENS;
+  if (raw === undefined || raw.trim() === '') return DEFAULT_KIRO_CLI_SYSTEM_OVERHEAD_TOKENS;
+  const n = Number(raw);
+  return Number.isFinite(n) && n > 0 ? Math.floor(n) : 0;
+}
+
+function loadCliSessionMeta(sessionsDir, sessionId) {
+  try {
+    const d = JSON.parse(readFileSync(join(sessionsDir, `${sessionId}.json`), 'utf-8'));
+    return {
+      cwd: (d && typeof d.cwd === 'string' && d.cwd) || 'unknown',
+      model: d?.session_state?.rts_model_state?.model_info?.model_id || null,
+    };
+  } catch {
+    return { cwd: 'unknown', model: null };
+  }
+}
+
+async function readCliSessionEntries(sessionsDir, fileName) {
+  const sessionId = fileName.replace(/\.jsonl$/, '');
+  const { cwd, model: metaModel } = loadCliSessionMeta(sessionsDir, sessionId);
+  const filePath = join(sessionsDir, fileName);
+
+  let mtime;
+  try { mtime = statSync(filePath).mtime; } catch { mtime = new Date(); }
+
+  const events = [];
+  const rl = createInterface({
+    input: createReadStream(filePath, { encoding: 'utf-8' }),
+    crlfDelay: Infinity,
+  });
+  for await (const raw of rl) {
+    const line = raw.trim();
+    if (!line) continue;
+    try { events.push(JSON.parse(line)); } catch { /* skip malformed line */ }
+  }
+
+  return cliEventsToEntries(events, { cwd, model: metaModel, fallbackTimestamp: mtime });
+}
+
+// Pure state machine over a Kiro CLI session's ordered events. Exposed for tests.
+export function cliEventsToEntries(events, { cwd = 'unknown', model = null, fallbackTimestamp = null } = {}) {
+  const entries = [];
+  let curTs = null;      // Date from the enclosing Prompt (epoch seconds)
+  let cumulative = 0;    // running conversation context, re-sent every turn
+  let pendingInput = 0;  // fresh input accumulated since the last assistant turn
+  let curModel = model;
+
+  for (const ev of events) {
+    const data = ev?.data;
+    if (!data || typeof data !== 'object') continue;
+    const content = Array.isArray(data.content) ? data.content : [];
+
+    if (ev.kind === 'Prompt') {
+      const ts = data.meta?.timestamp;
+      if (typeof ts === 'number' && ts > 0) curTs = new Date(ts * 1000);
+      for (const item of content) {
+        pendingInput += item?.kind === 'image' ? IMAGE_TOKENS : estTokens(item?.data);
+      }
+    } else if (ev.kind === 'ToolResults') {
+      for (const item of content) pendingInput += estTokens(item?.data);
+    } else if (ev.kind === 'AssistantMessage') {
+      let output = 0;
+      let reasoning = 0;
+      let signatureTokens = 0;
+      for (const item of content) {
+        const cd = item?.data;
+        if (cd && typeof cd === 'object' && typeof cd.modelId === 'string' && cd.modelId) {
+          curModel = cd.modelId;
+        }
+        if (item?.kind === 'thinking' && cd && typeof cd === 'object') {
+          reasoning += Math.floor(String(cd.text ?? '').length / CHARS_PER_TOKEN);
+          // Signature persists in history and is re-sent as context on every
+          // later turn, but it is NOT model output — keep it out of output.
+          signatureTokens += Math.floor(String(cd.signature ?? '').length / CHARS_PER_TOKEN);
+        } else {
+          output += estTokens(cd);
+        }
+      }
+
+      const inputTokens = pendingInput;
+      // Each request re-sends the whole prior conversation (cache read) plus the
+      // optional per-call system-prompt/tool-schema overhead.
+      const cachedInputTokens = cumulative + getKiroCliSystemOverheadTokens();
+
+      if (inputTokens > 0 || output > 0 || reasoning > 0) {
+        entries.push({
+          source: 'kiro',
+          model: curModel || ESTIMATE_MODEL,
+          project: cwd,
+          timestamp: curTs || fallbackTimestamp || new Date(),
+          inputTokens,
+          outputTokens: output,
+          cachedInputTokens,
+          reasoningOutputTokens: reasoning,
+        });
+      }
+
+      // Grow the running context: fresh input + everything generated this turn,
+      // including the thinking signature (it persists in history and is re-sent).
+      cumulative += inputTokens + output + reasoning + signatureTokens;
+      pendingInput = 0;
+    } else if (ev.kind === 'Compaction') {
+      cumulative = estTokens(data.summary);
+      pendingInput = 0;
+    }
+  }
+
+  return entries;
+}
+
+async function readCliSessionStreamEntries() {
+  const dir = getKiroCliSessionsDir();
+  if (!dir) return [];
+  let files;
+  try {
+    files = readdirSync(dir).filter(f => f.endsWith('.jsonl'));
+  } catch {
+    return [];
+  }
+  const entries = [];
+  for (const file of files) {
+    try {
+      entries.push(...await readCliSessionEntries(dir, file));
+    } catch {
+      // skip unreadable / concurrently rotated session
+    }
+  }
+  return entries;
+}
+
 function parseLogTimestamp(raw) {
   const d = new Date(String(raw).replace(' ', 'T'));
   return isNaN(d.getTime()) ? null : d;
@@ -340,6 +770,27 @@ function parseLegacyTokens(base) {
 }
 
 export async function parse() {
+  // 1. Official Kiro CLI native event streams (~/.kiro/sessions/cli/*.jsonl).
+  //    This is where the shipping CLI actually records conversations; the
+  //    conversations_v2 DB path below is empty on those installs.
+  const streamEntries = await readCliSessionStreamEntries();
+  if (streamEntries.length > 0) {
+    return { buckets: aggregateToBuckets(streamEntries), sessions: [] };
+  }
+
+  // 2. Kiro CLI conversations DB / archived snapshots (other CLI variants).
+  try {
+    const estimateEntries = readCliEstimateEntries();
+    if (estimateEntries.length > 0) {
+      return { buckets: aggregateToBuckets(estimateEntries), 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 CLI data.');
+    }
+    throw err;
+  }
+
   const userPath = getKiroUserPath();
   if (!userPath) return { buckets: [], sessions: [] };