@sixb/pg 0.1.5 → 0.1.7

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

@@ -1,3 +1,4 @@
+import { isModelReasoning, normalizeModelProviderIds } from "@sixb/core/models"
 import type { ReadonlyJsonObject } from "@sixb/core/storage"
 import {
   type AiModelCallUsageInput,
@@ -36,7 +37,9 @@ export class PgAiUsageStorage implements AiUsageStorage {
           attempt,
           call_id,
           provider_id,
+          provider_ids,
           requested_model_id,
+          requested_reasoning,
           response_model_id,
           response_id,
           input_tokens,
@@ -58,7 +61,13 @@ export class PgAiUsageStorage implements AiUsageStorage {
           ${record.attempt},
           ${record.callId},
           ${record.providerId},
+          ${record.providerIds === undefined ? null : JSON.stringify(record.providerIds)}::jsonb,
           ${record.requestedModelId},
+          ${
+            record.requestedReasoning === undefined
+              ? null
+              : JSON.stringify(record.requestedReasoning)
+          }::text::jsonb,
           ${record.responseModelId ?? null},
           ${record.responseId},
           ${record.usage.inputTokens ?? null},
@@ -181,7 +190,17 @@ export class PgAiUsageStorage implements AiUsageStorage {
       callId: row.call_id,
       requesterGroupIds: groupRows.map((group) => group.group_id),
       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: {
@@ -237,7 +256,9 @@ interface AiUsageRow {
   readonly attempt: number | string
   readonly call_id: string
   readonly provider_id: string
+  readonly provider_ids: Record<string, unknown> | string | null
   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
@@ -298,6 +319,19 @@ function rawUsageFromRow(value: Exclude<AiUsageRow["raw_usage"], null>): Readonl
   return typeof value === "string" ? (JSON.parse(value) as ReadonlyJsonObject) : value
 }
 
+export function requestedReasoningFromRow(
+  value: Exclude<AiUsageRow["requested_reasoning"], null>
+): AiModelCallUsageRecord["requestedReasoning"] {
+  const parsed: unknown =
+    typeof value === "string" && (value.startsWith('"') || value.startsWith("{"))
+      ? JSON.parse(value)
+      : value
+  if (!isModelReasoning(parsed)) {
+    throw new Error("[SixbPg] Stored AI usage requested reasoning is invalid.")
+  }
+  return parsed
+}
+
 function assertNonBlankProjectId(projectId: string): void {
   if (typeof projectId !== "string" || projectId.trim().length === 0) {
     throw new TypeError("[Sixb] AI usage projectId must be nonblank.")

package/src/pg-workflow-run-storage.ts

@@ -407,16 +407,16 @@ export class PgWorkflowAgentNodeRunStorage implements WorkflowAgentNodeRunStorag
       projectId: input.projectId,
       executionId: input.executionId,
       nodeRunId: input.nodeRunId,
-      agentId: input.agentId,
+      actorId: input.actorId,
       workflowExecutionId: parent.execution_id,
     })
 
     try {
       const [row] = await this.sql<WorkflowAgentNodeRunDatabaseRow[]>`
         INSERT INTO workflow_agent_node_runs (
-          project_id, node_run_id, execution_id, agent_id, status, prompt, attempt, created_at
+          project_id, node_run_id, execution_id, actor_id, status, prompt, attempt, created_at
         ) VALUES (
-          ${input.projectId}, ${input.nodeRunId}, ${input.executionId}, ${input.agentId},
+          ${input.projectId}, ${input.nodeRunId}, ${input.executionId}, ${input.actorId},
           ${"queued"}, ${input.prompt}, ${0}, ${input.createdAt ?? new Date()}
         ) RETURNING *
       `
@@ -554,9 +554,9 @@ export class PgWorkflowAgentNodeRunStorage implements WorkflowAgentNodeRunStorag
     const whereClauses = ["project_id = $1"]
     const params: SqlParameter[] = [input.projectId]
     let index = 2
-    if (input.agentId) {
-      whereClauses.push(`agent_id = $${index++}`)
-      params.push(input.agentId)
+    if (input.actorId) {
+      whereClauses.push(`actor_id = $${index++}`)
+      params.push(input.actorId)
     }
     index = appendRunListFilters(whereClauses, params, index, input)
     const result = await queryRunList<WorkflowAgentNodeRunDatabaseRow>({
@@ -910,7 +910,7 @@ interface WorkflowAgentNodeRunDatabaseRow {
   project_id: string
   node_run_id: string
   execution_id: string
-  agent_id: string
+  actor_id: string
   status: WorkflowAgentNodeRunRecord["status"]
   prompt: string
   model_id: string | null
@@ -968,7 +968,7 @@ function rowToWorkflowAgentNodeRunRecord(
     projectId: row.project_id,
     nodeRunId: row.node_run_id,
     executionId: row.execution_id,
-    agentId: row.agent_id,
+    actorId: row.actor_id,
     status: row.status,
     prompt: row.prompt,
     ...(row.model_id ? { modelId: row.model_id } : {}),