@adonis-agora/agent 0.69.0 → 0.70.0

package/dist/src/pricing/resolve.js

@@ -0,0 +1,162 @@
+import { estimateCost, resolveModelPrice, } from '../spi/pricing-store.js';
+import { awsPartitionOfRegion, bedrockPriceCandidates, builtinBedrockPrice, isBedrockModel, parseBedrockModelId, } from './bedrock.js';
+import { CATALOG_TIMEOUT_MS, ensureModelPricing, normalizePriceEntries, } from './boot-pricing.js';
+import { lookupModelsDevPricesEach, modelsDevRefsFor } from './models-dev.js';
+/**
+ * The cost a usage row persists: the provider's figure (`'provider'`), else the estimate off the
+ * model's price row (`'estimate'`), else nothing (`cost_usd` NULL). The one rule every engine
+ * records usage by, so the ledger, a USD quota and the message carry the same figure.
+ */
+export function resolveUsageCost(usage, reportedCostUsd, price) {
+    if (reportedCostUsd !== undefined)
+        return { costUsd: reportedCostUsd, costSource: 'provider' };
+    if (price === undefined)
+        return {};
+    return { costUsd: estimateCost(usage, { ...price, effectiveFrom: '' }), costSource: 'estimate' };
+}
+const DEFAULT_CACHE_MS = 60_000;
+/**
+ * The price of a model an engine only learns about at run time (OpenCode reports the model each step
+ * ran on), resolved the way boot pricing does it for configured models:
+ *
+ * 1. the pricing store's current row (by the id, then its normalized Bedrock candidates);
+ * 2. once per model and process, the boot seed (`ensureModelPricing`): the app's
+ *    `priceCatalog.prices`, then the built-in GovCloud Bedrock table, then models.dev — written to
+ *    the store as a row, so the dashboard and a later run read the same price;
+ * 3. without a pricing store, the same three sources, kept in memory.
+ *
+ * Never throws: pricing is bookkeeping, and an unpriced step is recorded without a cost.
+ */
+export class ModelPriceResolver {
+    options;
+    rows;
+    rowsAt = 0;
+    seeded = new Map();
+    constructor(options = {}) {
+        this.options = options;
+    }
+    async priceFor(model) {
+        const ids = [...new Set([model.modelId, ...(model.aliases ?? [])])].filter(Boolean);
+        try {
+            const found = matchIn(await this.currentRows(), ids);
+            if (found !== undefined)
+                return found;
+            const key = `${model.provider ?? ''}|${ids.join('|')}`;
+            let seeding = this.seeded.get(key);
+            if (seeding === undefined) {
+                seeding = this.seed(ids, model.provider);
+                this.seeded.set(key, seeding);
+            }
+            return await seeding;
+        }
+        catch {
+            return undefined;
+        }
+    }
+    catalog() {
+        const catalog = this.options.catalog;
+        if (catalog !== undefined)
+            return catalog;
+        // As boot pricing: no network catalog in tests unless the app asked for one.
+        return env('NODE_ENV') === 'test' ? { modelsDev: false } : {};
+    }
+    async currentRows(force = false) {
+        const store = this.options.pricingStore;
+        if (store === undefined)
+            return new Map();
+        const ttl = this.options.cacheMs ?? DEFAULT_CACHE_MS;
+        if (force || this.rows === undefined || Date.now() - this.rowsAt > ttl) {
+            const rows = await store.listCurrentPrices();
+            this.rows = new Map(rows.map((row) => [row.modelId, row]));
+            this.rowsAt = Date.now();
+        }
+        return this.rows;
+    }
+    async seed(ids, provider) {
+        const store = this.options.pricingStore;
+        const catalog = this.catalog();
+        if (store === undefined)
+            return this.inMemory(ids, provider, catalog);
+        // A label that wraps a Bedrock id (`amazon-bedrock/us-gov.…`) does not say its partition, so it
+        // would be looked up as a commercial model: only the Bedrock-shaped ids are seeded then.
+        const bedrock = ids.filter((id) => parseBedrockModelId(id) !== undefined);
+        const seedIds = bedrock.length > 0 ? bedrock : ids;
+        // The boot seed, for this model only. Its "no cost will be recorded" warning names every id it
+        // was given, so it is held back until it is known that none of them got a price.
+        const warnings = [];
+        await ensureModelPricing({
+            models: seedIds.map((modelId) => ({
+                modelId,
+                ...(provider !== undefined ? { provider } : {}),
+                reportsCost: false,
+            })),
+            pricingStore: store,
+            catalog,
+            log: {
+                info: (message) => this.options.log?.info(message),
+                warn: (message) => warnings.push(message),
+            },
+        });
+        const found = matchIn(await this.currentRows(true), ids);
+        if (found === undefined)
+            for (const message of warnings)
+                this.options.log?.warn(message);
+        return found;
+    }
+    /** No pricing store: the app's prices, the built-in Bedrock table, then models.dev. */
+    async inMemory(ids, provider, catalog) {
+        const options = catalog === false ? undefined : catalog;
+        const app = matchIn(normalizePriceEntries(options?.prices ?? [], this.options.log), ids);
+        if (app !== undefined)
+            return app;
+        const region = options?.region ?? env('AWS_REGION') ?? env('AWS_DEFAULT_REGION');
+        const bedrock = ids.filter((id) => isBedrockModel(id, provider));
+        const partition = bedrock.map((id) => parseBedrockModelId(id)?.partition).find((p) => p !== undefined) ??
+            (bedrock.length > 0 ? awsPartitionOfRegion(region) : undefined);
+        if (partition !== undefined && partition !== 'aws') {
+            // Never models.dev here: its Bedrock prices are the commercial ones.
+            for (const id of bedrock) {
+                const price = builtinBedrockPrice(id, partition);
+                if (price !== undefined)
+                    return { ...price, modelId: ids[0] };
+            }
+            return undefined;
+        }
+        if (options === undefined || options.modelsDev === false)
+            return undefined;
+        const { prices: _p, region: _r, modelsDev: _m, ...modelsDev } = options;
+        const refs = [...new Set(ids.flatMap((id) => modelsDevRefsFor(id, provider)))];
+        const [price] = await lookupModelsDevPricesEach([refs], modelsDev.signal !== undefined
+            ? modelsDev
+            : { ...modelsDev, signal: AbortSignal.timeout(CATALOG_TIMEOUT_MS) });
+        return price !== undefined ? { ...price, modelId: ids[0] } : undefined;
+    }
+}
+/** The first price for any of `ids`: exact, then its normalized Bedrock candidates. */
+function matchIn(prices, ids) {
+    for (const id of ids) {
+        const exact = prices.get(id);
+        if (exact !== undefined)
+            return exact;
+    }
+    const rows = new Map([...prices].map(([id, p]) => [id, { ...p, effectiveFrom: '' }]));
+    for (const id of ids) {
+        const price = resolveModelPrice(rows, id);
+        if (price !== undefined)
+            return price;
+    }
+    for (const id of ids) {
+        for (const candidate of bedrockPriceCandidates(id)) {
+            const price = prices.get(candidate);
+            if (price !== undefined)
+                return price;
+        }
+    }
+    return undefined;
+}
+function env(name) {
+    const value = globalThis.process
+        ?.env?.[name];
+    return value !== undefined && value.length > 0 ? value : undefined;
+}
+//# sourceMappingURL=resolve.js.map

package/dist/src/pricing/resolve.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../../src/pricing/resolve.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adonis-agora/agent",
-  "version": "0.69.0",
+  "version": "0.70.0",
   "description": "Governed, durable-backed AI agent (chat + tool-calling + governance) for AdonisJS — part of the Agora ecosystem.",
   "license": "MIT",
   "repository": {