devrage 0.5.3 → 0.5.5

package/dist/cli.js

@@ -569,11 +569,19 @@ function codexAdapter() {
       }
     },
     async *usage(options) {
+      const seenUsage = /* @__PURE__ */ new Set();
       for await (const file of discoverCodexSessionFiles(CODEX_SESSIONS_DIR)) {
-        yield* parseCodexUsageJsonl(file.filePath, {
+        for await (const record of parseCodexUsageJsonl(file.filePath, {
           session: file.session,
           since: options?.since
-        });
+        })) {
+          const key = codexUsageRecordKey(record);
+          if (seenUsage.has(key)) {
+            continue;
+          }
+          seenUsage.add(key);
+          yield record;
+        }
       }
     }
   };
@@ -591,10 +599,15 @@ async function* discoverCodexSessionFiles(dir) {
     if (entryStat.isDirectory()) {
       yield* discoverCodexSessionFiles(fullPath);
     } else if (entry.endsWith(".jsonl")) {
-      yield { filePath: fullPath, session: entry.replace(".jsonl", "") };
+      yield { filePath: fullPath, session: sessionFromRolloutFileName(entry) };
     }
   }
 }
+function sessionFromRolloutFileName(fileName) {
+  return fileName.match(
+    /([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})\.jsonl$/i
+  )?.[1] ?? fileName.replace(".jsonl", "");
+}
 async function* parseCodexJsonl(filePath, context) {
   const rl = createInterface2({
     input: createReadStream2(filePath, { encoding: "utf-8" }),
@@ -655,6 +668,8 @@ async function* parseCodexUsageJsonl(filePath, context) {
   let model;
   let previousTotal = null;
   let previousUsageSignature = null;
+  let session = context.session;
+  let sawSessionMeta = false;
   for await (const line of rl) {
     if (!line.trim()) {
       continue;
@@ -662,6 +677,14 @@ async function* parseCodexUsageJsonl(filePath, context) {
     try {
       const entry = JSON.parse(line);
       const payload = asRecord3(entry["payload"]);
+      if (entry["type"] === "session_meta") {
+        const metaSession = stringValue2(payload?.["id"]) ?? stringValue2(entry["id"]);
+        if (metaSession && !sawSessionMeta) {
+          session = metaSession;
+          sawSessionMeta = true;
+        }
+        continue;
+      }
       if (entry["type"] === "turn_context") {
         model = stringValue2(payload?.["model"]) ?? model;
         continue;
@@ -710,7 +733,7 @@ async function* parseCodexUsageJsonl(filePath, context) {
         provider: "openai",
         model,
         timestamp,
-        session: context.session,
+        session,
         inputTokens: Math.max(usage2.inputTokens - usage2.cachedInputTokens, 0),
         outputTokens: Math.max(usage2.outputTokens - reasoningTokens, 0),
         reasoningTokens,
@@ -721,6 +744,19 @@ async function* parseCodexUsageJsonl(filePath, context) {
     }
   }
 }
+function codexUsageRecordKey(record) {
+  return JSON.stringify([
+    record.session ?? "",
+    record.timestamp ?? "",
+    record.provider ?? "",
+    record.model ?? "",
+    record.inputTokens,
+    record.outputTokens,
+    record.reasoningTokens,
+    record.cacheReadTokens,
+    record.cacheWriteTokens
+  ]);
+}
 function parseCodexTokenUsage(value) {
   const usage2 = asRecord3(value);
   if (!usage2) {
@@ -2430,30 +2466,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");
     }
   };
 }
@@ -2636,23 +2691,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) {
@@ -3175,7 +3245,7 @@ async function main() {
     process.exit(0);
   }
   if (command === "--version") {
-    console.log("0.5.3");
+    console.log("0.5.5");
     process.exit(0);
   }
   const parsed = parseCommand(args);