mixdog 0.9.1 → 0.9.3

package/src/runtime/agent/orchestrator/providers/grok-oauth.mjs

@@ -113,6 +113,9 @@ export function normalizeGrokModelId(id) {
     return (id && RETIRED_MODEL_ALIASES[id]) || id;
 }
 const MODEL_CACHE_TTL_MS = 24 * 60 * 60_000;
+// Bump when the on-disk cache shape changes so stale-shape entries are
+// discarded instead of misread.
+const GROK_MODEL_CACHE_SCHEMA_VERSION = 1;
 const DISCOVERY_TIMEOUT_MS = 15_000;
 const TOKEN_TIMEOUT_MS = 30_000;
 const LOGIN_TIMEOUT_MS = 5 * 60_000;
@@ -362,7 +365,11 @@ async function refreshTokens(tokens) {
 }
 
 // --- Model catalog cache (24h disk TTL) ---
-const _modelCache = makeModelCache({ fileName: 'grok-oauth-models.json', ttlMs: MODEL_CACHE_TTL_MS });
+const _modelCache = makeModelCache({
+    fileName: 'grok-oauth-models.json',
+    ttlMs: MODEL_CACHE_TTL_MS,
+    version: GROK_MODEL_CACHE_SCHEMA_VERSION,
+});
 const PROXY_MODEL_METADATA = {
     'grok-build': { display: 'Grok Build', contextWindow: 512000 },
     'grok-composer-2.5-fast': { display: 'Composer 2.5 Fast', contextWindow: 200000 },

package/src/runtime/agent/orchestrator/providers/lib/usage-primitives.mjs

@@ -0,0 +1,32 @@
+// Shared numeric/string primitives for provider usage-accounting modules.
+//
+// These are byte-for-byte identical helpers that were duplicated across
+// api-usage.mjs, oauth-usage.mjs and opencode-go-usage.mjs. Extracting them
+// here is behavior-preserving: each exported function reproduces the exact
+// logic of the copies it replaces.
+//
+// NOTE ON `num`: api-usage.mjs and oauth-usage.mjs use the guarded variant
+// below (treats null/undefined/'' as the fallback before Number()).
+// opencode-go-usage.mjs uses an *unguarded* variant (Number('') === 0), which
+// is observably different, so it keeps its own local `num` and is NOT wired to
+// this module.
+
+export function num(value, fallback = null) {
+  if (value === null || value === undefined || value === '') return fallback;
+  const n = Number(value);
+  return Number.isFinite(n) ? n : fallback;
+}
+
+export function round(value, digits = 4) {
+  const n = Number(value);
+  if (!Number.isFinite(n)) return null;
+  const scale = 10 ** digits;
+  return Math.round(n * scale) / scale;
+}
+
+// cleanString (oauth-usage.mjs) and clean (opencode-go-usage.mjs) were
+// identical: trim strings, coerce empties/non-strings to null.
+export function cleanString(value) {
+  const s = typeof value === 'string' ? value.trim() : '';
+  return s || null;
+}

package/src/runtime/agent/orchestrator/providers/model-catalog.mjs

@@ -14,9 +14,10 @@
  * a stale number.
  */
 
-import { existsSync, readFileSync, writeFileSync } from 'fs';
+import { existsSync, readFileSync } from 'fs';
 import { join } from 'path';
 import { getPluginData } from '../config.mjs';
+import { writeJsonAtomicSync } from '../../../shared/atomic-file.mjs';
 
 const CATALOG_URL = 'https://raw.githubusercontent.com/BerriAI/litellm/main/model_prices_and_context_window.json';
 const CATALOG_CACHE_FILE = 'litellm-catalog.json';
@@ -187,7 +188,7 @@ async function _loadCatalogImpl() {
         if (!res.ok) throw new Error('HTTP ' + res.status);
         const data = await res.json();
         try {
-            writeFileSync(cachePath(), JSON.stringify({ fetchedAt: Date.now(), data }));
+            writeJsonAtomicSync(cachePath(), { fetchedAt: Date.now(), data }, { lock: true, compact: true, fsyncDir: true, timeoutMs: 1000 });
         } catch { /* cache is best-effort */ }
         _memCache = data;
         _memCacheAt = Date.now();
@@ -239,7 +240,7 @@ async function _loadModelsDevImpl() {
         if (!res.ok) throw new Error('HTTP ' + res.status);
         const data = await res.json();
         try {
-            writeFileSync(mdCachePath(), JSON.stringify({ fetchedAt: Date.now(), data }));
+            writeJsonAtomicSync(mdCachePath(), { fetchedAt: Date.now(), data }, { lock: true, compact: true, fsyncDir: true, timeoutMs: 1000 });
         } catch { /* cache is best-effort */ }
         _mdCache = data;
         _mdCacheAt = Date.now();
@@ -430,12 +431,12 @@ export async function enrichModels(models) {
             outputCostPerM: meta.outputCostPerM,
             cacheReadCostPerM: meta.cacheReadCostPerM,
             cacheWriteCostPerM: meta.cacheWriteCostPerM,
-            supportsVision: meta.supportsVision,
-            supportsFunctionCalling: meta.supportsFunctionCalling,
+            supportsVision: m.supportsVision === true || meta.supportsVision,
+            supportsFunctionCalling: m.supportsFunctionCalling === true || meta.supportsFunctionCalling,
             supportsWebSearch: meta.supportsWebSearch || m.supportsWebSearch === true,
-            supportsPromptCaching: meta.supportsPromptCaching,
-            supportsReasoning: meta.supportsReasoning,
-            reasoningOptions: meta.reasoningOptions || m.reasoningOptions || [],
+            supportsPromptCaching: m.supportsPromptCaching === true || meta.supportsPromptCaching,
+            supportsReasoning: m.supportsReasoning === true || meta.supportsReasoning,
+            reasoningOptions: m.reasoningOptions?.length ? m.reasoningOptions : (meta.reasoningOptions || []),
             reasoningContentField: meta.reasoningContentField || m.reasoningContentField || null,
             mode: meta.mode || m.mode || null,
         };
@@ -472,3 +473,12 @@ export async function warmModelMetadataCatalogs() {
     const [litellm] = await Promise.all([loadCatalog(), loadModelsDevCatalog()]);
     return litellm;
 }
+
+/** Fire-and-forget warm of both in-memory catalog caches (disk-first, then remote). */
+export async function warmCatalogsInBackground() {
+    try {
+        await Promise.all([loadCatalog(), loadModelsDevCatalog()]);
+    } catch {
+        /* never throw — boot/statusline must not fail on catalog warm */
+    }
+}

package/src/runtime/agent/orchestrator/providers/oauth-usage.mjs

@@ -6,6 +6,7 @@ import { join } from 'path';
 import { updateJsonAtomicSync } from '../../../shared/atomic-file.mjs';
 import { resolvePluginData } from '../../../shared/plugin-paths.mjs';
 import { getLlmDispatcher } from '../../../shared/llm/http-agent.mjs';
+import { num, round, cleanString } from './lib/usage-primitives.mjs';
 
 const CACHE_FILE = 'gateway-oauth-usage-cache.json';
 const LIVE_CACHE_TTL_MS = 60_000;
@@ -21,24 +22,6 @@ const lastWarnAt = new Map();
 let pendingDiskSnapshots = new Map();
 let pendingDiskFlushTimer = null;
 
-function num(value, fallback = null) {
-  if (value === null || value === undefined || value === '') return fallback;
-  const n = Number(value);
-  return Number.isFinite(n) ? n : fallback;
-}
-
-function round(value, digits = 4) {
-  const n = Number(value);
-  if (!Number.isFinite(n)) return null;
-  const scale = 10 ** digits;
-  return Math.round(n * scale) / scale;
-}
-
-function cleanString(value) {
-  const s = typeof value === 'string' ? value.trim() : '';
-  return s || null;
-}
-
 function providerKey(routeInfo = {}) {
   return String(routeInfo?.provider || '').toLowerCase();
 }
@@ -301,7 +284,7 @@ function balanceFromCredits(credits, source) {
 }
 
 function balanceFromExtraUsage(extra) {
-  if (!extra || typeof extra !== 'object' || extra.is_enabled !== true) return null;
+  if (!extra || typeof extra !== 'object') return null;
   const limit = num(extra.monthly_limit, null);
   const used = num(extra.used_credits, 0);
   if (limit === null) return null;
@@ -315,6 +298,57 @@ function balanceFromExtraUsage(extra) {
   };
 }
 
+function balanceFromAnthropicSpend(spend) {
+  if (!spend || typeof spend !== 'object') return null;
+  const currency = cleanString(spend.used?.currency ?? spend.limit?.currency) || 'USD';
+  // spend.balance may be a plain number or a {amount_minor, exponent} money
+  // object like used/limit; support both shapes.
+  const directBalance = spend.balance && typeof spend.balance === 'object'
+    ? (() => {
+      const minor = num(spend.balance.amount_minor, null);
+      return minor === null ? null : minor / (10 ** num(spend.balance.exponent, 2));
+    })()
+    : num(spend.balance, null);
+  if (directBalance !== null) {
+    return {
+      source: 'anthropic-oauth-spend',
+      remainingUsd: round(directBalance, 4),
+      spentUsd: round(num(spend.used?.amount_minor, 0) / (10 ** num(spend.used?.exponent, 2)), 4),
+      currency,
+    };
+  }
+
+  const usedMinor = num(spend.used?.amount_minor, null);
+  const usedExponent = num(spend.used?.exponent, 2);
+  const usedUsd = usedMinor === null ? null : usedMinor / (10 ** usedExponent);
+
+  const capMinor = num(spend.cap?.credits?.amount_minor, null);
+  if (capMinor !== null && usedUsd !== null) {
+    const capExponent = num(spend.cap?.credits?.exponent, 2);
+    const capUsd = capMinor / (10 ** capExponent);
+    return {
+      source: 'anthropic-oauth-spend',
+      remainingUsd: round(Math.max(0, capUsd - usedUsd), 4),
+      spentUsd: round(usedUsd, 4),
+      currency,
+    };
+  }
+
+  const limitMinor = num(spend.limit?.amount_minor, null);
+  if (limitMinor !== null && limitMinor > 0 && usedUsd !== null) {
+    const limitExponent = num(spend.limit?.exponent, 2);
+    const limitUsd = limitMinor / (10 ** limitExponent);
+    return {
+      source: 'anthropic-oauth-spend',
+      remainingUsd: round(Math.max(0, limitUsd - usedUsd), 4),
+      spentUsd: round(usedUsd, 4),
+      currency,
+    };
+  }
+
+  return null;
+}
+
 function normalizeOpenAIWhamUsage(data) {
   const rate = data?.rate_limit && typeof data.rate_limit === 'object' ? data.rate_limit : null;
   if (!rate) return null;
@@ -388,7 +422,7 @@ function normalizeAnthropicUsage(data, source = 'anthropic-oauth') {
     provider: 'anthropic-oauth',
     source,
     quotaWindows: windows,
-    balance: balanceFromExtraUsage(data.extra_usage),
+    balance: balanceFromAnthropicSpend(data.spend) || balanceFromExtraUsage(data.extra_usage),
     rawKeys: Object.keys(data || {}).sort(),
   };
 }