@sixb/sqlite 0.1.5 → 0.1.7

package/src/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 "./ai-usage-storage"
 import { isUniqueConstraintError } from "./storage-errors"
 import { runImmediateTransaction, type SqliteStoreConnection } from "./transactions"
 
@@ -30,6 +35,12 @@ import { runImmediateTransaction, type SqliteStoreConnection } from "./transacti
 export class SqliteAiCostStorage implements AiCostStorage {
   constructor(private readonly connection: SqliteStoreConnection) {}
 
+  async listModelCallGroups(
+    input: ListAiModelCallGroupsInput
+  ): Promise<ListAiModelCallGroupsResult> {
+    return listAiModelCallGroups(this.connection, input)
+  }
+
   async recordModelCallCost(input: AiModelCallCostRecord): Promise<void> {
     const record = normalizeAiModelCallCostRecord(input)
     runImmediateTransaction(this.connection.db, () => {
@@ -176,13 +187,15 @@ const SQLITE_ACCOUNTING_LIST_COUNT_SQL = `
 const SQLITE_ACCOUNTING_LIST_PAGE_SQL = `
   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,
@@ -231,7 +244,12 @@ const SQLITE_ACCOUNTING_OVERVIEW_SQL = `
       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,
       CASE
         WHEN cost.status = 'rated' THEN 'rated'
@@ -256,11 +274,11 @@ const SQLITE_ACCOUNTING_OVERVIEW_SQL = `
       AND (? IS NULL OR usage.provider_id = ?)
       AND (? IS NULL OR usage.requested_model_id = ?)
   ), expanded AS (
-    SELECT 'totals' AS dimension, NULL AS key_1, NULL AS key_2, NULL AS bucket_start,
+    SELECT 'totals' AS dimension, NULL AS key_1, NULL AS key_2, NULL AS key_3, NULL AS bucket_start,
       classified.*
     FROM classified
     UNION ALL
-    SELECT 'series', NULL, NULL,
+    SELECT 'series', NULL, NULL, NULL,
       CASE ?
         WHEN 'hour' THEN strftime('%Y-%m-%dT%H:00:00.000Z', occurred_at)
         WHEN 'day' THEN strftime('%Y-%m-%dT00:00:00.000Z', occurred_at)
@@ -273,17 +291,18 @@ const SQLITE_ACCOUNTING_OVERVIEW_SQL = `
       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,
     CAST(COUNT(*) AS TEXT) AS model_call_count,
@@ -313,7 +332,7 @@ const SQLITE_ACCOUNTING_OVERVIEW_SQL = `
     CAST(SUM((amount_nanos / 1000000) % 1000000) AS TEXT) AS amount_middle,
     CAST(SUM(amount_nanos % 1000000) AS TEXT) AS amount_low
   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
 `
 
 function accountingListFilterParameters(
@@ -355,6 +374,7 @@ interface UsageRow {
   readonly call_id: string
   readonly provider_id: string
   readonly requested_model_id: string
+  readonly requested_reasoning: string | null
   readonly response_model_id: string | null
   readonly response_id: string
   readonly input_tokens: number | null
@@ -367,15 +387,17 @@ interface UsageRow {
   readonly reasoning_output_tokens: number | null
   readonly reporting_status: AiModelCallUsageRecord["usage"]["reportingStatus"]
   readonly raw_usage: string | null
+  readonly provider_ids: string | null
   readonly occurred_at: string
   readonly recorded_at: 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
@@ -394,6 +416,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: string | null
   readonly amount_currency: string | null
   readonly model_call_count: string
@@ -436,7 +459,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"
@@ -510,17 +538,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 } : {}),
@@ -537,7 +570,13 @@ function usageFromRow(row: UsageRow, requesterGroupIds: readonly string[]): AiMo
     callId: row.call_id,
     requesterGroupIds,
     providerId: row.provider_id,
+    ...(row.provider_ids === null
+      ? {}
+      : { providerIds: normalizeModelProviderIds(JSON.parse(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: {
@@ -610,14 +649,15 @@ function costRecord(input: {
   ratedAt: 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") {
@@ -625,6 +665,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),
     })
@@ -635,6 +676,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" }