@cookielab.io/oopst 0.6.0 → 0.6.2

package/dist/index.js

@@ -266,7 +266,10 @@ import { fileURLToPath } from "url";
 import { NodeFileSystem, NodeServices } from "@effect/platform-node";
 import { Context, Effect as Effect2, FileSystem as FileSystem2, Layer, Stream } from "effect";
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
-var PACKAGE_JSON_PATH = fileURLToPath(new URL("../../package.json", import.meta.url));
+var PACKAGE_JSON_PATHS = [
+  fileURLToPath(new URL("../package.json", import.meta.url)),
+  fileURLToPath(new URL("../../package.json", import.meta.url))
+];
 var CliConsole = class extends Context.Service()("@oopst/cli/CliConsole") {
 };
 var CliProcess = class extends Context.Service()("@oopst/cli/CliProcess") {
@@ -306,7 +309,7 @@ function parsePackageMetadata(raw) {
 }
 var readPackageMetadata = Effect2.fn("CliPackageMetadata.readPackageMetadata")(function* () {
   const fs = yield* FileSystem2.FileSystem;
-  const raw = yield* fs.readFileString(PACKAGE_JSON_PATH, "utf8");
+  const raw = yield* Effect2.firstSuccessOf(PACKAGE_JSON_PATHS.map((path) => fs.readFileString(path, "utf8")));
   return parsePackageMetadata(raw);
 });
 function makeCliConsole(options) {
@@ -2516,7 +2519,7 @@ function isObject(value) {
 function isFiniteNumber(value) {
   return typeof value === "number" && Number.isFinite(value);
 }
-function isCodexUsageDelta(value) {
+function isCodexUsageCounters(value) {
   if (!isObject(value)) {
     return false;
   }
@@ -2554,10 +2557,10 @@ function isCodexTokenCountEvent(value) {
     if (info["model"] !== void 0 && typeof info["model"] !== "string") {
       return false;
     }
-    if (info["last_token_usage"] !== void 0 && !isCodexUsageDelta(info["last_token_usage"])) {
+    if (info["last_token_usage"] !== void 0 && !isCodexUsageCounters(info["last_token_usage"])) {
       return false;
     }
-    if (info["total_token_usage"] !== void 0 && !isCodexUsageDelta(info["total_token_usage"])) {
+    if (info["total_token_usage"] !== void 0 && !isCodexUsageCounters(info["total_token_usage"])) {
       return false;
     }
   }
@@ -2619,8 +2622,11 @@ function isCodexSessionMetaEvent(value) {
   }
   return true;
 }
-function pickCodexDelta(event) {
-  return event.payload.info?.last_token_usage ?? event.payload.info?.total_token_usage;
+function extractCodexUsageSnapshot(event) {
+  return {
+    last: event.payload.info?.last_token_usage,
+    total: event.payload.info?.total_token_usage
+  };
 }
 function pickCodexEventModel(event) {
   return event.payload.info?.model ?? event.payload.model ?? event.model;
@@ -2643,6 +2649,8 @@ function makeCodexFileAccumulator() {
     excluded: false,
     lineNo: 0,
     sawTurnContext: false,
+    previousTotalUsage: void 0,
+    pendingUsage: [],
     sessionLastSeenAt: void 0,
     sessionStartedAt: void 0
   };
@@ -2691,10 +2699,47 @@ function lineStreamFromFile(path) {
     )
   );
 }
+function normalizeUsage(usage) {
+  return {
+    inputTokens: Math.max(0, usage.input_tokens ?? 0),
+    outputTokens: Math.max(0, usage.output_tokens ?? 0),
+    cacheReadTokens: Math.max(0, usage.cached_input_tokens ?? usage.cache_read_input_tokens ?? 0)
+  };
+}
+function sameUsage(a, b) {
+  return a.inputTokens === b.inputTokens && a.outputTokens === b.outputTokens && a.cacheReadTokens === b.cacheReadTokens;
+}
+function positiveUsage(usage) {
+  return usage.inputTokens > 0 || usage.outputTokens > 0 || usage.cacheReadTokens > 0;
+}
+function cumulativeDelta(current, previous) {
+  if (previous === void 0) {
+    return current;
+  }
+  return {
+    inputTokens: current.inputTokens < previous.inputTokens ? current.inputTokens : current.inputTokens - previous.inputTokens,
+    outputTokens: current.outputTokens < previous.outputTokens ? current.outputTokens : current.outputTokens - previous.outputTokens,
+    cacheReadTokens: current.cacheReadTokens < previous.cacheReadTokens ? current.cacheReadTokens : current.cacheReadTokens - previous.cacheReadTokens
+  };
+}
+function usageIncrement(acc, last, total) {
+  const normalizedTotal = total === void 0 ? void 0 : normalizeUsage(total);
+  if (normalizedTotal !== void 0) {
+    if (acc.previousTotalUsage !== void 0 && sameUsage(acc.previousTotalUsage, normalizedTotal)) {
+      return void 0;
+    }
+    const increment2 = last === void 0 ? cumulativeDelta(normalizedTotal, acc.previousTotalUsage) : normalizeUsage(last);
+    acc.previousTotalUsage = normalizedTotal;
+    return positiveUsage(increment2) ? increment2 : void 0;
+  }
+  if (last === void 0) {
+    return void 0;
+  }
+  const increment = normalizeUsage(last);
+  return positiveUsage(increment) ? increment : void 0;
+}
 function addToBucket(acc, hourUtc, model, delta) {
-  const inputTokens = Math.max(0, delta.input_tokens ?? 0);
-  const outputTokens = Math.max(0, delta.output_tokens ?? 0);
-  const cacheReadTokens = Math.max(0, delta.cached_input_tokens ?? delta.cache_read_input_tokens ?? 0);
+  const { inputTokens, outputTokens, cacheReadTokens } = delta;
   if (inputTokens === 0 && outputTokens === 0 && cacheReadTokens === 0) {
     return false;
   }
@@ -2716,6 +2761,14 @@ function addToBucket(acc, hourUtc, model, delta) {
   existing.cacheReadTokens += cacheReadTokens;
   return true;
 }
+function flushPendingUsage(acc, model) {
+  for (const pending of acc.pendingUsage) {
+    if (addToBucket(acc, startOfUtcHour(pending.eventAt), model, pending.usage)) {
+      markSessionSeen(acc, pending.eventAt);
+    }
+  }
+  acc.pendingUsage = [];
+}
 function markSessionSeen(acc, eventAt) {
   if (acc.sessionStartedAt === void 0 || eventAt.getTime() < acc.sessionStartedAt.getTime()) {
     acc.sessionStartedAt = eventAt;
@@ -2745,6 +2798,7 @@ function accumulateCodexLine(context, acc, raw) {
     if (shouldExcludePath(parsed.payload.cwd, options.excludePath)) {
       acc.excluded = true;
       acc.buckets.clear();
+      acc.pendingUsage = [];
     }
     return acc;
   }
@@ -2752,12 +2806,14 @@ function accumulateCodexLine(context, acc, raw) {
     if (shouldExcludePath(parsed.payload.cwd, options.excludePath)) {
       acc.excluded = true;
       acc.buckets.clear();
+      acc.pendingUsage = [];
       return acc;
     }
     const model2 = parsed.payload.model ?? parsed.payload.info?.model;
     if (model2 !== void 0) {
       acc.currentModel = model2;
       acc.sawTurnContext = true;
+      flushPendingUsage(acc, model2);
     }
     return acc;
   }
@@ -2768,16 +2824,18 @@ function accumulateCodexLine(context, acc, raw) {
   if (!Number.isFinite(tsMs)) {
     return acc;
   }
+  const snapshot = extractCodexUsageSnapshot(parsed);
+  const delta = usageIncrement(acc, snapshot.last, snapshot.total);
+  if (delta === void 0) {
+    return acc;
+  }
+  const eventAt = new Date(tsMs);
   const eventModel = pickCodexEventModel(parsed);
   const model = acc.sawTurnContext ? acc.currentModel ?? eventModel : eventModel ?? acc.currentModel;
   if (model === void 0) {
+    acc.pendingUsage.push({ eventAt, usage: delta });
     return acc;
   }
-  const delta = pickCodexDelta(parsed);
-  if (delta === void 0) {
-    return acc;
-  }
-  const eventAt = new Date(tsMs);
   if (addToBucket(acc, startOfUtcHour(eventAt), model, delta)) {
     markSessionSeen(acc, eventAt);
   }