agent-usage-all-in-one 0.6.0 → 0.6.1

package/dist/cli.js

@@ -4390,6 +4390,186 @@ var init_opencode_go_connector = __esm({
   }
 });
 
+// src/connectors/grok-build/grok-build-connector.ts
+import { z as z6 } from "zod";
+function incompleteTranscriptFailure3() {
+  return {
+    code: "local-transcript-scan-incomplete",
+    message: "Some local Grok history could not be read.",
+    recovery: "Agent Usage will retry automatically without removing stored history."
+  };
+}
+function grokBuildBillingDomain() {
+  return {
+    id: "grok-build-subscription",
+    displayName: "Grok Build / SuperGrok shared pool"
+  };
+}
+function isGrokOfficialModel(model) {
+  if (!model) return false;
+  const normalized = model.trim().toLowerCase();
+  if (normalized === "grok") return true;
+  if (normalized.startsWith("grok-") || normalized.startsWith("grok/")) {
+    return true;
+  }
+  return false;
+}
+function resolveGrokBillingDomain(model, customEndpoints) {
+  if (!model) return "grok-build-subscription";
+  const normalized = model.trim().toLowerCase();
+  if (customEndpoints?.has(normalized)) {
+    return customEndpoints.get(normalized);
+  }
+  if (isGrokOfficialModel(model)) {
+    return "grok-build-subscription";
+  }
+  return "custom";
+}
+function grokBuildBillingDomains(usage = []) {
+  const primary = grokBuildBillingDomain();
+  const observed = [...new Set(usage.map((o) => o.billingDomainId))].filter((id) => id !== primary.id).sort();
+  return [
+    primary,
+    ...observed.map((id) => ({
+      id,
+      displayName: id === "custom" ? "Custom endpoints" : id
+    }))
+  ];
+}
+function mapBillingQuota(billing) {
+  const config = billing.config;
+  if (!config) return [];
+  const usedPercent = config.creditUsagePercent ?? derivePercent(config.used?.val, config.monthlyLimit?.val);
+  if (usedPercent === null) return [];
+  const periodType = config.currentPeriod?.type;
+  const period = nativePeriod(periodType, config.currentPeriod ? void 0 : "monthly");
+  const resetsAt = config.currentPeriod?.end ?? config.billingPeriodEnd ?? null;
+  return [
+    {
+      id: `grok-build:${period.id}`,
+      billingDomainId: "grok-build-subscription",
+      label: period.label,
+      usedPercent,
+      windowDurationMinutes: nativeWindowDurationMinutes(
+        config.currentPeriod?.start ?? config.billingPeriodStart,
+        resetsAt,
+        period.id
+      ),
+      resetsAt,
+      authority: "official-client",
+      scope: "account-wide",
+      status: billing.subscriptionTier ?? null
+    }
+  ];
+}
+function nativeWindowDurationMinutes(startsAt, resetsAt, period) {
+  const start = startsAt ? Date.parse(startsAt) : Number.NaN;
+  const end = resetsAt ? Date.parse(resetsAt) : Number.NaN;
+  if (Number.isFinite(start) && Number.isFinite(end) && end > start) {
+    return Math.round((end - start) / 6e4);
+  }
+  if (period === "weekly") return 10080;
+  if (period === "monthly") return 43200;
+  return null;
+}
+function nativePeriod(type, fallback) {
+  if (type === "USAGE_PERIOD_TYPE_WEEKLY") return { id: "weekly", label: "Weekly limit" };
+  if (type === "USAGE_PERIOD_TYPE_MONTHLY" || fallback === "monthly") {
+    return { id: "monthly", label: "Monthly limit" };
+  }
+  return { id: "usage", label: "Usage" };
+}
+function derivePercent(used, limit) {
+  if (used === void 0 || limit === void 0 || limit <= 0) return null;
+  return Math.min(100, Math.max(0, used / limit * 100));
+}
+function safeFailure5(error) {
+  if (error instanceof Error && "code" in error && typeof error.code === "string" && "recovery" in error && typeof error.recovery === "string") {
+    return { code: error.code, message: error.message, recovery: error.recovery };
+  }
+  return {
+    code: "grok-billing-adapter-failed",
+    message: "Grok Build subscription quota is unavailable.",
+    recovery: "Open Grok Build and run /usage, then update Grok Build before retrying."
+  };
+}
+var centSchema, usagePeriodSchema, billingConfigSchema, grokBillingResponseSchema, GrokBuildConnector;
+var init_grok_build_connector = __esm({
+  "src/connectors/grok-build/grok-build-connector.ts"() {
+    "use strict";
+    centSchema = z6.object({ val: z6.number().default(0) }).passthrough();
+    usagePeriodSchema = z6.object({
+      type: z6.string().optional(),
+      start: z6.string().optional(),
+      end: z6.string().optional()
+    }).passthrough();
+    billingConfigSchema = z6.object({
+      creditUsagePercent: z6.number().min(0).max(100).optional(),
+      currentPeriod: usagePeriodSchema.optional(),
+      monthlyLimit: centSchema.optional(),
+      used: centSchema.optional(),
+      billingPeriodStart: z6.string().optional(),
+      billingPeriodEnd: z6.string().optional(),
+      isUnifiedBillingUser: z6.boolean().optional()
+    }).passthrough();
+    grokBillingResponseSchema = z6.object({
+      config: billingConfigSchema.nullable(),
+      onDemandEnabled: z6.boolean().nullable().optional(),
+      subscriptionTier: z6.string().optional(),
+      sourceObservedAt: z6.string().datetime({ offset: true }).optional()
+    }).passthrough();
+    GrokBuildConnector = class {
+      id = "grok";
+      displayName = "Grok";
+      consentId = "grok";
+      #billingClient;
+      #historyClient;
+      #clock;
+      constructor(options) {
+        this.#billingClient = options.billingClient;
+        this.#historyClient = options.historyClient;
+        this.#clock = options.clock ?? (() => /* @__PURE__ */ new Date());
+      }
+      async collect(options = { mode: "incremental" }) {
+        const warnings = [];
+        let quotaBuckets = [];
+        let observedAt = this.#clock().toISOString();
+        try {
+          const billing = await this.#billingClient.readBilling();
+          observedAt = billing.sourceObservedAt ?? observedAt;
+          quotaBuckets = mapBillingQuota(billing);
+          if (quotaBuckets.length === 0) {
+            warnings.push({
+              code: "grok-subscription-quota-unavailable",
+              message: "Grok Build subscription quota is unavailable.",
+              recovery: "Open Grok Build and run /usage, then retry refresh."
+            });
+          }
+        } catch (error) {
+          warnings.push(safeFailure5(error));
+        }
+        const history = this.#historyClient ? await this.#historyClient.readUsage(options) : { usage: [], costs: [], complete: true };
+        if (!history.complete) warnings.push(incompleteTranscriptFailure3());
+        return {
+          provider: { id: this.id, displayName: this.displayName },
+          billingDomains: grokBuildBillingDomains(history.usage),
+          quotaBuckets,
+          usage: history.usage,
+          ...history.usage.length > 0 && history.complete ? {
+            usageReconciliation: {
+              authoritativeIdPrefixes: ["grok-transcript:"],
+              retiredIdPrefixes: ["grok-otel:", "grok-headless:"]
+            }
+          } : {},
+          costs: history.costs,
+          warnings,
+          observedAt
+        };
+      }
+    };
+  }
+});
+
 // src/server/zstd-frames.ts
 import { zstdDecompressSync } from "zlib";
 async function readZstdFramedText(source) {
@@ -4483,6 +4663,34 @@ import { createReadStream } from "fs";
 import { mkdir as mkdir2, opendir, readFile as readFile3, rename as rename2, stat, writeFile as writeFile2 } from "fs/promises";
 import { dirname, join as join3 } from "path";
 import { createInterface } from "readline";
+function loadGrokConfigCustomModels(configContent) {
+  const customModels = /* @__PURE__ */ new Map();
+  const modelSections = [
+    ...configContent.matchAll(/\[model\.(?:"([^"]+)"|([a-zA-Z0-9_-]+))\]([\s\S]*?)(?=\n\[|$)/g)
+  ];
+  for (const m of modelSections) {
+    const key = m[1] || m[2];
+    const body = m[3];
+    const modelMatch = body.match(/model\s*=\s*"([^"]+)"/);
+    const baseUrlMatch = body.match(/base_url\s*=\s*"([^"]+)"/);
+    const providerMatch = body.match(/model_provider\s*=\s*"([^"]+)"/);
+    if (baseUrlMatch || providerMatch) {
+      const domain = providerMatch ? providerMatch[1].trim() : "custom";
+      if (key) {
+        customModels.set(key.trim().toLowerCase(), domain);
+        const stripped = key.trim().toLowerCase().replace(/-(high|medium|low)$/, "");
+        if (stripped) customModels.set(stripped, domain);
+      }
+      if (modelMatch) {
+        const mName = modelMatch[1].trim().toLowerCase();
+        customModels.set(mName, domain);
+        const stripped = mName.replace(/-(high|medium|low)$/, "");
+        if (stripped) customModels.set(stripped, domain);
+      }
+    }
+  }
+  return customModels;
+}
 function isCachedTranscriptFile(value) {
   const record = asObject(value);
   if (!record || !Array.isArray(record.records)) return false;
@@ -4524,7 +4732,7 @@ function isParsedTranscriptRecord(value) {
 function nonNegativeSafeInteger(value) {
   return typeof value === "number" && Number.isSafeInteger(value) && value >= 0;
 }
-function parseGrokTranscriptLine(line) {
+function parseGrokTranscriptLine(line, grokCustomModels) {
   const record = parseObject(line);
   const params = asObject(record?.params);
   const update = asObject(params?.update);
@@ -4568,11 +4776,12 @@ function parseGrokTranscriptLine(line) {
     const dedupeKey = `${sessionId}:${promptId ?? stableId(line)}:${model}`;
     const directCost = grokCostUsd(totals.costUsdTicks);
     const reportedCostUsd = directCost ?? (remainingCost !== null && untickedTokens > 0 ? remainingCost * (grokRecordedTokens(totals) / untickedTokens) : null);
+    const billingDomainId = resolveGrokBillingDomain(model, grokCustomModels);
     return {
       dedupeKey,
       observation: {
         id: `grok-transcript:${stableId(dedupeKey)}`,
-        billingDomainId: "grok-build-subscription",
+        billingDomainId,
         model,
         sessionId,
         observedAt,
@@ -4897,6 +5106,7 @@ var init_local_transcript_usage_client = __esm({
   "src/server/local-transcript-usage-client.ts"() {
     "use strict";
     init_token_normalization();
+    init_grok_build_connector();
     init_zstd_frames();
     DSH_PRIMARY_BILLING_DOMAIN_ID = "deepseek-official";
     DSH_SESSION_FORMAT_VERSION = 0;
@@ -4910,6 +5120,8 @@ var init_local_transcript_usage_client = __esm({
       #cachePath;
       #fileCache = /* @__PURE__ */ new Map();
       #cacheLoaded = false;
+      #grokCustomModels = /* @__PURE__ */ new Map();
+      #grokCustomModelsLoaded = false;
       constructor(options) {
         this.#provider = options.provider;
         this.#roots = options.roots;
@@ -4918,6 +5130,19 @@ var init_local_transcript_usage_client = __esm({
         this.#cachePath = options.cachePath;
       }
       async readUsage(options = { mode: "incremental" }) {
+        if (this.#provider === "grok" && !this.#grokCustomModelsLoaded) {
+          this.#grokCustomModelsLoaded = true;
+          for (const root of this.#roots) {
+            try {
+              const configPath = join3(dirname(root), "config.toml");
+              const content = await readFile3(configPath, "utf8");
+              for (const [k, v] of loadGrokConfigCustomModels(content)) {
+                this.#grokCustomModels.set(k, v);
+              }
+            } catch {
+            }
+          }
+        }
         await this.#loadCache();
         if (options.mode === "hard-rebuild") this.#fileCache.clear();
         const cutoff = this.#clock().getTime() - this.#lookbackDays * 24 * 60 * 60 * 1e3;
@@ -4965,6 +5190,22 @@ var init_local_transcript_usage_client = __esm({
         const cacheKey = stableId(file.path);
         const cached = this.#fileCache.get(cacheKey);
         if (cached && cached.size === file.size && cached.mtimeMs === file.mtimeMs) {
+          if (this.#provider === "grok") {
+            const remapped = cached.records.map((r) => {
+              const expectedDomain = resolveGrokBillingDomain(
+                r.observation.model,
+                this.#grokCustomModels
+              );
+              if (r.observation.billingDomainId !== expectedDomain) {
+                return {
+                  ...r,
+                  observation: { ...r.observation, billingDomainId: expectedDomain }
+                };
+              }
+              return r;
+            });
+            return { records: remapped, complete: true, unsupportedFormat: false };
+          }
           return { records: cached.records, complete: true, unsupportedFormat: false };
         }
         const records = [];
@@ -5008,7 +5249,7 @@ var init_local_transcript_usage_client = __esm({
         if (this.#provider === "dsh") {
           return DSH_LINE_HINTS.some((hint) => line.includes(hint)) ? parseDshTranscriptLine(line, dshState) : [];
         }
-        return line.includes('"turn_completed"') ? parseGrokTranscriptLine(line) : [];
+        return line.includes('"turn_completed"') ? parseGrokTranscriptLine(line, this.#grokCustomModels) : [];
       }
       async #loadCache() {
         if (this.#cacheLoaded) return;
@@ -5063,7 +5304,7 @@ function unsupportedFormatFailure() {
     recovery: "Update Agent Usage; stored dsh history from earlier scans is retained."
   };
 }
-function safeFailure5(error) {
+function safeFailure6(error) {
   if (error instanceof Error && "code" in error && typeof error.code === "string" && "recovery" in error && typeof error.recovery === "string") {
     return { code: error.code, message: error.message, recovery: error.recovery };
   }
@@ -5095,7 +5336,7 @@ var init_dsh_connector = __esm({
         try {
           history = await this.#historyClient.readUsage(options);
         } catch (error) {
-          warnings.push(safeFailure5(error));
+          warnings.push(safeFailure6(error));
         }
         if (history?.unsupportedFormat) warnings.push(unsupportedFormatFailure());
         else if (history && !history.complete) warnings.push(incompleteSessionLogFailure());
@@ -5344,7 +5585,7 @@ function incompleteSessionScanFailure() {
     recovery: "Agent Usage will retry automatically on the next scan without removing stored history."
   };
 }
-function safeFailure6() {
+function safeFailure7() {
   return {
     code: "antigravity-sqlite-read-failed",
     message: "Failed to read local Antigravity conversation stores.",
@@ -5386,7 +5627,7 @@ var init_antigravity_connector = __esm({
         try {
           history = await this.#historyClient.readUsage(options);
         } catch {
-          warnings.push(safeFailure6());
+          warnings.push(safeFailure7());
         }
         if (history && !history.complete) {
           warnings.push(incompleteSessionScanFailure());
@@ -5814,155 +6055,6 @@ var init_antigravity_sqlite_usage_client = __esm({
   }
 });
 
-// src/connectors/grok-build/grok-build-connector.ts
-import { z as z6 } from "zod";
-function incompleteTranscriptFailure3() {
-  return {
-    code: "local-transcript-scan-incomplete",
-    message: "Some local Grok history could not be read.",
-    recovery: "Agent Usage will retry automatically without removing stored history."
-  };
-}
-function grokBuildBillingDomain() {
-  return {
-    id: "grok-build-subscription",
-    displayName: "Grok Build / SuperGrok shared pool"
-  };
-}
-function mapBillingQuota(billing) {
-  const config = billing.config;
-  if (!config) return [];
-  const usedPercent = config.creditUsagePercent ?? derivePercent(config.used?.val, config.monthlyLimit?.val);
-  if (usedPercent === null) return [];
-  const periodType = config.currentPeriod?.type;
-  const period = nativePeriod(periodType, config.currentPeriod ? void 0 : "monthly");
-  const resetsAt = config.currentPeriod?.end ?? config.billingPeriodEnd ?? null;
-  return [
-    {
-      id: `grok-build:${period.id}`,
-      billingDomainId: "grok-build-subscription",
-      label: period.label,
-      usedPercent,
-      windowDurationMinutes: nativeWindowDurationMinutes(
-        config.currentPeriod?.start ?? config.billingPeriodStart,
-        resetsAt,
-        period.id
-      ),
-      resetsAt,
-      authority: "official-client",
-      scope: "account-wide",
-      status: billing.subscriptionTier ?? null
-    }
-  ];
-}
-function nativeWindowDurationMinutes(startsAt, resetsAt, period) {
-  const start = startsAt ? Date.parse(startsAt) : Number.NaN;
-  const end = resetsAt ? Date.parse(resetsAt) : Number.NaN;
-  if (Number.isFinite(start) && Number.isFinite(end) && end > start) {
-    return Math.round((end - start) / 6e4);
-  }
-  if (period === "weekly") return 10080;
-  if (period === "monthly") return 43200;
-  return null;
-}
-function nativePeriod(type, fallback) {
-  if (type === "USAGE_PERIOD_TYPE_WEEKLY") return { id: "weekly", label: "Weekly limit" };
-  if (type === "USAGE_PERIOD_TYPE_MONTHLY" || fallback === "monthly") {
-    return { id: "monthly", label: "Monthly limit" };
-  }
-  return { id: "usage", label: "Usage" };
-}
-function derivePercent(used, limit) {
-  if (used === void 0 || limit === void 0 || limit <= 0) return null;
-  return Math.min(100, Math.max(0, used / limit * 100));
-}
-function safeFailure7(error) {
-  if (error instanceof Error && "code" in error && typeof error.code === "string" && "recovery" in error && typeof error.recovery === "string") {
-    return { code: error.code, message: error.message, recovery: error.recovery };
-  }
-  return {
-    code: "grok-billing-adapter-failed",
-    message: "Grok Build subscription quota is unavailable.",
-    recovery: "Open Grok Build and run /usage, then update Grok Build before retrying."
-  };
-}
-var centSchema, usagePeriodSchema, billingConfigSchema, grokBillingResponseSchema, GrokBuildConnector;
-var init_grok_build_connector = __esm({
-  "src/connectors/grok-build/grok-build-connector.ts"() {
-    "use strict";
-    centSchema = z6.object({ val: z6.number().default(0) }).passthrough();
-    usagePeriodSchema = z6.object({
-      type: z6.string().optional(),
-      start: z6.string().optional(),
-      end: z6.string().optional()
-    }).passthrough();
-    billingConfigSchema = z6.object({
-      creditUsagePercent: z6.number().min(0).max(100).optional(),
-      currentPeriod: usagePeriodSchema.optional(),
-      monthlyLimit: centSchema.optional(),
-      used: centSchema.optional(),
-      billingPeriodStart: z6.string().optional(),
-      billingPeriodEnd: z6.string().optional(),
-      isUnifiedBillingUser: z6.boolean().optional()
-    }).passthrough();
-    grokBillingResponseSchema = z6.object({
-      config: billingConfigSchema.nullable(),
-      onDemandEnabled: z6.boolean().nullable().optional(),
-      subscriptionTier: z6.string().optional(),
-      sourceObservedAt: z6.string().datetime({ offset: true }).optional()
-    }).passthrough();
-    GrokBuildConnector = class {
-      id = "grok";
-      displayName = "Grok";
-      consentId = "grok";
-      #billingClient;
-      #historyClient;
-      #clock;
-      constructor(options) {
-        this.#billingClient = options.billingClient;
-        this.#historyClient = options.historyClient;
-        this.#clock = options.clock ?? (() => /* @__PURE__ */ new Date());
-      }
-      async collect(options = { mode: "incremental" }) {
-        const warnings = [];
-        let quotaBuckets = [];
-        let observedAt = this.#clock().toISOString();
-        try {
-          const billing = await this.#billingClient.readBilling();
-          observedAt = billing.sourceObservedAt ?? observedAt;
-          quotaBuckets = mapBillingQuota(billing);
-          if (quotaBuckets.length === 0) {
-            warnings.push({
-              code: "grok-subscription-quota-unavailable",
-              message: "Grok Build subscription quota is unavailable.",
-              recovery: "Open Grok Build and run /usage, then retry refresh."
-            });
-          }
-        } catch (error) {
-          warnings.push(safeFailure7(error));
-        }
-        const history = this.#historyClient ? await this.#historyClient.readUsage(options) : { usage: [], costs: [], complete: true };
-        if (!history.complete) warnings.push(incompleteTranscriptFailure3());
-        return {
-          provider: { id: this.id, displayName: this.displayName },
-          billingDomains: [grokBuildBillingDomain()],
-          quotaBuckets,
-          usage: history.usage,
-          ...history.usage.length > 0 && history.complete ? {
-            usageReconciliation: {
-              authoritativeIdPrefixes: ["grok-transcript:"],
-              retiredIdPrefixes: ["grok-otel:", "grok-headless:"]
-            }
-          } : {},
-          costs: history.costs,
-          warnings,
-          observedAt
-        };
-      }
-    };
-  }
-});
-
 // src/connectors/grok-build/grok-telemetry.ts
 function parseGrokOtlpMetrics(payload, receivedAt) {
   const resources = extractOtlpResources(payload);
@@ -6023,7 +6115,7 @@ function parseGrokOtlpMetrics(payload, receivedAt) {
   return snapshot(
     [...usage.entries()].map(([key, item]) => ({
       id: `grok-otel:${key}`,
-      billingDomainId: "grok-build-subscription",
+      billingDomainId: resolveGrokBillingDomain(item.model),
       model: item.model,
       sessionId: item.sessionId,
       observedAt: item.timestamp,
@@ -6050,7 +6142,7 @@ function parseGrokOtlpMetrics(payload, receivedAt) {
 function snapshot(usage, warnings, receivedAt) {
   return {
     provider: { id: "grok", displayName: "Grok" },
-    billingDomains: [grokBuildBillingDomain()],
+    billingDomains: grokBuildBillingDomains(usage),
     quotaBuckets: [],
     usage,
     costs: [],
@@ -8387,7 +8479,7 @@ function allDomainHistories(providers) {
       provider,
       domain,
       history: domain.history,
-      includedInHeadline: provider.id === "dsh" ? true : domain.id === provider.summaryBillingDomainId
+      includedInHeadline: provider.id === "dsh" || provider.id === "grok" && domain.id !== "xai-api" ? true : domain.id === provider.summaryBillingDomainId
     }))
   );
 }
@@ -9629,6 +9721,7 @@ var init_sqlite_usage_repository = __esm({
          model, usage_observation_id, priced_tokens, line_items_json, calculated_at
        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
        ON CONFLICT(provider_id, id) DO UPDATE SET
+         billing_domain_id = excluded.billing_domain_id,
          amount = excluded.amount,
          price_snapshot_rates_json = excluded.price_snapshot_rates_json,
          line_items_json = excluded.line_items_json,
@@ -10199,10 +10292,11 @@ var init_sqlite_usage_repository = __esm({
         } : { status: "healthy", errorCode: null, message: null, recovery: null };
         let providerTokenTotals = summaryDomain?.tokenTotals ?? emptyTotals;
         let providerTokenEvidence = summaryDomain?.tokenEvidence ?? emptyEvidence;
-        if (provider.id === "dsh" && billingDomains3.length > 1) {
+        if ((provider.id === "dsh" || provider.id === "grok") && billingDomains3.length > 1) {
           const combinedTotals = zeroTokenTotals();
           const combinedEvidence = emptyTokenEvidence();
           for (const d of billingDomains3) {
+            if (provider.id === "grok" && d.id === "xai-api") continue;
             combinedTotals.total += d.tokenTotals.total;
             combinedTotals.input += d.tokenTotals.input;
             combinedTotals.output += d.tokenTotals.output;