agent-usage-all-in-one 0.4.0 → 0.4.1

package/dist/cli.js

@@ -2571,7 +2571,7 @@ var init_claude_code_connector = __esm({
           usage: history.usage,
           ...history.usage.length > 0 && history.complete ? {
             usageReconciliation: {
-              authoritativeIdPrefix: "claude-transcript:",
+              authoritativeIdPrefixes: ["claude-transcript:"],
               retiredIdPrefixes: ["claude-otel:"]
             }
           } : {},
@@ -3126,22 +3126,50 @@ var init_claude_usage_screen_client = __esm({
 
 // src/connectors/codex/codex-connector.ts
 import { z as z2 } from "zod";
-function reconcileAccountRemainders(accountUsage, localUsage) {
-  return accountUsage.flatMap((accountObservation) => {
-    const day = accountObservation.observedAt.slice(0, 10);
-    const accountTotal = normalizeTokenObservation(accountObservation).recordedTokens;
-    const localTotal = localUsage.filter((observation) => observation.observedAt.slice(0, 10) === day).reduce(
-      (total, observation) => total + normalizeTokenObservation(observation).recordedTokens,
-      0
-    );
-    if (localTotal === 0 || localTotal > accountTotal) return [];
+function settledAccountDays(response, nowMs) {
+  return (response?.dailyUsageBuckets ?? []).map((bucket) => ({
+    day: bucket.startDate,
+    startMs: Date.parse(`${bucket.startDate}T00:00:00.000Z`),
+    tokens: bucket.tokens
+  })).filter((day) => Number.isFinite(day.startMs) && day.startMs + DAY_MS <= nowMs);
+}
+function reconcileAccountDays(days, localUsage) {
+  const reconciledDays = new Set(days.map((day) => day.day));
+  const localTotals = /* @__PURE__ */ new Map();
+  for (const observation of localUsage) {
+    const day = observation.observedAt.slice(0, 10);
+    if (!reconciledDays.has(day)) continue;
+    const recorded = normalizeTokenObservation(observation).recordedTokens;
+    localTotals.set(day, (localTotals.get(day) ?? 0) + recorded);
+  }
+  return days.flatMap((day) => {
+    const localTotal = localTotals.get(day.day) ?? 0;
+    if (localTotal > day.tokens) return [];
+    const observedAt = new Date(day.startMs).toISOString();
+    const accountObservation = {
+      id: `codex:daily:${day.day}`,
+      billingDomainId: "subscription",
+      model: null,
+      observedAt,
+      sourceReportedTotalTokens: day.tokens,
+      inputTokens: 0,
+      outputTokens: 0,
+      cacheReadTokens: 0,
+      cacheWriteTokens: 0,
+      modelAttribution: "unclassified",
+      timePrecision: "day",
+      usageScope: "account-wide",
+      authority: "official-account"
+    };
+    if (localTotal === 0) return [accountObservation];
     return [
+      accountObservation,
       {
-        id: `codex-transcript:account-remainder:${day}`,
+        id: `codex-transcript:account-remainder:${day.day}`,
         billingDomainId: "subscription",
         model: null,
-        observedAt: accountObservation.observedAt,
-        reconciledRemainderTokens: accountTotal - localTotal,
+        observedAt,
+        reconciledRemainderTokens: day.tokens - localTotal,
         inputTokens: 0,
         outputTokens: 0,
         cacheReadTokens: 0,
@@ -3198,23 +3226,6 @@ function mapQuotaBuckets(response) {
   }
   return buckets;
 }
-function mapTokenUsage(response) {
-  return (response?.dailyUsageBuckets ?? []).map((bucket) => ({
-    id: `codex:daily:${bucket.startDate}`,
-    billingDomainId: "subscription",
-    model: null,
-    observedAt: `${bucket.startDate}T00:00:00.000Z`,
-    sourceReportedTotalTokens: bucket.tokens,
-    inputTokens: 0,
-    outputTokens: 0,
-    cacheReadTokens: 0,
-    cacheWriteTokens: 0,
-    modelAttribution: "unclassified",
-    timePrecision: "day",
-    usageScope: "account-wide",
-    authority: "official-account"
-  }));
-}
 function formatWindowLabel(durationMinutes, fallback) {
   if (durationMinutes === 300) return "5 hour";
   if (durationMinutes === 10080) return "Week";
@@ -3223,7 +3234,7 @@ function formatWindowLabel(durationMinutes, fallback) {
   if (durationMinutes % 60 === 0) return `${durationMinutes / 60} hours`;
   return `${durationMinutes} minutes`;
 }
-var nullableNumeric, numeric, rateLimitWindowSchema, rateLimitSnapshotSchema, codexRateLimitsSchema, codexTokenUsageSchema, CodexConnector;
+var nullableNumeric, numeric, rateLimitWindowSchema, rateLimitSnapshotSchema, codexRateLimitsSchema, codexTokenUsageSchema, CodexConnector, DAY_MS;
 var init_codex_connector = __esm({
   "src/connectors/codex/codex-connector.ts"() {
     "use strict";
@@ -3273,7 +3284,8 @@ var init_codex_connector = __esm({
         this.#historyClient = historyClient;
       }
       async collect(options = { mode: "incremental" }) {
-        const observedAt = this.#clock().toISOString();
+        const now = this.#clock();
+        const observedAt = now.toISOString();
         const warnings = [];
         let payload = null;
         try {
@@ -3283,18 +3295,18 @@ var init_codex_connector = __esm({
         }
         const history = this.#historyClient ? await this.#historyClient.readUsage(options) : { usage: [], costs: [], complete: true };
         const hasLocalHistory = history.usage.length > 0;
-        const accountUsage = mapTokenUsage(payload?.tokenUsage ?? null);
-        const canReconcile = history.complete && accountUsage.length > 0;
-        const reconciledRemainders = canReconcile ? reconcileAccountRemainders(accountUsage, history.usage) : [];
+        const settledDays = settledAccountDays(payload?.tokenUsage ?? null, now.getTime());
+        const canReconcile = history.complete && settledDays.length > 0;
+        const accountUsage = canReconcile ? reconcileAccountDays(settledDays, history.usage) : [];
         if (!history.complete) warnings.push(incompleteTranscriptFailure2());
         return {
           provider: { id: "codex", displayName: "Codex" },
           billingDomains: [{ id: "subscription", displayName: "Codex subscription" }],
           quotaBuckets: payload ? mapQuotaBuckets(payload.rateLimits) : [],
-          usage: [...accountUsage, ...history.usage, ...reconciledRemainders],
+          usage: [...accountUsage, ...history.usage],
           ...hasLocalHistory && canReconcile ? {
             usageReconciliation: {
-              authoritativeIdPrefix: "codex-transcript:",
+              authoritativeIdPrefixes: ["codex-transcript:", "codex:daily:"],
               retiredIdPrefixes: []
             }
           } : {},
@@ -3304,6 +3316,7 @@ var init_codex_connector = __esm({
         };
       }
     };
+    DAY_MS = 24 * 60 * 60 * 1e3;
   }
 });
 
@@ -3617,7 +3630,7 @@ var init_opencode_local_connector = __esm({
             quotaBuckets: [],
             usage: requests.map(mapLocalUsage),
             usageReconciliation: {
-              authoritativeIdPrefix: "opencode-local-request:",
+              authoritativeIdPrefixes: ["opencode-local-request:"],
               retiredIdPrefixes: []
             },
             costs: requests.flatMap(
@@ -4043,7 +4056,7 @@ var init_opencode_go_connector = __esm({
           usage: [],
           ...localResult.status === "fulfilled" ? {
             usageReconciliation: {
-              authoritativeIdPrefix: "opencode-request:",
+              authoritativeIdPrefixes: ["opencode-request:"],
               retiredIdPrefixes: ["opencode-session:"]
             }
           } : {},
@@ -4192,7 +4205,7 @@ var init_grok_build_connector = __esm({
           usage: history.usage,
           ...history.usage.length > 0 && history.complete ? {
             usageReconciliation: {
-              authoritativeIdPrefix: "grok-transcript:",
+              authoritativeIdPrefixes: ["grok-transcript:"],
               retiredIdPrefixes: ["grok-otel:", "grok-headless:"]
             }
           } : {},
@@ -6152,8 +6165,9 @@ function isForkedCodexSession(payload) {
   const spawn7 = asObject(subagent?.thread_spawn);
   return string(spawn7?.parent_thread_id) !== null;
 }
-async function listTranscriptFiles(root, cutoff) {
+async function listTranscriptFiles(roots, cutoff) {
   const files = [];
+  const visited = /* @__PURE__ */ new Set();
   let complete = true;
   const walk = async (directory, isRoot = false) => {
     let entries;
@@ -6168,6 +6182,8 @@ async function listTranscriptFiles(root, cutoff) {
       if (entry.isDirectory()) {
         await walk(path);
       } else if (entry.isFile() && entry.name.endsWith(".jsonl")) {
+        if (visited.has(path)) continue;
+        visited.add(path);
         try {
           const metadata = await stat(path);
           if (metadata.mtimeMs >= cutoff) {
@@ -6179,7 +6195,7 @@ async function listTranscriptFiles(root, cutoff) {
       }
     }
   };
-  await walk(root, true);
+  for (const root of roots) await walk(root, true);
   return { files, complete };
 }
 function isMissingPath(error) {
@@ -6272,7 +6288,7 @@ var init_local_transcript_usage_client = __esm({
     init_token_normalization();
     LocalTranscriptUsageClient = class {
       #provider;
-      #root;
+      #roots;
       #clock;
       #lookbackDays;
       #cachePath;
@@ -6280,7 +6296,7 @@ var init_local_transcript_usage_client = __esm({
       #cacheLoaded = false;
       constructor(options) {
         this.#provider = options.provider;
-        this.#root = options.root;
+        this.#roots = options.roots;
         this.#clock = options.clock ?? (() => /* @__PURE__ */ new Date());
         this.#lookbackDays = options.lookbackDays ?? 90;
         this.#cachePath = options.cachePath;
@@ -6289,7 +6305,7 @@ var init_local_transcript_usage_client = __esm({
         await this.#loadCache();
         if (options.mode === "hard-rebuild") this.#fileCache.clear();
         const cutoff = this.#clock().getTime() - this.#lookbackDays * 24 * 60 * 60 * 1e3;
-        const discovered = await listTranscriptFiles(this.#root, cutoff);
+        const discovered = await listTranscriptFiles(this.#roots, cutoff);
         const files = discovered.files;
         let complete = discovered.complete;
         const usage = [];
@@ -6482,10 +6498,7 @@ async function runDatabaseWorker(workerData) {
 }
 function additiveUsagePredicate(alias = "") {
   const prefix = alias ? `${alias}.` : "";
-  const codexOfficialDays = `(SELECT billing_domain_id, date(observed_at)
-    FROM usage_observations
-    WHERE provider_id = 'codex' AND id LIKE 'codex:daily:%')`;
-  const codexRemainderDays = `(SELECT billing_domain_id, date(observed_at)
+  const codexReconciledRemainderIds = `(SELECT billing_domain_id, id
     FROM usage_observations
     WHERE provider_id = 'codex' AND id LIKE 'codex-transcript:account-remainder:%')`;
   return `NOT (
@@ -6499,18 +6512,11 @@ function additiveUsagePredicate(alias = "") {
     )
     OR (
       ${prefix}provider_id = 'codex'
+      AND ${prefix}id LIKE 'codex:daily:%'
       AND (
-        (
-          ${prefix}id LIKE 'codex:daily:%'
-          AND (${prefix}billing_domain_id, date(${prefix}observed_at)) IN ${codexRemainderDays}
-        )
-        OR (
-          ${prefix}id LIKE 'codex-transcript:%'
-          AND ${prefix}id NOT LIKE 'codex-transcript:account-remainder:%'
-          AND (${prefix}billing_domain_id, date(${prefix}observed_at)) IN ${codexOfficialDays}
-          AND (${prefix}billing_domain_id, date(${prefix}observed_at)) NOT IN ${codexRemainderDays}
-        )
-      )
+        ${prefix}billing_domain_id,
+        'codex-transcript:account-remainder:' || substr(${prefix}id, 13)
+      ) IN ${codexReconciledRemainderIds}
     )
   )`;
 }
@@ -7895,7 +7901,7 @@ var init_sqlite_usage_repository = __esm({
           const usageReconciliation = snapshot2.usageReconciliation;
           if (usageReconciliation) {
             const prefixes = [
-              usageReconciliation.authoritativeIdPrefix,
+              ...usageReconciliation.authoritativeIdPrefixes,
               ...usageReconciliation.retiredIdPrefixes
             ];
             if (prefixes.some((prefix) => prefix.length === 0)) {
@@ -7930,11 +7936,12 @@ var init_sqlite_usage_repository = __esm({
             for (const prefix of usageReconciliation.retiredIdPrefixes) {
               deleteStoredUsage(prefix, /* @__PURE__ */ new Set());
             }
-            const authoritativePrefix = usageReconciliation.authoritativeIdPrefix;
-            const incomingAuthoritativeIds = new Set(
-              snapshot2.usage.map((observation) => observation.id).filter((id) => id.startsWith(authoritativePrefix))
-            );
-            deleteStoredUsage(authoritativePrefix, incomingAuthoritativeIds);
+            for (const authoritativePrefix of usageReconciliation.authoritativeIdPrefixes) {
+              const incomingAuthoritativeIds = new Set(
+                snapshot2.usage.map((observation) => observation.id).filter((id) => id.startsWith(authoritativePrefix))
+              );
+              deleteStoredUsage(authoritativePrefix, incomingAuthoritativeIds);
+            }
           }
           const usageStatement = this.#database.prepare(
             `INSERT INTO usage_observations (
@@ -9718,18 +9725,19 @@ async function runDaemon(home) {
 function localTranscriptClient(provider, applicationHome) {
   return new LocalTranscriptUsageClient({
     provider,
-    root: localTranscriptRoot(provider),
+    roots: localTranscriptRoots(provider),
     cachePath: join8(applicationHome, "cache", `${provider}-transcripts.json`)
   });
 }
-function localTranscriptRoot(provider) {
+function localTranscriptRoots(provider) {
   if (provider === "codex") {
-    return join8(resolveHomeOverride(process.env.CODEX_HOME, ".codex"), "sessions");
+    const home = resolveHomeOverride(process.env.CODEX_HOME, ".codex");
+    return [join8(home, "sessions"), join8(home, "archived_sessions")];
   }
   if (provider === "claude-code") {
-    return join8(resolveHomeOverride(process.env.CLAUDE_CONFIG_DIR, ".claude"), "projects");
+    return [join8(resolveHomeOverride(process.env.CLAUDE_CONFIG_DIR, ".claude"), "projects")];
   }
-  return join8(resolveHomeOverride(process.env.GROK_HOME, ".grok"), "sessions");
+  return [join8(resolveHomeOverride(process.env.GROK_HOME, ".grok"), "sessions")];
 }
 function resolveHomeOverride(value, fallback) {
   const configured = value?.trim();