@aexol/spectral 0.3.2 → 0.3.5

package/dist/relay/models-fetch.js

@@ -28,7 +28,7 @@ const cache = new Map();
 export function clearAllowedModelsCache() {
     cache.clear();
 }
-const QUERY = `query AvailableBaseModels { availableBaseModels { name provider userModelId agentEnabled } }`;
+const QUERY = `query AvailableBaseModels { availableBaseModels { name provider userModelId agentEnabled creditInputPer1M creditOutputPer1M creditCachedInputPer1M creditCacheReadPer1M creditCacheWritePer1M } }`;
 /**
  * Fetch the whitelist of allowed base models. Throws on any failure with a
  * message tailored for an operator running `spectral serve` — the caller
@@ -97,7 +97,17 @@ export async function fetchAllowedModels(opts) {
         const provider = typeof row?.provider === "string" ? row.provider : null;
         if (!name || !provider)
             continue; // skip malformed rows defensively
-        const model = { modelId: name, displayName: name, provider };
+        const asOptionalNumber = (v) => typeof v === "number" ? v : v == null ? null : undefined;
+        const model = {
+            modelId: name,
+            displayName: name,
+            provider,
+            creditInputPer1M: asOptionalNumber(row?.creditInputPer1M),
+            creditOutputPer1M: asOptionalNumber(row?.creditOutputPer1M),
+            creditCachedInputPer1M: asOptionalNumber(row?.creditCachedInputPer1M),
+            creditCacheReadPer1M: asOptionalNumber(row?.creditCacheReadPer1M),
+            creditCacheWritePer1M: asOptionalNumber(row?.creditCacheWritePer1M),
+        };
         if (typeof row?.userModelId === "string") {
             model.userModelId = row.userModelId;
         }

package/dist/server/pi-bridge.js

@@ -190,6 +190,31 @@ function supportsReasoning(modelId) {
     const bare = bareModelId(modelId);
     return REASONING_SUPPORT_PREFIXES.some((p) => modelId.startsWith(p) || bare.startsWith(p));
 }
+/**
+ * Calculate credits from token usage using per-model credit rates.
+ *
+ * NOTE: We intentionally keep higher precision here (no 2-decimal rounding)
+ * so small turns don't collapse to 0.00 in live UI aggregation. Rendering
+ * layers decide final display precision.
+ */
+function calculateCredits(inputTokens, outputTokens, cacheReadTokens = 0, cacheWriteTokens = 0, creditInputPer1M, creditOutputPer1M, creditCachedInputPer1M, creditCacheReadPer1M, creditCacheWritePer1M) {
+    const inputRate = creditInputPer1M ?? 0;
+    const outputRate = creditOutputPer1M ?? 0;
+    const cachedInputRate = creditCachedInputPer1M ?? 0;
+    const cacheReadRate = creditCacheReadPer1M ?? 0;
+    const cacheWriteRate = creditCacheWritePer1M ?? 0;
+    const credits = (inputTokens / 1_000_000) * inputRate +
+        (outputTokens / 1_000_000) * outputRate +
+        (cacheReadTokens / 1_000_000) * cacheReadRate +
+        (cacheWriteTokens / 1_000_000) * cacheWriteRate;
+    if (inputRate === 0 && outputRate === 0 && cacheReadRate === 0 && cacheWriteRate === 0) {
+        if (cachedInputRate > 0) {
+            return ((inputTokens + cacheReadTokens + cacheWriteTokens) / 1_000_000) * cachedInputRate;
+        }
+        return 0;
+    }
+    return credits;
+}
 /**
  * Parse the newline-delimited JSON of wire events persisted alongside an
  * assistant message and extract all tool_call / tool_result events.
@@ -294,6 +319,8 @@ export class PiBridge {
      * envelopes carrying the same modelId don't churn pi's internal state.
      */
     lastAppliedModelId;
+    /** Current model's credit rates (from availableBaseModels), used for token_usage. */
+    activeCreditRates = null;
     constructor(opts) {
         this.opts = opts;
     }
@@ -660,6 +687,16 @@ export class PiBridge {
         try {
             await this.session.setModel(model);
             this.lastAppliedModelId = modelId;
+            const selected = this.allowedModels?.find((m) => m.modelId === modelId);
+            this.activeCreditRates = selected
+                ? {
+                    creditInputPer1M: selected.creditInputPer1M ?? null,
+                    creditOutputPer1M: selected.creditOutputPer1M ?? null,
+                    creditCachedInputPer1M: selected.creditCachedInputPer1M ?? null,
+                    creditCacheReadPer1M: selected.creditCacheReadPer1M ?? null,
+                    creditCacheWritePer1M: selected.creditCacheWritePer1M ?? null,
+                }
+                : null;
             return true;
         }
         catch (err) {
@@ -889,8 +926,11 @@ export class PiBridge {
                 this.pending.wireEvents.push(endEvent);
                 this.opts.emit(endEvent);
                 // Emit token usage for this assistant message. pi provides token
-                // counts via ev.message.usage; cost is computed from the model's
-                // configured pricing (or null when unavailable).
+                // counts via ev.message.usage; credits are computed from the active
+                // model's configured credit rates.
+                //
+                // NOTE: `usage.cost` is still forwarded as a legacy wire field for
+                // backward compatibility, but the UI is credits-first.
                 //
                 // Skip zero-total-usage events — they happen when a turn is
                 // cancelled before the provider starts streaming, and emitting
@@ -912,6 +952,7 @@ export class PiBridge {
                             cacheWriteTokens: usage.cacheWrite ?? 0,
                             totalTokens: usage.totalTokens ?? totalTokens,
                             cost: usage.cost?.total ?? null,
+                            creditsUsed: calculateCredits(usage.input ?? 0, usage.output ?? 0, usage.cacheRead ?? 0, usage.cacheWrite ?? 0, this.activeCreditRates?.creditInputPer1M, this.activeCreditRates?.creditOutputPer1M, this.activeCreditRates?.creditCachedInputPer1M, this.activeCreditRates?.creditCacheReadPer1M, this.activeCreditRates?.creditCacheWritePer1M),
                         },
                     };
                     this.pending.wireEvents.push(usageEvent);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aexol/spectral",
-  "version": "0.3.2",
+  "version": "0.3.5",
   "description": "Always-on coding agent for Aexol — branded pi wrapper with relay-based browser access.",
   "type": "module",
   "private": false,