@agent-native/core 0.187.0 → 0.187.1-nightly-20260924193134

package/dist/usage/metrics-store.js

@@ -2,7 +2,7 @@ import { getAppConfig } from "../app-config/index.js";
 import { getDbExec } from "../db/client.js";
 import { ForbiddenError } from "../sharing/access.js";
 import { isSelfScopedUsageRead, usageOrgScope } from "./org-scope.js";
-import { builderCreditsFromCostCents, usageBillingForEngine, } from "./store.js";
+import { builderCreditsFromCostCents, ensureUsageTable, usageBillingForEngine, MIXED_USAGE_BILLING, } from "./store.js";
 const DAY_MS = 86_400_000;
 function numberField(row, key) {
     return Number(row[key] ?? 0) || 0;
@@ -133,7 +133,7 @@ async function resolveScope(input, scope, requestedUserEmail) {
 function buildUsageCost(row) {
     return numberField(row, "cost_x100") / 100;
 }
-function bucketFromRow(row) {
+function bucketFromRow(row, builderCreditsEnabled) {
     const key = stringField(row, "k");
     return {
         key,
@@ -144,14 +144,24 @@ function bucketFromRow(row) {
         outputTokens: numberField(row, "output_tokens"),
         cacheReadTokens: numberField(row, "cache_read_tokens"),
         cacheWriteTokens: numberField(row, "cache_write_tokens"),
+        ...(builderCreditsEnabled
+            ? {
+                builderCredits: numberField(row, "builder_credits"),
+                estimatedBuilderCredits: builderCreditsFromCostCents(numberField(row, "estimated_builder_cost_x100") / 100),
+                otherCostCents: numberField(row, "other_cost_x100") / 100,
+            }
+            : {}),
         activeUsers: numberField(row, "active_users"),
         lastActiveAt: row.last_active_at == null ? null : numberField(row, "last_active_at"),
     };
 }
-async function usageBuckets(columnExpression, scope, appScope, sinceMs, limit) {
+async function usageBuckets(columnExpression, scope, appScope, sinceMs, limit, builderCreditsEnabled) {
     const result = await getDbExec().execute({
         sql: `SELECT ${columnExpression} AS k,
         COALESCE(SUM(cost_cents_x100), 0) AS cost_x100,
+        COALESCE(SUM(builder_credits_used), 0) AS builder_credits,
+        COALESCE(SUM(CASE WHEN engine_name = 'builder' AND builder_credits_used IS NULL THEN cost_cents_x100 ELSE 0 END), 0) AS estimated_builder_cost_x100,
+        COALESCE(SUM(CASE WHEN engine_name IS DISTINCT FROM 'builder' AND builder_credits_used IS NULL THEN cost_cents_x100 ELSE 0 END), 0) AS other_cost_x100,
         COUNT(*) AS calls,
         COALESCE(SUM(input_tokens), 0) AS input_tokens,
         COALESCE(SUM(output_tokens), 0) AS output_tokens,
@@ -162,11 +172,11 @@ async function usageBuckets(columnExpression, scope, appScope, sinceMs, limit) {
       FROM token_usage
       WHERE ${appScope.where} AND ${scope.where} AND created_at >= ?
       GROUP BY ${columnExpression}
-      ORDER BY cost_x100 DESC
+      ORDER BY ${builderCreditsEnabled ? "builder_credits DESC, estimated_builder_cost_x100 DESC, other_cost_x100 DESC" : "cost_x100 DESC"}
       LIMIT ?`,
         args: [...appScope.args, ...scope.args, sinceMs, limit],
     });
-    return result.rows.map(bucketFromRow);
+    return result.rows.map((row) => bucketFromRow(row, builderCreditsEnabled));
 }
 function parseJson(value) {
     if (typeof value !== "string" || !value.trim())
@@ -221,7 +231,7 @@ function firstUserPrompt(threadData) {
     }
     return null;
 }
-async function hydrateRecentPrompts(rows) {
+async function hydrateRecentPrompts(rows, builderCreditsEnabled) {
     const threadIds = [
         ...new Set(rows
             .map((row) => nullableStringField(row, "thread_id"))
@@ -262,6 +272,21 @@ async function hydrateRecentPrompts(rows) {
             cacheReadTokens: numberField(row, "cache_read_tokens"),
             cacheWriteTokens: numberField(row, "cache_write_tokens"),
             costCents: numberField(row, "cost_cents_x100") / 100,
+            ...(builderCreditsEnabled
+                ? {
+                    ...(row.builder_credits_used != null
+                        ? { builderCredits: numberField(row, "builder_credits_used") }
+                        : row.engine_name === "builder"
+                            ? {
+                                estimatedBuilderCredits: builderCreditsFromCostCents(numberField(row, "cost_cents_x100") / 100),
+                            }
+                            : {}),
+                    otherCostCents: row.engine_name === "builder" || row.builder_credits_used != null
+                        ? 0
+                        : numberField(row, "cost_cents_x100") / 100,
+                    engineName: nullableStringField(row, "engine_name"),
+                }
+                : {}),
             prompt: prompt ?? (preview ? preview.slice(0, 359).trimEnd() : null),
             promptSource: prompt
                 ? "thread"
@@ -290,7 +315,9 @@ async function detectUsageEngineName() {
     return getAppConfig().agent.engine ?? null;
 }
 export async function listAppUsageMetrics(input, accessInput) {
+    await ensureUsageTable();
     const scope = input.scope === "workspace" ? "workspace" : "me";
+    const builderCreditsEnabled = input.builderCreditsEnabled === true;
     const sinceDays = Math.max(1, Math.min(365, input.sinceDays ?? 30));
     const now = Date.now();
     const sinceMs = now - sinceDays * DAY_MS;
@@ -304,6 +331,11 @@ export async function listAppUsageMetrics(input, accessInput) {
         getDbExec().execute({
             sql: `SELECT
             COALESCE(SUM(cost_cents_x100), 0) AS cost_x100,
+            COALESCE(SUM(builder_credits_used), 0) AS builder_credits,
+            COALESCE(SUM(CASE WHEN engine_name = 'builder' AND builder_credits_used IS NULL THEN cost_cents_x100 ELSE 0 END), 0) AS estimated_builder_cost_x100,
+            COALESCE(SUM(CASE WHEN engine_name IS DISTINCT FROM 'builder' AND builder_credits_used IS NULL THEN cost_cents_x100 ELSE 0 END), 0) AS other_cost_x100,
+            COUNT(*) FILTER (WHERE engine_name = 'builder' OR builder_credits_used IS NOT NULL) AS builder_calls,
+            COUNT(*) FILTER (WHERE engine_name IS DISTINCT FROM 'builder' AND builder_credits_used IS NULL) AS other_calls,
             COUNT(*) AS calls,
             COALESCE(SUM(input_tokens), 0) AS input_tokens,
             COALESCE(SUM(output_tokens), 0) AS output_tokens,
@@ -314,11 +346,11 @@ export async function listAppUsageMetrics(input, accessInput) {
           WHERE ${appScope.where} AND ${resolved.ownerScope.where} AND created_at >= ?`,
             args: baseArgs,
         }),
-        usageBuckets("COALESCE(NULLIF(label, ''), 'chat')", resolved.ownerScope, appScope, sinceMs, 6),
-        usageBuckets("COALESCE(NULLIF(model, ''), 'unknown')", resolved.ownerScope, appScope, sinceMs, 4),
+        usageBuckets("COALESCE(NULLIF(label, ''), 'chat')", resolved.ownerScope, appScope, sinceMs, 6, builderCreditsEnabled),
+        usageBuckets("COALESCE(NULLIF(model, ''), 'unknown')", resolved.ownerScope, appScope, sinceMs, 4, builderCreditsEnabled),
         getDbExec().execute({
             sql: `SELECT created_at, cost_cents_x100, input_tokens, output_tokens,
-            cache_read_tokens, cache_write_tokens FROM token_usage
+            cache_read_tokens, cache_write_tokens, builder_credits_used, engine_name FROM token_usage
           WHERE ${appScope.where} AND ${resolved.ownerScope.where} AND created_at >= ?
           ORDER BY created_at ASC`,
             args: baseArgs,
@@ -326,7 +358,7 @@ export async function listAppUsageMetrics(input, accessInput) {
         getDbExec().execute({
             sql: `SELECT id, created_at, owner_email, app, label, model,
             input_tokens, output_tokens, cache_read_tokens, cache_write_tokens,
-            cost_cents_x100, thread_id
+            cost_cents_x100, builder_credits_used, engine_name, thread_id
           FROM token_usage
           WHERE ${appScope.where} AND ${resolved.ownerScope.where} AND created_at >= ?
           ORDER BY created_at DESC
@@ -340,8 +372,26 @@ export async function listAppUsageMetrics(input, accessInput) {
         const date = new Date(numberField(row, "created_at"))
             .toISOString()
             .slice(0, 10);
-        const current = dayMap.get(date) ?? { costX100: 0, calls: 0, tokens: 0 };
+        const current = dayMap.get(date) ?? {
+            costX100: 0,
+            calls: 0,
+            tokens: 0,
+            builderCredits: 0,
+            estimatedBuilderCostX100: 0,
+            otherCostX100: 0,
+            otherCalls: 0,
+        };
         current.costX100 += numberField(row, "cost_cents_x100");
+        if (row.builder_credits_used != null) {
+            current.builderCredits += numberField(row, "builder_credits_used");
+        }
+        else if (row.engine_name === "builder") {
+            current.estimatedBuilderCostX100 += numberField(row, "cost_cents_x100");
+        }
+        else {
+            current.otherCostX100 += numberField(row, "cost_cents_x100");
+            current.otherCalls += 1;
+        }
         current.calls += 1;
         current.tokens +=
             numberField(row, "input_tokens") +
@@ -356,6 +406,14 @@ export async function listAppUsageMetrics(input, accessInput) {
         costCents: value.costX100 / 100,
         calls: value.calls,
         tokens: value.tokens,
+        ...(builderCreditsEnabled
+            ? {
+                builderCredits: value.builderCredits,
+                estimatedBuilderCredits: builderCreditsFromCostCents(value.estimatedBuilderCostX100 / 100),
+                otherCostCents: value.otherCostX100 / 100,
+                otherCalls: value.otherCalls,
+            }
+            : {}),
     }))
         .sort((a, b) => a.date.localeCompare(b.date));
     const today = new Date(now).toISOString().slice(0, 10);
@@ -364,9 +422,27 @@ export async function listAppUsageMetrics(input, accessInput) {
         costCents: 0,
         calls: 0,
         tokens: 0,
+        ...(builderCreditsEnabled
+            ? {
+                builderCredits: 0,
+                estimatedBuilderCredits: 0,
+                otherCostCents: 0,
+                otherCalls: 0,
+            }
+            : {}),
     };
-    const billing = usageBillingForEngine(await detectUsageEngineName());
-    const recent = await hydrateRecentPrompts(recentResult.rows);
+    const builderCalls = numberField(totals, "builder_calls");
+    const otherCalls = numberField(totals, "other_calls");
+    const billing = builderCreditsEnabled
+        ? builderCalls && otherCalls
+            ? MIXED_USAGE_BILLING
+            : builderCalls
+                ? usageBillingForEngine("builder")
+                : otherCalls
+                    ? usageBillingForEngine(null)
+                    : usageBillingForEngine(await detectUsageEngineName())
+        : usageBillingForEngine(await detectUsageEngineName());
+    const recent = await hydrateRecentPrompts(recentResult.rows, builderCreditsEnabled);
     return {
         billing,
         app,
@@ -388,10 +464,26 @@ export async function listAppUsageMetrics(input, accessInput) {
             cacheReadTokens: numberField(totals, "cache_read_tokens"),
             cacheWriteTokens: numberField(totals, "cache_write_tokens"),
             activeUsers: numberField(totals, "active_users"),
+            ...(builderCreditsEnabled
+                ? {
+                    builderCredits: numberField(totals, "builder_credits"),
+                    estimatedBuilderCredits: builderCreditsFromCostCents(numberField(totals, "estimated_builder_cost_x100") / 100),
+                    otherCostCents: numberField(totals, "other_cost_x100") / 100,
+                    otherCalls,
+                }
+                : {}),
         },
         currentDay: {
             costCents: currentDay.costCents,
-            credits: builderCreditsFromCostCents(currentDay.costCents),
+            credits: currentDay.builderCredits ??
+                builderCreditsFromCostCents(currentDay.costCents),
+            ...(builderCreditsEnabled
+                ? {
+                    estimatedBuilderCredits: currentDay.estimatedBuilderCredits ?? 0,
+                    otherCostCents: currentDay.otherCostCents ?? 0,
+                    otherCalls: currentDay.otherCalls ?? 0,
+                }
+                : {}),
             calls: currentDay.calls,
             tokens: currentDay.tokens,
         },

package/dist/usage/store.d.ts

@@ -1,17 +1,18 @@
 export { isSelfScopedUsageRead, usageOrgScope, type UsageOrgScope, type UsageOrgScopeOptions, } from "./org-scope.js";
 export declare const BUILDER_AGENT_CREDIT_MARGIN_MULTIPLIER = 1.25;
 export declare const BUILDER_AGENT_CREDITS_PER_USD = 20;
-export type UsageBillingUnit = "usd" | "builder-credits";
+export type UsageBillingUnit = "usd" | "builder-credits" | "mixed";
 export interface UsageBillingMode {
     unit: UsageBillingUnit;
     label: string;
     shortLabel: string;
-    source: "estimated-provider-cost" | "builder-agent-credits";
+    source: "estimated-provider-cost" | "builder-agent-credits" | "mixed-provider-usage";
     hardCostMarginMultiplier?: number;
     creditsPerUsd?: number;
 }
 export declare const USD_USAGE_BILLING: UsageBillingMode;
 export declare const BUILDER_CREDIT_USAGE_BILLING: UsageBillingMode;
+export declare const MIXED_USAGE_BILLING: UsageBillingMode;
 export declare function usageBillingForEngine(engineName: string | null | undefined): UsageBillingMode;
 export declare function builderCreditsFromCostCents(cents: number): number;
 export interface UsageRecord {
@@ -37,6 +38,10 @@ export interface UsageRecord {
      * provider-reported dollar cost so two surfaces agree exactly.
      */
     costCentsX100?: number;
+    /** Exact credits reported by the Builder gateway for this run, when available. */
+    builderCreditsUsed?: number;
+    /** Engine selected for this call; nullable on historical and external usage rows. */
+    engineName?: string;
     /** Whether cost is provider-reported, estimated, or unavailable. */
     costSource?: UsageCostSource;
     /** Defaults to the active request organization when omitted. */

package/dist/usage/store.js

@@ -29,6 +29,12 @@ export const BUILDER_CREDIT_USAGE_BILLING = {
     hardCostMarginMultiplier: BUILDER_AGENT_CREDIT_MARGIN_MULTIPLIER,
     creditsPerUsd: BUILDER_AGENT_CREDITS_PER_USD,
 };
+export const MIXED_USAGE_BILLING = {
+    unit: "mixed",
+    label: "Builder credits and provider cost",
+    shortLabel: "Mixed",
+    source: "mixed-provider-usage",
+};
 export function usageBillingForEngine(engineName) {
     return engineName === "builder"
         ? BUILDER_CREDIT_USAGE_BILLING
@@ -172,6 +178,8 @@ export async function ensureUsageTable() {
           cache_read_tokens BIGINT NOT NULL DEFAULT 0,
           cache_write_tokens BIGINT NOT NULL DEFAULT 0,
           cost_cents_x100 BIGINT NOT NULL DEFAULT 0,
+          builder_credits_used NUMERIC,
+          engine_name TEXT,
           cost_source TEXT NOT NULL DEFAULT 'estimated',
           model TEXT NOT NULL DEFAULT '',
           label TEXT NOT NULL DEFAULT 'chat',
@@ -192,6 +200,8 @@ export async function ensureUsageTable() {
             const additions = [
                 ["cache_read_tokens", `BIGINT NOT NULL DEFAULT 0`],
                 ["cache_write_tokens", `BIGINT NOT NULL DEFAULT 0`],
+                ["builder_credits_used", "NUMERIC"],
+                ["engine_name", "TEXT"],
                 ["cost_source", `TEXT NOT NULL DEFAULT 'estimated'`],
                 ["label", `TEXT NOT NULL DEFAULT 'chat'`],
                 ["app", `TEXT NOT NULL DEFAULT ''`],
@@ -288,10 +298,19 @@ export async function recordUsage(recordOrOwner, inputTokens, outputTokens, mode
             model: model ?? "",
         }
         : recordOrOwner;
-    const { ownerEmail, inputTokens: inTok, outputTokens: outTok, cacheReadTokens = 0, cacheWriteTokens = 0, model: modelName, label, app, refId, costCentsX100, costSource, orgId, runId, threadId, taskId, integrationScopeId, sourcePlatform, sourceId, } = record;
+    const { ownerEmail, inputTokens: inTok, outputTokens: outTok, cacheReadTokens = 0, cacheWriteTokens = 0, model: modelName, label, app, refId, costCentsX100, builderCreditsUsed, engineName, costSource, orgId, runId, threadId, taskId, integrationScopeId, sourcePlatform, sourceId, } = record;
     // Skip no-op writes (e.g. a stream aborted before any tokens flowed)
-    if (!inTok && !outTok && !cacheReadTokens && !cacheWriteTokens)
+    if (!inTok &&
+        !outTok &&
+        !cacheReadTokens &&
+        !cacheWriteTokens &&
+        builderCreditsUsed == null) {
         return;
+    }
+    if (builderCreditsUsed != null &&
+        (!Number.isFinite(builderCreditsUsed) || builderCreditsUsed < 0)) {
+        throw new Error("Builder gateway credits must be a non-negative number.");
+    }
     await ensureUsageTable();
     const client = getDbExec();
     const resolvedApp = resolveUsageAppKey(app);
@@ -319,8 +338,8 @@ export async function recordUsage(recordOrOwner, inputTokens, outputTokens, mode
     const id = Date.now() * 1000 + Math.floor(Math.random() * 1000);
     await client.execute({
         sql: `INSERT INTO token_usage
-      (id, owner_email, input_tokens, output_tokens, cache_read_tokens, cache_write_tokens, cost_cents_x100, cost_source, model, label, app, ref_id, org_id, run_id, thread_id, task_id, integration_scope_id, source_platform, source_id, created_at)
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+      (id, owner_email, input_tokens, output_tokens, cache_read_tokens, cache_write_tokens, cost_cents_x100, builder_credits_used, engine_name, cost_source, model, label, app, ref_id, org_id, run_id, thread_id, task_id, integration_scope_id, source_platform, source_id, created_at)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
         args: [
             id,
             ownerEmail,
@@ -329,6 +348,8 @@ export async function recordUsage(recordOrOwner, inputTokens, outputTokens, mode
             cacheReadTokens,
             cacheWriteTokens,
             costX100,
+            builderCreditsUsed ?? null,
+            engineName ?? null,
             resolvedCostSource,
             modelName,
             resolvedLabel,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-native/core",
-  "version": "0.187.0",
+  "version": "0.187.1-nightly-20260924193134",
   "description": "The agentic application framework for building autonomous agents with intuitive UIs",
   "homepage": "https://github.com/BuilderIO/agent-native#readme",
   "bugs": {
@@ -498,9 +498,9 @@
     "yaml": "^2.9.0",
     "yjs": "^13.6.32",
     "zod": "^4.3.6",
+    "@agent-native/agentkit": "^0.2.9",
     "@agent-native/recap-cli": "0.5.39",
-    "@agent-native/toolkit": "^0.20.9",
-    "@agent-native/agentkit": "^0.2.9"
+    "@agent-native/toolkit": "^0.20.9"
   },
   "devDependencies": {
     "@ai-sdk/anthropic": "^3.0.71",