devrage 0.5.4 → 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) {
@@ -3209,7 +3245,7 @@ async function main() {
     process.exit(0);
   }
   if (command === "--version") {
-    console.log("0.5.4");
+    console.log("0.5.5");
     process.exit(0);
   }
   const parsed = parseCommand(args);