@sixb/pg 0.1.5 → 0.1.7

package/src/migrations/031-subagent-runs.sql

@@ -0,0 +1,97 @@
+-- Agent executions may either use a managed service account or inherit their parent's exact
+-- credentialed-user / auth-disabled authority.
+ALTER TABLE executions
+  DROP CONSTRAINT executions_check3,
+  ADD CONSTRAINT executions_agent_authority_check CHECK (
+    (
+      executor_kind = 'request'
+      AND source_kind = 'http'
+      AND executor_id = source_id
+      AND (
+        (
+          authority_kind = 'principal'
+          AND requested_by_user_id IS NOT DISTINCT FROM authority_user_id
+          AND requested_by_service_account_id IS NOT DISTINCT FROM authority_service_account_id
+        )
+        OR (
+          authority_kind = 'disabled'
+          AND requested_by_user_id IS NULL
+          AND requested_by_service_account_id IS NULL
+        )
+      )
+    )
+    OR (
+      executor_kind IN ('action', 'pipeline', 'projection', 'rule', 'sync', 'webhook', 'workflow')
+      AND authority_kind = 'trustedPrimitive'
+      AND executor_kind = authority_primitive_kind
+    )
+    OR (
+      executor_kind = 'agent'
+      AND source_kind = 'execution'
+      AND (
+        (
+          authority_kind = 'principal'
+          AND authority_service_account_id IS NOT NULL
+          AND authority_session_id IS NULL
+          AND authority_access_token_id IS NULL
+        )
+        OR (
+          authority_kind = 'principal'
+          AND authority_user_id IS NOT NULL
+          AND num_nonnulls(authority_session_id, authority_access_token_id) = 1
+        )
+        OR authority_kind = 'disabled'
+      )
+    )
+    OR (executor_kind = 'kernel' AND authority_kind = 'kernel')
+  );
+
+ALTER TABLE agent_runs
+  ADD COLUMN kind TEXT NOT NULL DEFAULT 'conversation'
+    CHECK (kind IN ('conversation', 'subagent')),
+  ADD COLUMN parent_run_id TEXT,
+  ADD COLUMN spawn_key TEXT,
+  ADD COLUMN spec JSONB,
+  ADD COLUMN result JSONB,
+  ALTER COLUMN thread_id DROP NOT NULL,
+  ALTER COLUMN agent_id DROP NOT NULL,
+  ALTER COLUMN trigger_message_id DROP NOT NULL,
+  ADD CONSTRAINT fk_agent_runs_parent
+    FOREIGN KEY (project_id, parent_run_id)
+    REFERENCES agent_runs (project_id, id)
+    ON DELETE RESTRICT,
+  ADD CONSTRAINT agent_runs_kind_fields CHECK (
+    (
+      kind = 'conversation'
+      AND thread_id IS NOT NULL
+      AND agent_id IS NOT NULL
+      AND trigger_message_id IS NOT NULL
+      AND parent_run_id IS NULL
+      AND spawn_key IS NULL
+      AND spec IS NULL
+      AND result IS NULL
+    )
+    OR
+    (
+      kind = 'subagent'
+      AND thread_id IS NULL
+      AND agent_id IS NULL
+      AND trigger_message_id IS NULL
+      AND parent_run_id IS NOT NULL
+      AND spawn_key IS NOT NULL
+      AND spec IS NOT NULL
+    )
+  ),
+  ADD CONSTRAINT agent_runs_subagent_result CHECK (
+    kind <> 'subagent' OR status <> 'succeeded' OR result IS NOT NULL
+  ),
+  ADD CONSTRAINT uq_agent_runs_parent_spawn_key UNIQUE (project_id, parent_run_id, spawn_key);
+
+CREATE INDEX idx_agent_runs_project_parent_started
+  ON agent_runs (
+    project_id,
+    parent_run_id,
+    status,
+    COALESCE(started_at, created_at) DESC,
+    id DESC
+  );

package/src/migrations/032-conversation-run-spec.sql

@@ -0,0 +1,23 @@
+ALTER TABLE agent_runs
+  DROP CONSTRAINT agent_runs_kind_fields,
+  ADD CONSTRAINT agent_runs_kind_fields CHECK (
+    (
+      kind = 'conversation'
+      AND thread_id IS NOT NULL
+      AND agent_id IS NOT NULL
+      AND trigger_message_id IS NOT NULL
+      AND parent_run_id IS NULL
+      AND spawn_key IS NULL
+      AND result IS NULL
+    )
+    OR
+    (
+      kind = 'subagent'
+      AND thread_id IS NULL
+      AND agent_id IS NULL
+      AND trigger_message_id IS NULL
+      AND parent_run_id IS NOT NULL
+      AND spawn_key IS NOT NULL
+      AND spec IS NOT NULL
+    )
+  );

package/src/migrations/033-retire-agent-definitions.sql

@@ -0,0 +1,28 @@
+DROP INDEX IF EXISTS idx_agent_threads_project_agent_activity;
+ALTER TABLE workflow_agent_node_runs RENAME COLUMN agent_id TO actor_id;
+DROP INDEX IF EXISTS idx_agent_runs_project_agent_started;
+
+ALTER TABLE agent_threads DROP COLUMN agent_id;
+
+ALTER TABLE agent_runs
+  DROP CONSTRAINT agent_runs_kind_fields,
+  DROP COLUMN agent_id,
+  ADD CONSTRAINT agent_runs_kind_fields CHECK (
+    (
+      kind = 'conversation'
+      AND thread_id IS NOT NULL
+      AND trigger_message_id IS NOT NULL
+      AND parent_run_id IS NULL
+      AND spawn_key IS NULL
+      AND result IS NULL
+    )
+    OR
+    (
+      kind = 'subagent'
+      AND thread_id IS NULL
+      AND trigger_message_id IS NULL
+      AND parent_run_id IS NOT NULL
+      AND spawn_key IS NOT NULL
+      AND spec IS NOT NULL
+    )
+  );

package/src/migrations/034-device-authorizations.sql

@@ -0,0 +1,24 @@
+CREATE TABLE auth_device_authorizations (
+  project_id TEXT NOT NULL,
+  id TEXT NOT NULL,
+  device_code_hash TEXT NOT NULL,
+  user_code TEXT NOT NULL,
+  client_name TEXT NOT NULL,
+  token_name TEXT NOT NULL,
+  token_expires_at TIMESTAMPTZ NOT NULL,
+  status TEXT NOT NULL CHECK (status IN ('pending', 'approved', 'denied', 'consumed')),
+  approved_user_id TEXT,
+  approved_session_id TEXT,
+  created_at TIMESTAMPTZ NOT NULL,
+  expires_at TIMESTAMPTZ NOT NULL,
+  approved_at TIMESTAMPTZ,
+  denied_at TIMESTAMPTZ,
+  consumed_at TIMESTAMPTZ,
+  PRIMARY KEY (project_id, id),
+  UNIQUE (project_id, user_code),
+  FOREIGN KEY (project_id, approved_user_id) REFERENCES auth_users (project_id, id),
+  FOREIGN KEY (project_id, approved_session_id) REFERENCES auth_sessions (project_id, id)
+);
+
+CREATE INDEX idx_auth_device_authorizations_pending
+  ON auth_device_authorizations (project_id, status, expires_at DESC);

package/src/migrations.ts

@@ -73,6 +73,18 @@ import agentContextCheckpointsSql from "./migrations/027-agent-context-checkpoin
 import objectOverrideEditTimesSql from "./migrations/028-object-override-edit-times.sql" with {
   type: "text",
 }
+import modelAccountingSql from "./migrations/029-model-accounting.sql" with { type: "text" }
+import aiUsageLimitsSql from "./migrations/030-ai-usage-limits.sql" with { type: "text" }
+import subagentRunsSql from "./migrations/031-subagent-runs.sql" with { type: "text" }
+import conversationRunSpecSql from "./migrations/032-conversation-run-spec.sql" with {
+  type: "text",
+}
+import retireAgentDefinitionsSql from "./migrations/033-retire-agent-definitions.sql" with {
+  type: "text",
+}
+import deviceAuthorizationsSql from "./migrations/034-device-authorizations.sql" with {
+  type: "text",
+}
 import type { SQL, SQLClient } from "./pg-client"
 
 export interface PostgresMigrationContext {
@@ -354,6 +366,12 @@ export const postgresStorageMigrations = defineMigrations<PostgresMigrationConte
     pgSql("026-ai-cost-accounting", aiCostAccountingSql),
     pgSql("027-agent-context-checkpoints", agentContextCheckpointsSql),
     pgSql("028-object-override-edit-times", objectOverrideEditTimesSql),
+    pgSql("029-model-accounting", modelAccountingSql),
+    pgSql("030-ai-usage-limits", aiUsageLimitsSql),
+    pgSql("031-subagent-runs", subagentRunsSql),
+    pgSql("032-conversation-run-spec", conversationRunSpecSql),
+    pgSql("033-retire-agent-definitions", retireAgentDefinitionsSql),
+    pgSql("034-device-authorizations", deviceAuthorizationsSql),
   ],
 })
 

package/src/ontology-storage/materialization-state.ts

@@ -22,6 +22,7 @@ import {
   startScopeAccumulator,
 } from "@sixb/core/internal/ontology-storage-provider"
 import type {
+  MaterializationLinkScopeRevision,
   MaterializationLinkScopeState,
   MaterializationLinkState,
   MaterializationObjectState,
@@ -407,7 +408,14 @@ export class PgMaterializationStateReader {
     })
   }
 
-  async linkScopes(
+  async linkScopeRevisions(
+    scopes: readonly { readonly source: OntologyObjectRef; readonly linkId: string }[]
+  ): Promise<readonly MaterializationLinkScopeRevision[]> {
+    if (scopes.length === 0) return []
+    return (await this.readEffectiveLinkScopes(scopes)).revisions
+  }
+
+  async linkSlotStates(
     scopes: readonly { readonly source: OntologyObjectRef; readonly linkId: string }[]
   ): Promise<readonly MaterializationLinkScopeState[]> {
     if (scopes.length === 0) return []
@@ -417,12 +425,6 @@ export class PgMaterializationStateReader {
       source_id: source.primaryId,
       link_id: linkId,
     }))
-    const accumulators = new Map(
-      scopes.map(({ source, linkId }) => {
-        const key = linkScopeSortKey(source, linkId)
-        return [key, startScopeAccumulator(source, linkId)] as const
-      })
-    )
     const requestedParameter = jsonParameter(this.sql, requested)
     const [sourceRows, slotOverrideRows] = await Promise.all([
       this.sql<PgOntologySourceAssertionRow[]>`
@@ -470,6 +472,37 @@ export class PgMaterializationStateReader {
         return [linkScopeSortKey(stored.ref.source, stored.ref.linkId), stored] as const
       })
     )
+    const { revisions, effective } = await this.readEffectiveLinkScopes(scopes)
+    return scopes.map(({ source, linkId }, index) => {
+      const key = linkScopeSortKey(source, linkId)
+      return {
+        ...revisions[index]!,
+        sourceAssertion: sources.get(key) ?? null,
+        override: overrides.get(key) ?? null,
+        effective: effective.get(key) ?? null,
+      }
+    })
+  }
+
+  private async readEffectiveLinkScopes(
+    scopes: readonly { readonly source: OntologyObjectRef; readonly linkId: string }[]
+  ): Promise<{
+    readonly revisions: readonly MaterializationLinkScopeRevision[]
+    readonly effective: ReadonlyMap<string, EffectiveLinkSnapshot | null>
+  }> {
+    const requested = scopes.map(({ source, linkId }) => ({
+      scope_sort_key: linkScopeSortKey(source, linkId),
+      source_type_id: source.objectTypeId,
+      source_id: source.primaryId,
+      link_id: linkId,
+    }))
+    const requestedParameter = jsonParameter(this.sql, requested)
+    const accumulators = new Map(
+      scopes.map(({ source, linkId }) => {
+        const key = linkScopeSortKey(source, linkId)
+        return [key, startScopeAccumulator(source, linkId)] as const
+      })
+    )
     const effective = new Map<string, EffectiveLinkSnapshot | null>()
     let scopeCursor: string | null = null
     let linkCursor: string | null = null
@@ -510,29 +543,12 @@ export class PgMaterializationStateReader {
       scopeCursor = last.scope_sort_key
       linkCursor = last.link_sort_key
     }
-    return scopes.map(({ source, linkId }) => {
-      const key = linkScopeSortKey(source, linkId)
-      return {
-        ...finishScopeAccumulator(accumulators.get(key)!),
-        sourceAssertion: sources.get(key) ?? null,
-        override: overrides.get(key) ?? null,
-        effective: effective.get(key) ?? null,
-      }
-    })
-  }
-
-  async linkScope(
-    source: OntologyObjectRef,
-    linkId: string
-  ): Promise<MaterializationLinkScopeState> {
-    const [scope] = await this.linkScopes([{ source, linkId }])
-    if (!scope) {
-      throw new MaterializationConflictError(
-        "effective-state",
-        "Link scope lookup returned no row."
-      )
+    return {
+      revisions: scopes.map(({ source, linkId }) =>
+        finishScopeAccumulator(accumulators.get(linkScopeSortKey(source, linkId))!)
+      ),
+      effective,
     }
-    return scope
   }
 
   async *incidentLinks(

package/src/ontology-storage/materializations.ts

@@ -121,9 +121,9 @@ export class PgOntologyMaterializationStorage implements OntologyMaterialization
       for (const expected of input.expected.links) {
         this.assertLink(linkRevisions.get(linkRefKey(expected.ref)), expected)
       }
-      const linkScopes = await reader.linkScopes(input.expected.linkScopes)
+      const linkScopeRevisions = await reader.linkScopeRevisions(input.expected.linkScopes)
       for (const [index, expected] of input.expected.linkScopes.entries()) {
-        if (linkScopes[index]?.fingerprint !== expected.fingerprint) {
+        if (linkScopeRevisions[index]?.fingerprint !== expected.fingerprint) {
           throw new MaterializationConflictError(
             "effective-state",
             `Expected link scope changed for ${expected.source.objectTypeId}:${expected.source.primaryId}.${expected.linkId}.`
@@ -191,7 +191,7 @@ export class PgOntologyMaterializationStorage implements OntologyMaterialization
         yield {
           objects: [],
           links: [],
-          linkScopes: await reader.linkScopes(scopes.slice(offset, offset + input.pageRows)),
+          linkScopes: await reader.linkSlotStates(scopes.slice(offset, offset + input.pageRows)),
           points: [],
         }
       }

package/src/pg-ai-cost-storage.ts

@@ -10,6 +10,7 @@ import {
   parseAiModelCallCostDetails,
   toAccountingItem,
 } from "@sixb/core/internal/ai-cost-storage-provider"
+import { normalizeModelProviderIds } from "@sixb/core/models"
 import type { ReadonlyJsonObject } from "@sixb/core/storage"
 import {
   type AiAccountingOverview,
@@ -20,9 +21,13 @@ import {
   type AiModelCallUsageRecord,
   type ListAiModelCallAccountingInput,
   type ListAiModelCallAccountingResult,
+  type ListAiModelCallGroupsInput,
+  type ListAiModelCallGroupsResult,
   type QueryAiAccountingOverviewInput,
   type SummarizeAiCostExecutionsInput,
 } from "@sixb/core/storage"
+import { listAiModelCallGroups } from "./ai-cost-groups"
+import { requestedReasoningFromRow } from "./pg-ai-usage-storage"
 import type { PgStoreClient } from "./transactions"
 import { runPgTransaction } from "./transactions"
 
@@ -30,6 +35,12 @@ import { runPgTransaction } from "./transactions"
 export class PgAiCostStorage implements AiCostStorage {
   constructor(private readonly sql: PgStoreClient) {}
 
+  async listModelCallGroups(
+    input: ListAiModelCallGroupsInput
+  ): Promise<ListAiModelCallGroupsResult> {
+    return listAiModelCallGroups(this.sql, input)
+  }
+
   async recordModelCallCost(input: AiModelCallCostRecord): Promise<void> {
     const record = normalizeAiModelCallCostRecord(input)
     await runPgTransaction(this.sql, async (tx) => {
@@ -100,7 +111,12 @@ export class PgAiCostStorage implements AiCostStorage {
           usage.text_output_tokens,
           usage.reasoning_output_tokens,
           usage.reporting_status,
-          COALESCE(direct_agent.agent_id, workflow_agent.agent_id) AS attribution_agent_id,
+          CASE
+            WHEN direct_agent.kind = 'conversation' THEN 'agent'
+            WHEN workflow_agent.node_run_id IS NOT NULL THEN 'workflowAgent'
+            ELSE NULL
+          END AS attribution_agent_kind,
+          workflow_node.node_id AS attribution_agent_step_id,
           workflow_node.workflow_id AS attribution_workflow_id,
           cost.status AS cost_status,
           cost.currency AS cost_currency,
@@ -135,11 +151,12 @@ export class PgAiCostStorage implements AiCostStorage {
         SELECT 'totals'::text AS dimension,
           NULL::text AS key_1,
           NULL::text AS key_2,
+          NULL::text AS key_3,
           NULL::timestamptz AS bucket_start,
           classified.*
         FROM classified
         UNION ALL
-        SELECT 'series', NULL, NULL,
+        SELECT 'series', NULL, NULL, NULL,
           CASE ${input.bucket}::text
             WHEN 'hour' THEN
               date_trunc('hour', occurred_at AT TIME ZONE 'UTC') AT TIME ZONE 'UTC'
@@ -150,17 +167,18 @@ export class PgAiCostStorage implements AiCostStorage {
           classified.*
         FROM classified
         UNION ALL
-        SELECT 'model', provider_id, requested_model_id, NULL, classified.* FROM classified
+        SELECT 'model', provider_id, requested_model_id, NULL, NULL, classified.* FROM classified
         UNION ALL
-        SELECT 'agent', attribution_agent_id, NULL, NULL, classified.*
-        FROM classified WHERE attribution_agent_id IS NOT NULL
+        SELECT 'agent', attribution_agent_kind, attribution_workflow_id, attribution_agent_step_id, NULL, classified.*
+        FROM classified WHERE attribution_agent_kind IS NOT NULL
         UNION ALL
-        SELECT 'workflow', attribution_workflow_id, NULL, NULL, classified.*
+        SELECT 'workflow', attribution_workflow_id, NULL, NULL, NULL, classified.*
         FROM classified WHERE attribution_workflow_id IS NOT NULL
       )
       SELECT dimension,
         key_1,
         key_2,
+        key_3,
         bucket_start,
         amount_currency,
         COUNT(*)::text AS model_call_count,
@@ -187,7 +205,7 @@ export class PgAiCostStorage implements AiCostStorage {
           AS unvalued_call_count,
         SUM(amount_nanos)::text AS amount_nanos
       FROM expanded
-      GROUP BY dimension, key_1, key_2, bucket_start, amount_currency
+      GROUP BY dimension, key_1, key_2, key_3, bucket_start, amount_currency
     `
     return buildAiAccountingOverviewFromFragments(input, rows.map(aggregateFragmentFromRow))
   }
@@ -221,13 +239,15 @@ export class PgAiCostStorage implements AiCostStorage {
     const rows = await this.sql<JoinedRow[]>`
       SELECT usage.*,
         CASE
-          WHEN direct_agent.id IS NOT NULL THEN 'agent'
+          WHEN direct_agent.kind = 'conversation' THEN 'agent'
+          WHEN direct_agent.kind = 'subagent' THEN 'subagent'
           WHEN workflow_agent.node_run_id IS NOT NULL THEN 'workflowAgent'
           ELSE NULL
         END AS attribution_kind,
-        COALESCE(direct_agent.agent_id, workflow_agent.agent_id) AS attribution_agent_id,
+        workflow_node.node_id AS attribution_agent_step_id,
         direct_agent.id AS attribution_agent_run_id,
         direct_agent.thread_id AS attribution_thread_id,
+        direct_agent.parent_run_id AS attribution_parent_run_id,
         workflow_agent.node_run_id AS attribution_node_run_id,
         workflow_node.workflow_id AS attribution_workflow_id,
         workflow_node.workflow_run_id AS attribution_workflow_run_id,
@@ -303,6 +323,7 @@ interface UsageRow {
   readonly call_id: string
   readonly provider_id: string
   readonly requested_model_id: string
+  readonly requested_reasoning: string | Record<string, unknown> | null
   readonly response_model_id: string | null
   readonly response_id: string
   readonly input_tokens: number | string | null
@@ -315,15 +336,17 @@ interface UsageRow {
   readonly reasoning_output_tokens: number | string | null
   readonly reporting_status: AiModelCallUsageRecord["usage"]["reportingStatus"]
   readonly raw_usage: ReadonlyJsonObject | string | null
+  readonly provider_ids: Record<string, unknown> | string | null
   readonly occurred_at: Date | string
   readonly recorded_at: Date | string
 }
 
 interface JoinedRow extends UsageRow {
-  readonly attribution_kind: "agent" | "workflowAgent" | null
-  readonly attribution_agent_id: string | null
+  readonly attribution_kind: "agent" | "subagent" | "workflowAgent" | null
+  readonly attribution_agent_step_id: string | null
   readonly attribution_agent_run_id: string | null
   readonly attribution_thread_id: string | null
+  readonly attribution_parent_run_id: string | null
   readonly attribution_node_run_id: string | null
   readonly attribution_workflow_id: string | null
   readonly attribution_workflow_run_id: string | null
@@ -342,6 +365,7 @@ interface AggregateRow {
   readonly dimension: AiAccountingAggregateFragment["dimension"]
   readonly key_1: string | null
   readonly key_2: string | null
+  readonly key_3: string | null
   readonly bucket_start: Date | string | null
   readonly amount_currency: string | null
   readonly model_call_count: string
@@ -405,7 +429,12 @@ function aggregateFragmentFromRow(row: AggregateRow): AiAccountingAggregateFragm
     row.dimension === "model"
       ? { providerId: required(row.key_1), modelId: required(row.key_2) }
       : row.dimension === "agent"
-        ? { agentId: required(row.key_1) }
+        ? {
+            agentKind: required(row.key_1) as "agent" | "workflowAgent",
+            ...(row.key_1 === "workflowAgent"
+              ? { workflowId: required(row.key_2), agentStepId: required(row.key_3) }
+              : {}),
+          }
         : row.dimension === "workflow"
           ? { workflowId: required(row.key_1) }
           : row.dimension === "series"
@@ -466,17 +495,22 @@ function accountingItemFromRow(row: JoinedRow): AiAccountingRecordSetItem {
       : row.attribution_kind === "agent"
         ? {
             kind: "agent" as const,
-            agentId: required(row.attribution_agent_id),
             agentRunId: required(row.attribution_agent_run_id),
             threadId: required(row.attribution_thread_id),
           }
-        : {
-            kind: "workflowAgent" as const,
-            agentId: required(row.attribution_agent_id),
-            nodeRunId: required(row.attribution_node_run_id),
-            workflowId: required(row.attribution_workflow_id),
-            workflowRunId: required(row.attribution_workflow_run_id),
-          }
+        : row.attribution_kind === "subagent"
+          ? {
+              kind: "subagent" as const,
+              subagentRunId: required(row.attribution_agent_run_id),
+              parentRunId: required(row.attribution_parent_run_id),
+            }
+          : {
+              kind: "workflowAgent" as const,
+              agentStepId: required(row.attribution_agent_step_id),
+              nodeRunId: required(row.attribution_node_run_id),
+              workflowId: required(row.attribution_workflow_id),
+              workflowRunId: required(row.attribution_workflow_run_id),
+            }
   return {
     usage,
     ...(attribution ? { attribution } : {}),
@@ -494,7 +528,17 @@ function usageFromRow(row: UsageRow, requesterGroupIds: readonly string[]): AiMo
     callId: row.call_id,
     requesterGroupIds,
     providerId: row.provider_id,
+    ...(row.provider_ids === null
+      ? {}
+      : {
+          providerIds: normalizeModelProviderIds(
+            typeof row.provider_ids === "string" ? JSON.parse(row.provider_ids) : row.provider_ids
+          ),
+        }),
     requestedModelId: row.requested_model_id,
+    ...(row.requested_reasoning === null
+      ? {}
+      : { requestedReasoning: requestedReasoningFromRow(row.requested_reasoning) }),
     ...(row.response_model_id === null ? {} : { responseModelId: row.response_model_id }),
     responseId: row.response_id,
     usage: {
@@ -569,14 +613,15 @@ function costRecord(input: {
   ratedAt: Date | string
 }): AiModelCallCostRecord {
   const details = parseAiModelCallCostDetails(input.details)
+  const priceSource =
+    details.priceSource === undefined
+      ? undefined
+      : { ...details.priceSource, observedAt: new Date(details.priceSource.observedAt) }
   const base = {
+    ...(details.estimate === undefined ? {} : { estimate: details.estimate }),
     projectId: input.projectId,
     usageRecordId: input.usageId,
     pricingContext: details.pricingContext,
-    priceSource: {
-      ...details.priceSource,
-      observedAt: new Date(details.priceSource.observedAt),
-    },
     ratedAt: new Date(input.ratedAt),
   }
   if (input.status === "rated") {
@@ -584,6 +629,7 @@ function costRecord(input: {
       ...base,
       status: "rated",
       billingIdentity: { providerId: required(input.providerId), modelId: required(input.modelId) },
+      priceSource: required(priceSource),
       money: { currency: required(input.currency), amountNanos: required(input.amountNanos) },
       components: required(details.components),
     })
@@ -594,6 +640,7 @@ function costRecord(input: {
     ...(input.providerId && input.modelId
       ? { billingIdentity: { providerId: input.providerId, modelId: input.modelId } }
       : {}),
+    ...(priceSource === undefined ? {} : { priceSource }),
     reason: required(input.reason) as Extract<
       AiModelCallCostRecord,
       { status: "unpriceable" }