@opengeni/db 3.7.4 → 4.0.0-canary.0

package/src/insights-model-bundle.ts

@@ -116,6 +116,8 @@ function mapModelRows(value: unknown, label: string): ModelCallFactAggregateRow[
     pricedCostMicros: numberValue(row, "pricedCostMicros"),
     estimatedProviderCostMicros: numberValue(row, "estimatedProviderCostMicros"),
     estimatedProviderCostKnownCalls: numberValue(row, "estimatedProviderCostKnownCalls"),
+    equivalentCreditCostMicros: numberValue(row, "equivalentCreditCostMicros"),
+    equivalentCreditCostKnownCalls: numberValue(row, "equivalentCreditCostKnownCalls"),
   }));
 }
 
@@ -126,6 +128,8 @@ function mapRootRows(value: unknown, label: string): RootSessionDriverRow[] {
     pricedCostMicros: numberValue(row, "pricedCostMicros"),
     estimatedProviderCostMicros: numberValue(row, "estimatedProviderCostMicros"),
     estimatedProviderCostKnownCalls: numberValue(row, "estimatedProviderCostKnownCalls"),
+    equivalentCreditCostMicros: numberValue(row, "equivalentCreditCostMicros"),
+    equivalentCreditCostKnownCalls: numberValue(row, "equivalentCreditCostKnownCalls"),
     totalTokens: numberValue(row, "totalTokens"),
     cachedTokens: numberValue(row, "cachedTokens"),
     cacheInputTokens: numberValue(row, "cacheInputTokens"),
@@ -153,6 +157,8 @@ function mapBundle(value: unknown): WorkspaceInsightsModelBundle {
           costMicros: numberValue(row, "costMicros"),
           estimatedProviderCostMicros: numberValue(row, "estimatedProviderCostMicros"),
           estimatedProviderCostKnownCalls: numberValue(row, "estimatedProviderCostKnownCalls"),
+          equivalentCreditCostMicros: numberValue(row, "equivalentCreditCostMicros"),
+          equivalentCreditCostKnownCalls: numberValue(row, "equivalentCreditCostKnownCalls"),
           inputTokens: numberValue(row, "inputTokens"),
           outputTokens: numberValue(row, "outputTokens"),
           cachedTokens: numberValue(row, "cachedTokens"),
@@ -173,6 +179,8 @@ function mapBundle(value: unknown): WorkspaceInsightsModelBundle {
       pricedCostMicros: numberValue(row, "pricedCostMicros"),
       estimatedProviderCostMicros: numberValue(row, "estimatedProviderCostMicros"),
       estimatedProviderCostKnownCalls: numberValue(row, "estimatedProviderCostKnownCalls"),
+      equivalentCreditCostMicros: numberValue(row, "equivalentCreditCostMicros"),
+      equivalentCreditCostKnownCalls: numberValue(row, "equivalentCreditCostKnownCalls"),
       totalTokens: numberValue(row, "totalTokens"),
       cachedTokens: numberValue(row, "cachedTokens"),
       cacheInputTokens: numberValue(row, "cacheInputTokens"),
@@ -203,6 +211,7 @@ function mapBundle(value: unknown): WorkspaceInsightsModelBundle {
       totalTokens: nullableNumber(row, "totalTokens"),
       pricedCostMicros: numberValue(row, "pricedCostMicros"),
       estimatedProviderCostMicros: nullableNumber(row, "estimatedProviderCostMicros"),
+      equivalentCreditCostMicros: nullableNumber(row, "equivalentCreditCostMicros"),
       pricingSource: nullableString(row, "pricingSource"),
     })),
     promptContributions: {
@@ -261,6 +270,7 @@ export async function readWorkspaceInsightsModelBundle(
           fact.total_tokens,
           fact.priced_cost_micros,
           fact.estimated_provider_cost_micros,
+          fact.equivalent_credit_cost_micros,
           fact.pricing_source,
           fact.context_contributions,
           fact.occurred_at,
@@ -286,7 +296,8 @@ export async function readWorkspaceInsightsModelBundle(
           fact.reasoning_tokens,
           fact.total_tokens,
           fact.priced_cost_micros,
-          fact.estimated_provider_cost_micros
+          fact.estimated_provider_cost_micros,
+          fact.equivalent_credit_cost_micros
         from opengeni_private.visible_workspace_insights_model_call_facts(
           ${input.workspaceId},
           ${input.priorSince.toISOString()}::timestamp with time zone,
@@ -340,7 +351,11 @@ export async function readWorkspaceInsightsModelBundle(
           coalesce(sum(fact.estimated_provider_cost_micros), 0)::bigint
             as estimated_provider_cost_micros,
           count(fact.estimated_provider_cost_micros)::bigint
-            as estimated_provider_cost_known_calls
+            as estimated_provider_cost_known_calls,
+          coalesce(sum(fact.equivalent_credit_cost_micros), 0)::bigint
+            as equivalent_credit_cost_micros,
+          count(fact.equivalent_credit_cost_micros)::bigint
+            as equivalent_credit_cost_known_calls
         from current_visible fact
         group by fact.provider, fact.model, fact.billing_path
       ), prior_model_rows as (
@@ -368,7 +383,11 @@ export async function readWorkspaceInsightsModelBundle(
           coalesce(sum(fact.estimated_provider_cost_micros), 0)::bigint
             as estimated_provider_cost_micros,
           count(fact.estimated_provider_cost_micros)::bigint
-            as estimated_provider_cost_known_calls
+            as estimated_provider_cost_known_calls,
+          coalesce(sum(fact.equivalent_credit_cost_micros), 0)::bigint
+            as equivalent_credit_cost_micros,
+          count(fact.equivalent_credit_cost_micros)::bigint
+            as equivalent_credit_cost_known_calls
         from prior_visible fact
         group by fact.provider, fact.model, fact.billing_path
       ), current_series_rows as (
@@ -381,6 +400,10 @@ export async function readWorkspaceInsightsModelBundle(
             as estimated_provider_cost_micros,
           count(fact.estimated_provider_cost_micros)::bigint
             as estimated_provider_cost_known_calls,
+          coalesce(sum(fact.equivalent_credit_cost_micros), 0)::bigint
+            as equivalent_credit_cost_micros,
+          count(fact.equivalent_credit_cost_micros)::bigint
+            as equivalent_credit_cost_known_calls,
           coalesce(sum(fact.input_tokens), 0)::bigint as input_tokens,
           coalesce(sum(fact.output_tokens), 0)::bigint as output_tokens,
           coalesce(sum(fact.cached_tokens), 0)::bigint as cached_tokens,
@@ -408,6 +431,10 @@ export async function readWorkspaceInsightsModelBundle(
             as estimated_provider_cost_micros,
           count(fact.estimated_provider_cost_micros)::bigint
             as estimated_provider_cost_known_calls,
+          coalesce(sum(fact.equivalent_credit_cost_micros), 0)::bigint
+            as equivalent_credit_cost_micros,
+          count(fact.equivalent_credit_cost_micros)::bigint
+            as equivalent_credit_cost_known_calls,
           coalesce(sum(fact.total_tokens), 0)::bigint as total_tokens,
           coalesce(sum(fact.cached_tokens), 0)::bigint as cached_tokens,
           coalesce(sum(fact.input_tokens) filter (
@@ -433,6 +460,10 @@ export async function readWorkspaceInsightsModelBundle(
             as estimated_provider_cost_micros,
           count(fact.estimated_provider_cost_micros)::bigint
             as estimated_provider_cost_known_calls,
+          coalesce(sum(fact.equivalent_credit_cost_micros), 0)::bigint
+            as equivalent_credit_cost_micros,
+          count(fact.equivalent_credit_cost_micros)::bigint
+            as equivalent_credit_cost_known_calls,
           coalesce(sum(fact.total_tokens), 0)::bigint as total_tokens,
           coalesce(sum(fact.cached_tokens), 0)::bigint as cached_tokens,
           coalesce(sum(fact.input_tokens) filter (
@@ -454,6 +485,10 @@ export async function readWorkspaceInsightsModelBundle(
             as estimated_provider_cost_micros,
           count(fact.estimated_provider_cost_micros)::bigint
             as estimated_provider_cost_known_calls,
+          coalesce(sum(fact.equivalent_credit_cost_micros), 0)::bigint
+            as equivalent_credit_cost_micros,
+          count(fact.equivalent_credit_cost_micros)::bigint
+            as equivalent_credit_cost_known_calls,
           coalesce(sum(fact.total_tokens), 0)::bigint as total_tokens,
           coalesce(sum(fact.cached_tokens), 0)::bigint as cached_tokens,
           coalesce(sum(fact.input_tokens) filter (
@@ -491,6 +526,7 @@ export async function readWorkspaceInsightsModelBundle(
           fact.total_tokens,
           fact.priced_cost_micros,
           fact.estimated_provider_cost_micros,
+          fact.equivalent_credit_cost_micros,
           fact.pricing_source
         from current_visible fact
         left join selected_sessions session
@@ -539,7 +575,9 @@ export async function readWorkspaceInsightsModelBundle(
             'cacheKnownCalls', cache_known_calls,
             'pricedCostMicros', priced_cost_micros,
             'estimatedProviderCostMicros', estimated_provider_cost_micros,
-            'estimatedProviderCostKnownCalls', estimated_provider_cost_known_calls
+            'estimatedProviderCostKnownCalls', estimated_provider_cost_known_calls,
+            'equivalentCreditCostMicros', equivalent_credit_cost_micros,
+            'equivalentCreditCostKnownCalls', equivalent_credit_cost_known_calls
           ) order by provider, model, billing_path)
           from current_model_rows
         ), '[]'::jsonb),
@@ -560,7 +598,9 @@ export async function readWorkspaceInsightsModelBundle(
             'cacheKnownCalls', cache_known_calls,
             'pricedCostMicros', priced_cost_micros,
             'estimatedProviderCostMicros', estimated_provider_cost_micros,
-            'estimatedProviderCostKnownCalls', estimated_provider_cost_known_calls
+            'estimatedProviderCostKnownCalls', estimated_provider_cost_known_calls,
+            'equivalentCreditCostMicros', equivalent_credit_cost_micros,
+            'equivalentCreditCostKnownCalls', equivalent_credit_cost_known_calls
           ) order by provider, model, billing_path)
           from prior_model_rows
         ), '[]'::jsonb),
@@ -570,6 +610,8 @@ export async function readWorkspaceInsightsModelBundle(
             'costMicros', cost_micros,
             'estimatedProviderCostMicros', estimated_provider_cost_micros,
             'estimatedProviderCostKnownCalls', estimated_provider_cost_known_calls,
+            'equivalentCreditCostMicros', equivalent_credit_cost_micros,
+            'equivalentCreditCostKnownCalls', equivalent_credit_cost_known_calls,
             'inputTokens', input_tokens,
             'outputTokens', output_tokens,
             'cachedTokens', cached_tokens,
@@ -590,6 +632,8 @@ export async function readWorkspaceInsightsModelBundle(
             'pricedCostMicros', priced_cost_micros,
             'estimatedProviderCostMicros', estimated_provider_cost_micros,
             'estimatedProviderCostKnownCalls', estimated_provider_cost_known_calls,
+            'equivalentCreditCostMicros', equivalent_credit_cost_micros,
+            'equivalentCreditCostKnownCalls', equivalent_credit_cost_known_calls,
             'totalTokens', total_tokens,
             'cachedTokens', cached_tokens,
             'cacheInputTokens', cache_input_tokens
@@ -603,6 +647,8 @@ export async function readWorkspaceInsightsModelBundle(
             'pricedCostMicros', priced_cost_micros,
             'estimatedProviderCostMicros', estimated_provider_cost_micros,
             'estimatedProviderCostKnownCalls', estimated_provider_cost_known_calls,
+            'equivalentCreditCostMicros', equivalent_credit_cost_micros,
+            'equivalentCreditCostKnownCalls', equivalent_credit_cost_known_calls,
             'totalTokens', total_tokens,
             'cachedTokens', cached_tokens,
             'cacheInputTokens', cache_input_tokens
@@ -615,6 +661,8 @@ export async function readWorkspaceInsightsModelBundle(
             'pricedCostMicros', priced_cost_micros,
             'estimatedProviderCostMicros', estimated_provider_cost_micros,
             'estimatedProviderCostKnownCalls', estimated_provider_cost_known_calls,
+            'equivalentCreditCostMicros', equivalent_credit_cost_micros,
+            'equivalentCreditCostKnownCalls', equivalent_credit_cost_known_calls,
             'totalTokens', total_tokens,
             'cachedTokens', cached_tokens,
             'cacheInputTokens', cache_input_tokens,
@@ -651,6 +699,7 @@ export async function readWorkspaceInsightsModelBundle(
             'totalTokens', total_tokens,
             'pricedCostMicros', priced_cost_micros,
             'estimatedProviderCostMicros', estimated_provider_cost_micros,
+            'equivalentCreditCostMicros', equivalent_credit_cost_micros,
             'pricingSource', pricing_source
           ) order by occurred_at desc, id desc)
           from recent_rows

package/src/insights.ts

@@ -29,6 +29,8 @@ export type ModelCallFactAggregateRow = {
   pricedCostMicros: number;
   estimatedProviderCostMicros: number;
   estimatedProviderCostKnownCalls: number;
+  equivalentCreditCostMicros: number;
+  equivalentCreditCostKnownCalls: number;
 };
 
 export type InsightsDayBucket = {
@@ -60,6 +62,8 @@ export type RootSessionDriverRow = {
   pricedCostMicros: number;
   estimatedProviderCostMicros: number;
   estimatedProviderCostKnownCalls: number;
+  equivalentCreditCostMicros: number;
+  equivalentCreditCostKnownCalls: number;
   totalTokens: number;
   cachedTokens: number;
   cacheInputTokens: number;
@@ -70,6 +74,8 @@ export type ScheduleFactAggregate = {
   pricedCostMicros: number;
   estimatedProviderCostMicros: number;
   estimatedProviderCostKnownCalls: number;
+  equivalentCreditCostMicros: number;
+  equivalentCreditCostKnownCalls: number;
   totalTokens: number;
   cachedTokens: number;
   cacheInputTokens: number;
@@ -134,6 +140,7 @@ export type RecentModelCallRow = {
   totalTokens: number | null;
   pricedCostMicros: number;
   estimatedProviderCostMicros: number | null;
+  equivalentCreditCostMicros: number | null;
   pricingSource: string | null;
 };
 
@@ -360,6 +367,8 @@ export async function aggregateModelCallFacts(
         pricedCostMicros: sql<number>`coalesce(sum(${modelCallFacts.pricedCostMicros}) filter (where ${modelCallFacts.billingPath} = 'opengeni_credits'), 0)`,
         estimatedProviderCostMicros: sql<number>`coalesce(sum(${modelCallFacts.estimatedProviderCostMicros}), 0)`,
         estimatedProviderCostKnownCalls: sql<number>`count(${modelCallFacts.estimatedProviderCostMicros})::int`,
+        equivalentCreditCostMicros: sql<number>`coalesce(sum(${modelCallFacts.equivalentCreditCostMicros}), 0)`,
+        equivalentCreditCostKnownCalls: sql<number>`count(${modelCallFacts.equivalentCreditCostMicros})::int`,
       })
       .from(source)
       .where(and(...clauses))
@@ -381,6 +390,8 @@ export async function aggregateModelCallFacts(
       pricedCostMicros: Number(row.pricedCostMicros),
       estimatedProviderCostMicros: Number(row.estimatedProviderCostMicros),
       estimatedProviderCostKnownCalls: Number(row.estimatedProviderCostKnownCalls),
+      equivalentCreditCostMicros: Number(row.equivalentCreditCostMicros),
+      equivalentCreditCostKnownCalls: Number(row.equivalentCreditCostKnownCalls),
     }));
   });
 }
@@ -389,6 +400,8 @@ export type ModelCallFactSeriesAggregate = {
   costMicros: number;
   estimatedProviderCostMicros: number;
   estimatedProviderCostKnownCalls: number;
+  equivalentCreditCostMicros: number;
+  equivalentCreditCostKnownCalls: number;
   inputTokens: number;
   outputTokens: number;
   cachedTokens: number;
@@ -436,6 +449,8 @@ async function aggregateModelCallFactsByBucket(
         costMicros: sql<number>`coalesce(sum(${modelCallFacts.pricedCostMicros}) filter (where ${modelCallFacts.billingPath} = 'opengeni_credits'), 0)`,
         estimatedProviderCostMicros: sql<number>`coalesce(sum(${modelCallFacts.estimatedProviderCostMicros}), 0)`,
         estimatedProviderCostKnownCalls: sql<number>`count(${modelCallFacts.estimatedProviderCostMicros})::int`,
+        equivalentCreditCostMicros: sql<number>`coalesce(sum(${modelCallFacts.equivalentCreditCostMicros}), 0)`,
+        equivalentCreditCostKnownCalls: sql<number>`count(${modelCallFacts.equivalentCreditCostMicros})::int`,
         inputTokens: sql<number>`coalesce(sum(${modelCallFacts.inputTokens}), 0)`,
         outputTokens: sql<number>`coalesce(sum(${modelCallFacts.outputTokens}), 0)`,
         cachedTokens: sql<number>`coalesce(sum(${modelCallFacts.cachedTokens}), 0)`,
@@ -457,6 +472,8 @@ async function aggregateModelCallFactsByBucket(
           costMicros: Number(row.costMicros),
           estimatedProviderCostMicros: Number(row.estimatedProviderCostMicros),
           estimatedProviderCostKnownCalls: Number(row.estimatedProviderCostKnownCalls),
+          equivalentCreditCostMicros: Number(row.equivalentCreditCostMicros),
+          equivalentCreditCostKnownCalls: Number(row.equivalentCreditCostKnownCalls),
           inputTokens: Number(row.inputTokens),
           outputTokens: Number(row.outputTokens),
           cachedTokens: Number(row.cachedTokens),
@@ -630,6 +647,8 @@ export async function aggregateRootSessionDrivers(
         pricedCostMicros: sql<number>`coalesce(sum(${modelCallFacts.pricedCostMicros}) filter (where ${modelCallFacts.billingPath} = 'opengeni_credits'), 0)`,
         estimatedProviderCostMicros: sql<number>`coalesce(sum(${modelCallFacts.estimatedProviderCostMicros}), 0)`,
         estimatedProviderCostKnownCalls: sql<number>`count(${modelCallFacts.estimatedProviderCostMicros})::int`,
+        equivalentCreditCostMicros: sql<number>`coalesce(sum(${modelCallFacts.equivalentCreditCostMicros}), 0)`,
+        equivalentCreditCostKnownCalls: sql<number>`count(${modelCallFacts.equivalentCreditCostMicros})::int`,
         totalTokens: sql<number>`coalesce(sum(${modelCallFacts.totalTokens}), 0)`,
         cachedTokens: sql<number>`coalesce(sum(${modelCallFacts.cachedTokens}), 0)`,
         cacheInputTokens: sql<number>`coalesce(sum(${modelCallFacts.inputTokens}) filter (where ${modelCallFacts.cachedTokens} is not null and ${modelCallFacts.inputTokens} is not null), 0)`,
@@ -659,6 +678,8 @@ export async function aggregateRootSessionDrivers(
       pricedCostMicros: Number(row.pricedCostMicros),
       estimatedProviderCostMicros: Number(row.estimatedProviderCostMicros),
       estimatedProviderCostKnownCalls: Number(row.estimatedProviderCostKnownCalls),
+      equivalentCreditCostMicros: Number(row.equivalentCreditCostMicros),
+      equivalentCreditCostKnownCalls: Number(row.equivalentCreditCostKnownCalls),
       totalTokens: Number(row.totalTokens),
       cachedTokens: Number(row.cachedTokens),
       cacheInputTokens: Number(row.cacheInputTokens),
@@ -735,6 +756,9 @@ export async function listRecentModelCalls(
         estimatedProviderCostMicros: sql<
           number | null
         >`${modelCallFacts.estimatedProviderCostMicros}`,
+        equivalentCreditCostMicros: sql<
+          number | null
+        >`${modelCallFacts.equivalentCreditCostMicros}`,
         pricingSource: sql<string | null>`${modelCallFacts.pricingSource}`,
       })
       .from(source)
@@ -763,6 +787,10 @@ export async function listRecentModelCalls(
         row.estimatedProviderCostMicros,
         "estimated provider cost",
       ),
+      equivalentCreditCostMicros: insightsNullableNumber(
+        row.equivalentCreditCostMicros,
+        "equivalent credit cost",
+      ),
     }));
   });
 }
@@ -886,6 +914,8 @@ export async function aggregateScheduleFacts(
         pricedCostMicros: sql<number>`coalesce(sum(${modelCallFacts.pricedCostMicros}) filter (where ${modelCallFacts.billingPath} = 'opengeni_credits'), 0)`,
         estimatedProviderCostMicros: sql<number>`coalesce(sum(${modelCallFacts.estimatedProviderCostMicros}), 0)`,
         estimatedProviderCostKnownCalls: sql<number>`count(${modelCallFacts.estimatedProviderCostMicros})::int`,
+        equivalentCreditCostMicros: sql<number>`coalesce(sum(${modelCallFacts.equivalentCreditCostMicros}), 0)`,
+        equivalentCreditCostKnownCalls: sql<number>`count(${modelCallFacts.equivalentCreditCostMicros})::int`,
         totalTokens: sql<number>`coalesce(sum(${modelCallFacts.totalTokens}), 0)`,
         cachedTokens: sql<number>`coalesce(sum(${modelCallFacts.cachedTokens}), 0)`,
         cacheInputTokens: sql<number>`coalesce(sum(${modelCallFacts.inputTokens}) filter (where ${modelCallFacts.cachedTokens} is not null and ${modelCallFacts.inputTokens} is not null), 0)`,
@@ -906,6 +936,8 @@ export async function aggregateScheduleFacts(
         pricedCostMicros: Number(row.pricedCostMicros),
         estimatedProviderCostMicros: Number(row.estimatedProviderCostMicros),
         estimatedProviderCostKnownCalls: Number(row.estimatedProviderCostKnownCalls),
+        equivalentCreditCostMicros: Number(row.equivalentCreditCostMicros),
+        equivalentCreditCostKnownCalls: Number(row.equivalentCreditCostKnownCalls),
         totalTokens: Number(row.totalTokens),
         cachedTokens: Number(row.cachedTokens),
         cacheInputTokens: Number(row.cacheInputTokens),
@@ -1106,7 +1138,7 @@ export async function backfillModelCallFactsFromSessionEvents(
 
   let considered = 0;
   let upserted = 0;
-  let cursorOccurredAt = input.since;
+  let cursorOccurredAt = input.since.toISOString();
   let cursorId = "00000000-0000-0000-0000-000000000000";
 
   while (considered < limit) {
@@ -1122,6 +1154,7 @@ export async function backfillModelCallFactsFromSessionEvents(
           turnAttemptId: schema.sessionEvents.turnAttemptId,
           payload: schema.sessionEvents.payload,
           occurredAt: schema.sessionEvents.occurredAt,
+          cursorOccurredAt: sql<string>`${schema.sessionEvents.occurredAt}::text`,
         })
         .from(schema.sessionEvents)
         .where(
@@ -1132,7 +1165,7 @@ export async function backfillModelCallFactsFromSessionEvents(
             lt(schema.sessionEvents.occurredAt, until),
             sql`${schema.sessionEvents.turnId} is not null`,
             // Keyset on (occurred_at, id) so same-millisecond bursts cannot be skipped.
-            sql`(${schema.sessionEvents.occurredAt}, ${schema.sessionEvents.id}) > (${cursorOccurredAt}, ${cursorId}::uuid)`,
+            sql`(${schema.sessionEvents.occurredAt}, ${schema.sessionEvents.id}) > (${cursorOccurredAt}::timestamptz, ${cursorId}::uuid)`,
           ),
         )
         .orderBy(schema.sessionEvents.occurredAt, schema.sessionEvents.id)
@@ -1141,7 +1174,7 @@ export async function backfillModelCallFactsFromSessionEvents(
     if (page.length === 0) break;
     considered += page.length;
     const last = page[page.length - 1]!;
-    cursorOccurredAt = last.occurredAt;
+    cursorOccurredAt = last.cursorOccurredAt;
     cursorId = last.id;
 
     const batchUpserted = await withRlsContext(db, context, async (scopedDb) => {
@@ -1158,6 +1191,15 @@ export async function backfillModelCallFactsFromSessionEvents(
         const providerApi = typeof payload.providerApi === "string" ? payload.providerApi : null;
         const model = typeof payload.model === "string" ? payload.model : null;
         if (!sourceKey || !provider || !providerApi || !model) continue;
+        const upstreamProvider =
+          typeof payload.upstreamProvider === "string" &&
+          /^[a-z0-9][a-z0-9-]{0,63}$/.test(payload.upstreamProvider)
+            ? payload.upstreamProvider
+            : null;
+        const durableBillingPath =
+          payload.billingPath === "external" || payload.billingPath === "opengeni_credits"
+            ? payload.billingPath
+            : null;
 
         const sourceResourceId = `${event.turnId}:${sourceKey}`;
         const [cost] = await scopedDb
@@ -1183,11 +1225,15 @@ export async function backfillModelCallFactsFromSessionEvents(
           )
           .limit(1);
 
-        // External turns always write model.cost=0 and never model.tokens.
-        // Credits turns with totalTokens=0 write neither — keep those as credits.
+        // New usage events carry the accepted billing authority because a
+        // deployment-funded free call legitimately writes both model.tokens
+        // and model.cost=0. Older events predate that field: their external
+        // subscription/workspace calls wrote cost=0 without tokens, while
+        // zero-token credits calls wrote neither.
         const pricedCostMicros = cost ? Number(cost.quantity) : 0;
         const billingPath =
-          cost != null && pricedCostMicros === 0 && !tokenRow ? "external" : "opengeni_credits";
+          durableBillingPath ??
+          (cost != null && pricedCostMicros === 0 && !tokenRow ? "external" : "opengeni_credits");
 
         const [turn] = await scopedDb
           .select({
@@ -1239,7 +1285,7 @@ export async function backfillModelCallFactsFromSessionEvents(
             turnId: event.turnId,
             turnAttemptId: event.turnAttemptId,
             sourceKey,
-            provider,
+            provider: upstreamProvider ?? provider,
             providerApi,
             model,
             billingPath,

package/src/managed-user-setup.ts

@@ -150,6 +150,8 @@ export type OrganizationUserSetupDeliveryClaim =
         role: "viewer" | "member" | "admin";
       }>;
       expiresAt: string;
+      setupTokenTransport: "fragment" | "query" | null;
+      payloadDigest: string | null;
     };
 
 export async function claimOrganizationUserSetupDelivery(
@@ -169,7 +171,7 @@ export async function claimOrganizationUserSetupDelivery(
       await setSubjectRlsContext(scopedDb, input.actorSubjectId);
       const [row] = await rawRows<{ result: unknown }>(
         scopedDb,
-        sql`select claim_organization_user_setup_delivery(
+        sql`select claim_organization_user_setup_delivery_v2(
           ${JSON.stringify(input)}::jsonb
         ) as result`,
       );
@@ -188,6 +190,7 @@ export async function prepareOrganizationUserSetupDelivery(
     claimHolderId: string;
     tokenDigest: string;
     payloadDigest: string;
+    setupTokenTransport: "fragment" | "query";
     providerIdempotencyScope: string;
     providerIdempotencyRetentionSeconds: number;
   },
@@ -199,7 +202,7 @@ export async function prepareOrganizationUserSetupDelivery(
       await setSubjectRlsContext(scopedDb, input.actorSubjectId);
       await rawRows(
         scopedDb,
-        sql`select prepare_organization_user_setup_delivery(
+        sql`select prepare_organization_user_setup_delivery_v2(
           ${JSON.stringify(input)}::jsonb
         )`,
       );
@@ -273,7 +276,13 @@ function parseOrganizationUserSetupDeliveryClaim(
     typeof candidate.organizationName !== "string" ||
     !["owner", "admin", "member"].includes(String(candidate.organizationRole)) ||
     !workspaceAccess.success ||
-    typeof candidate.expiresAt !== "string"
+    typeof candidate.expiresAt !== "string" ||
+    (candidate.setupTokenTransport !== null &&
+      candidate.setupTokenTransport !== "fragment" &&
+      candidate.setupTokenTransport !== "query") ||
+    (candidate.payloadDigest !== null &&
+      (typeof candidate.payloadDigest !== "string" ||
+        !/^[0-9a-f]{64}$/u.test(candidate.payloadDigest)))
   ) {
     throw new Error("Organization user setup delivery claim returned an invalid result");
   }
@@ -290,6 +299,8 @@ function parseOrganizationUserSetupDeliveryClaim(
     organizationRole: candidate.organizationRole as "owner" | "admin" | "member",
     sharedWorkspaceAccess: workspaceAccess.data,
     expiresAt: candidate.expiresAt,
+    setupTokenTransport: candidate.setupTokenTransport,
+    payloadDigest: candidate.payloadDigest,
   };
 }