devrage 0.0.5 → 0.5.4

package/dist/cli.js

@@ -654,6 +654,7 @@ async function* parseCodexUsageJsonl(filePath, context) {
   });
   let model;
   let previousTotal = null;
+  let previousUsageSignature = null;
   for await (const line of rl) {
     if (!line.trim()) {
       continue;
@@ -669,13 +670,31 @@ async function* parseCodexUsageJsonl(filePath, context) {
         continue;
       }
       const info = asRecord3(payload["info"]);
-      const total = parseCodexTokenUsage(info?.["total_token_usage"]);
-      if (!total) {
+      if (!info) {
         continue;
       }
-      const delta = previousTotal ? subtractCodexUsage(total, previousTotal) : total;
-      previousTotal = total;
-      if (!hasPositiveUsage(delta)) {
+      const lastUsageValue = info["last_token_usage"];
+      const lastUsage = parseCodexTokenUsage(lastUsageValue);
+      const total = parseCodexTokenUsage(info["total_token_usage"]);
+      let usage2 = null;
+      if (lastUsageValue !== void 0) {
+        if (lastUsage && hasBillableUsage(lastUsage)) {
+          const signature = codexUsageSignature(lastUsage, total);
+          if (signature !== previousUsageSignature) {
+            usage2 = lastUsage;
+          }
+          previousUsageSignature = signature;
+        }
+      } else if (total) {
+        const delta = previousTotal ? subtractCodexUsage(total, previousTotal) : total;
+        if (hasBillableUsage(delta)) {
+          usage2 = delta;
+        }
+      }
+      if (total && hasBillableUsage(total)) {
+        previousTotal = total;
+      }
+      if (!usage2) {
         continue;
       }
       const timestamp = stringValue2(entry["timestamp"]);
@@ -685,17 +704,17 @@ async function* parseCodexUsageJsonl(filePath, context) {
           continue;
         }
       }
-      const reasoningTokens = Math.min(delta.reasoningOutputTokens, delta.outputTokens);
+      const reasoningTokens = Math.min(usage2.reasoningOutputTokens, usage2.outputTokens);
       yield {
         agent: "codex",
         provider: "openai",
         model,
         timestamp,
         session: context.session,
-        inputTokens: Math.max(delta.inputTokens - delta.cachedInputTokens, 0),
-        outputTokens: Math.max(delta.outputTokens - reasoningTokens, 0),
+        inputTokens: Math.max(usage2.inputTokens - usage2.cachedInputTokens, 0),
+        outputTokens: Math.max(usage2.outputTokens - reasoningTokens, 0),
         reasoningTokens,
-        cacheReadTokens: delta.cachedInputTokens,
+        cacheReadTokens: usage2.cachedInputTokens,
         cacheWriteTokens: 0
       };
     } catch {
@@ -707,14 +726,23 @@ function parseCodexTokenUsage(value) {
   if (!usage2) {
     return null;
   }
-  const parsed = {
+  const hasUsageField = [
+    "input_tokens",
+    "cached_input_tokens",
+    "output_tokens",
+    "reasoning_output_tokens",
+    "total_tokens"
+  ].some((key) => typeof usage2[key] === "number" && Number.isFinite(usage2[key]));
+  if (!hasUsageField) {
+    return null;
+  }
+  return {
     inputTokens: numberValue2(usage2["input_tokens"]),
     cachedInputTokens: numberValue2(usage2["cached_input_tokens"]),
     outputTokens: numberValue2(usage2["output_tokens"]),
     reasoningOutputTokens: numberValue2(usage2["reasoning_output_tokens"]),
     totalTokens: numberValue2(usage2["total_tokens"])
   };
-  return hasPositiveUsage(parsed) ? parsed : null;
 }
 function subtractCodexUsage(current, previous) {
   return {
@@ -728,8 +756,20 @@ function subtractCodexUsage(current, previous) {
     totalTokens: Math.max(current.totalTokens - previous.totalTokens, 0)
   };
 }
-function hasPositiveUsage(usage2) {
-  return usage2.inputTokens + usage2.cachedInputTokens + usage2.outputTokens + usage2.totalTokens > 0;
+function hasBillableUsage(usage2) {
+  return usage2.inputTokens + usage2.cachedInputTokens + usage2.outputTokens + usage2.reasoningOutputTokens > 0;
+}
+function codexUsageSignature(usage2, total) {
+  return [
+    usage2.inputTokens,
+    usage2.cachedInputTokens,
+    usage2.outputTokens,
+    usage2.reasoningOutputTokens,
+    total?.inputTokens ?? "",
+    total?.cachedInputTokens ?? "",
+    total?.outputTokens ?? "",
+    total?.reasoningOutputTokens ?? ""
+  ].join(":");
 }
 function numberValue2(value) {
   return typeof value === "number" && Number.isFinite(value) ? value : 0;
@@ -805,10 +845,12 @@ async function discoverCursorStateStores() {
   return stores;
 }
 function getCursorUserDirs() {
+  const configHome = envOrDefault("XDG_CONFIG_HOME", join5(homedir5(), ".config"));
+  const appData = envOrDefault("APPDATA", join5(homedir5(), "AppData", "Roaming"));
   return uniqueStrings([
     join5(homedir5(), "Library", "Application Support", "Cursor", "User"),
-    join5(process.env["XDG_CONFIG_HOME"] ?? join5(homedir5(), ".config"), "Cursor", "User"),
-    join5(process.env["APPDATA"] ?? join5(homedir5(), "AppData", "Roaming"), "Cursor", "User")
+    join5(configHome, "Cursor", "User"),
+    join5(appData, "Cursor", "User")
   ]);
 }
 async function* parseCursorStore(store, options) {
@@ -820,36 +862,40 @@ async function* parseCursorStore(store, options) {
     const rows = readStateRows(db);
     const seen = /* @__PURE__ */ new Set();
     for (const row of rows) {
-      if (!isCandidateKey(row.key)) {
-        continue;
-      }
-      const parsed = parseJsonValue(row.value);
-      if (parsed === void 0) {
-        continue;
-      }
-      for (const message of extractCursorMessages(parsed, row.key)) {
-        const text = message.text.trim();
-        if (!isLikelyMessageText(text)) {
+      try {
+        if (!isCandidateKey(row.key)) {
           continue;
         }
-        if (options?.since && message.timestamp) {
-          const timestamp = new Date(message.timestamp);
-          if (Number.isFinite(timestamp.getTime()) && timestamp < options.since) {
+        const parsed = parseJsonValue(row.value);
+        if (parsed === void 0) {
+          continue;
+        }
+        for (const message of extractCursorMessages(parsed, row.key)) {
+          const text = message.text.trim();
+          if (!isLikelyMessageText(text)) {
             continue;
           }
+          if (options?.since && message.timestamp) {
+            const timestamp = new Date(message.timestamp);
+            if (Number.isFinite(timestamp.getTime()) && timestamp < options.since) {
+              continue;
+            }
+          }
+          const session = message.session ?? `${store.scope}:${row.key}`;
+          const dedupeKey = `${session}\0${message.timestamp ?? ""}\0${text}`;
+          if (seen.has(dedupeKey)) {
+            continue;
+          }
+          seen.add(dedupeKey);
+          yield {
+            text,
+            timestamp: message.timestamp,
+            session,
+            project: store.project
+          };
         }
-        const session = message.session ?? `${store.scope}:${row.key}`;
-        const dedupeKey = `${session}\0${message.timestamp ?? ""}\0${text}`;
-        if (seen.has(dedupeKey)) {
-          continue;
-        }
-        seen.add(dedupeKey);
-        yield {
-          text,
-          timestamp: message.timestamp,
-          session,
-          project: store.project
-        };
+      } catch {
+        continue;
       }
     }
   } finally {
@@ -866,26 +912,30 @@ async function* parseCursorUsageStore(store, options) {
     const composerModels = collectComposerModels(rows);
     const seen = /* @__PURE__ */ new Set();
     for (const row of rows) {
-      if (!row.key.startsWith("bubbleId:")) {
-        continue;
-      }
-      const parsed = parseJsonValue(row.value);
-      const usage2 = extractCursorBubbleUsage(parsed, row.key, composerModels);
-      if (!usage2) {
-        continue;
-      }
-      if (options?.since && usage2.timestamp) {
-        const timestamp = new Date(usage2.timestamp);
-        if (Number.isFinite(timestamp.getTime()) && timestamp < options.since) {
+      try {
+        if (!row.key.startsWith("bubbleId:")) {
           continue;
         }
-      }
-      const dedupeKey = `${usage2.session ?? ""}\0${usage2.timestamp ?? ""}\0${usage2.model ?? ""}\0${usage2.inputTokens}\0${usage2.outputTokens}`;
-      if (seen.has(dedupeKey)) {
+        const parsed = parseJsonValue(row.value);
+        const usage2 = extractCursorBubbleUsage(parsed, row.key, composerModels);
+        if (!usage2) {
+          continue;
+        }
+        if (options?.since && usage2.timestamp) {
+          const timestamp = new Date(usage2.timestamp);
+          if (Number.isFinite(timestamp.getTime()) && timestamp < options.since) {
+            continue;
+          }
+        }
+        const dedupeKey = `${usage2.session ?? ""}\0${usage2.timestamp ?? ""}\0${usage2.model ?? ""}\0${usage2.inputTokens}\0${usage2.outputTokens}`;
+        if (seen.has(dedupeKey)) {
+          continue;
+        }
+        seen.add(dedupeKey);
+        yield usage2;
+      } catch {
         continue;
       }
-      seen.add(dedupeKey);
-      yield usage2;
     }
   } finally {
     db.close();
@@ -907,18 +957,22 @@ function readStateRows(db) {
   const rows = [];
   try {
     const tables = db.prepare("SELECT name FROM sqlite_master WHERE type = 'table'").all();
-    const availableTables = new Set(tables.map((table) => table.name));
+    const availableTables = new Set(tables.flatMap((table) => stringValue3(table.name) ?? []));
     for (const table of STATE_TABLES) {
       if (!availableTables.has(table)) {
         continue;
       }
       const columns = db.prepare(`PRAGMA table_info("${table}")`).all();
-      const columnNames = new Set(columns.map((column) => column.name));
+      const columnNames = new Set(columns.flatMap((column) => stringValue3(column.name) ?? []));
       if (!columnNames.has("key") || !columnNames.has("value")) {
         continue;
       }
       const tableRows = db.prepare(`SELECT key, value FROM "${table}"`).all();
-      rows.push(...tableRows);
+      rows.push(
+        ...tableRows.flatMap(
+          (row) => typeof row.key === "string" ? [{ key: row.key, value: row.value }] : []
+        )
+      );
     }
   } catch {
     return rows;
@@ -1250,6 +1304,10 @@ function uniqueMessages(messages) {
 function uniqueStrings(values) {
   return Array.from(new Set(values));
 }
+function envOrDefault(name, fallback) {
+  const value = process.env[name];
+  return value && value.trim() ? value : fallback;
+}
 function numberValue3(value) {
   return typeof value === "number" && Number.isFinite(value) ? value : 0;
 }
@@ -2372,30 +2430,49 @@ var SPINNER_MESSAGES = [
   "Auditing your language",
   "Tabulating regrets"
 ];
+var COST_SPINNER_MESSAGES = [
+  "Loading price catalog",
+  "Reading local usage",
+  "Scanning transcript stores",
+  "Crunching token counts",
+  "Still working through local history"
+];
 var DAY_MS = 24 * 60 * 60 * 1e3;
 function createSpinner(messages = SPINNER_MESSAGES) {
   let messageIdx = 0;
   let dotCount = 0;
   let timer = null;
+  let messageOverride = null;
+  function render() {
+    dotCount = (dotCount + 1) % 4;
+    const msg = messageOverride ?? messages[messageIdx % messages.length];
+    const dots = ".".repeat(dotCount || 1);
+    process.stdout.write(`\r  ${c.dim}${msg}${dots}${c.reset}   `);
+  }
   return {
-    start() {
+    start(message) {
       messageIdx = Math.floor(Math.random() * messages.length);
+      messageOverride = message ?? null;
+      render();
       timer = setInterval(() => {
-        dotCount = (dotCount + 1) % 4;
-        const msg = messages[messageIdx % messages.length];
-        const dots = ".".repeat(dotCount || 1);
-        process.stdout.write(`\r  ${c.dim}${msg}${dots}${c.reset}   `);
+        render();
       }, 300);
     },
-    update() {
-      messageIdx++;
+    update(message) {
+      if (message) {
+        messageOverride = message;
+      } else {
+        messageOverride = null;
+        messageIdx++;
+      }
+      render();
     },
     stop() {
       if (timer) {
         clearInterval(timer);
         timer = null;
       }
-      process.stdout.write("\r" + " ".repeat(60) + "\r");
+      process.stdout.write("\r" + " ".repeat(80) + "\r");
     }
   };
 }
@@ -2578,23 +2655,38 @@ async function cost(args) {
   const options = parseCostArgs(args);
   const adapters = options.agent ? [createAdapter(options.agent)] : allAdapters();
   const costByAgent = {};
-  const pricing = await loadPricingCatalog({ refresh: options.refreshPrices });
-  for (const adapter of adapters) {
-    if (!adapter.usage) {
-      continue;
-    }
-    const summary = await summarizeUsage(adapter.usage({ since: options.since }), pricing);
-    if (summary.requests > 0) {
-      costByAgent[adapter.name] = summary;
+  const spinner = createSpinner(COST_SPINNER_MESSAGES);
+  let totals = null;
+  spinner.start("Loading price catalog");
+  try {
+    const pricing = await loadPricingCatalog({ refresh: options.refreshPrices });
+    for (const adapter of adapters) {
+      if (!adapter.usage) {
+        continue;
+      }
+      spinner.update(`Reading ${adapter.name} usage`);
+      const summary = await summarizeUsage(adapter.usage({ since: options.since }), pricing);
+      if (summary.requests > 0) {
+        costByAgent[adapter.name] = summary;
+      }
     }
+    totals = getCostTotals(costByAgent);
+  } finally {
+    spinner.stop();
   }
-  const totals = getCostTotals(costByAgent);
-  console.log("");
-  if (totals.entries.length === 0) {
+  if (!totals || totals.entries.length === 0) {
+    console.log("");
     printCostCommandUnavailable(options);
     return;
   }
-  const reportUrl = await writeCostHtmlReport(totals, options);
+  spinner.start("Writing cost report");
+  let reportUrl;
+  try {
+    reportUrl = await writeCostHtmlReport(totals, options);
+  } finally {
+    spinner.stop();
+  }
+  console.log("");
   printCostCommand(totals, options, reportUrl);
 }
 function printCostCommand(totals, options, reportUrl) {
@@ -3088,6 +3180,7 @@ var COMMANDS = {
   cost,
   scan
 };
+var OPTIONS_WITH_VALUES = /* @__PURE__ */ new Set(["--agent", "-a", "--since", "-s"]);
 function usage() {
   console.log(`devrage \u2014 count how many times you swear at your coding agents
 
@@ -3116,16 +3209,35 @@ async function main() {
     process.exit(0);
   }
   if (command === "--version") {
-    console.log("0.0.5");
+    console.log("0.5.4");
     process.exit(0);
   }
-  const handler = command ? COMMANDS[command] : void 0;
-  if (handler) {
-    await handler(args.slice(1));
+  const parsed = parseCommand(args);
+  if (parsed) {
+    await parsed.handler(parsed.args);
   } else {
     await scan(args);
   }
 }
+function parseCommand(args) {
+  for (let index = 0; index < args.length; index++) {
+    const arg = args[index];
+    if (!arg) {
+      continue;
+    }
+    const handler = COMMANDS[arg];
+    if (handler) {
+      return {
+        handler,
+        args: [...args.slice(0, index), ...args.slice(index + 1)]
+      };
+    }
+    if (OPTIONS_WITH_VALUES.has(arg) && index + 1 < args.length) {
+      index++;
+    }
+  }
+  return null;
+}
 main().catch((err) => {
   console.error(err);
   process.exit(1);