@aexol/spectral 0.3.1 → 0.3.4

package/dist/relay/client.js

@@ -234,6 +234,17 @@ export class RelayClient extends EventEmitter {
                 this.exit(1);
                 return;
             }
+            // Machine was revoked by the team admin from the Aexol Studio panel
+            // (backend sets `KnownMachine.revokedAt` and closes the socket with
+            // 4001 "machine-revoked"). Exit immediately — the machine JWT is now
+            // invalid and re-registration requires a fresh `spectral serve`.
+            if (code === 4001 && reasonStr === "machine-revoked") {
+                this.logger.error("\n✗ This machine has been disconnected from the Aexol Studio panel.");
+                this.logger.error("  Run `spectral serve` again to re-register.\n");
+                this.dispose();
+                this.exit(1);
+                return;
+            }
             this.scheduleReconnect();
         });
     }

package/dist/relay/machine-store.js

@@ -30,6 +30,7 @@ const KNOWN_KEYS = new Set([
     "machineJwt",
     "teamId",
     "ownerId",
+    "visibility",
     "registeredAt",
     "hostname",
     "version",
@@ -79,6 +80,7 @@ export async function loadMachine() {
         machineJwt: parsed.machineJwt,
         teamId: typeof parsed.teamId === "string" ? parsed.teamId : undefined,
         ownerId: typeof parsed.ownerId === "string" ? parsed.ownerId : undefined,
+        visibility: typeof parsed.visibility === "string" ? parsed.visibility : undefined,
         registeredAt: parsed.registeredAt,
         hostname: parsed.hostname,
         version: parsed.version,
@@ -109,6 +111,8 @@ export async function saveMachine(rec) {
         toWrite.teamId = rec.teamId;
     if (rec.ownerId !== undefined)
         toWrite.ownerId = rec.ownerId;
+    if (rec.visibility !== undefined)
+        toWrite.visibility = rec.visibility;
     if (rec.extra) {
         for (const [k, v] of Object.entries(rec.extra))
             toWrite[k] = v;

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/relay/registration.js

@@ -131,6 +131,7 @@ export async function ensureMachineRegistered(deps) {
         machineJwt: obj.jwt,
         teamId: typeof obj.teamId === "string" ? obj.teamId : undefined,
         ownerId: typeof obj.ownerId === "string" ? obj.ownerId : undefined,
+        visibility: typeof obj.visibility === "string" ? obj.visibility : undefined,
         registeredAt: Date.now(),
         hostname: hostname(),
         version: deps.version,

package/dist/server/pi-bridge.js

@@ -150,10 +150,20 @@ const MODEL_PRICING = [
     { prefix: "meta-llama/llama-4", input: 0.20, output: 0.80, cacheWrite: 0, cacheRead: 0 },
     { prefix: "meta-llama/llama-3.3", input: 0.20, output: 0.50, cacheWrite: 0, cacheRead: 0 },
 ];
+/**
+ * Strip vendor prefix to extract the bare model name.
+ * e.g. "openai/gpt-5.3-codex" → "gpt-5.3-codex".
+ * Returns the original string when no separator is present.
+ */
+function bareModelId(modelId) {
+    const idx = modelId.lastIndexOf("/");
+    return idx === -1 ? modelId : modelId.slice(idx + 1);
+}
 /** Look up pricing for a modelId. Returns null when unknown. */
 function lookupPricing(modelId) {
+    const bare = bareModelId(modelId);
     for (const entry of MODEL_PRICING) {
-        if (modelId.startsWith(entry.prefix)) {
+        if (modelId.startsWith(entry.prefix) || bare.startsWith(entry.prefix)) {
             return {
                 input: entry.input,
                 output: entry.output,
@@ -177,7 +187,30 @@ const REASONING_SUPPORT_PREFIXES = [
 ];
 /** Check if a modelId prefix indicates reasoning/thinking support. */
 function supportsReasoning(modelId) {
-    return REASONING_SUPPORT_PREFIXES.some((p) => modelId.startsWith(p));
+    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.
+ * Mirrors backend billing logic for Agent UI telemetry.
+ */
+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 Math.round(((inputTokens + cacheReadTokens + cacheWriteTokens) / 1_000_000) * cachedInputRate * 100) / 100;
+        }
+        return 0;
+    }
+    return Math.round(credits * 100) / 100;
 }
 /**
  * Parse the newline-delimited JSON of wire events persisted alongside an
@@ -283,6 +316,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;
     }
@@ -649,6 +684,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) {
@@ -878,8 +923,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
@@ -901,6 +949,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.1",
+  "version": "0.3.4",
   "description": "Always-on coding agent for Aexol — branded pi wrapper with relay-based browser access.",
   "type": "module",
   "private": false,