@sixb/sqlite 0.1.1 → 0.1.2

package/src/action-run-storage.ts

@@ -1,5 +1,10 @@
 import type { Database } from "bun:sqlite"
 import type { ActionSubject, JsonValue } from "@sixb/core"
+import {
+  parseActionRunFailure,
+  serializeActionRunFailure,
+} from "@sixb/core/internal/action-run-storage"
+import { assertActionRunExecution } from "@sixb/core/internal/action-run-storage-provider"
 import type {
   ActionRunEffectsRecord,
   ActionRunFailure,
@@ -9,6 +14,7 @@ import type {
   ActionRunStorage,
   ActionRunWritebackRecord,
   EnterActionRunPhaseInput,
+  ExecutionStorage,
   FinishActionRunInput,
   ListActionRunsInput,
   ListActionRunsResult,
@@ -33,6 +39,8 @@ import {
 } from "./transactions"
 
 export interface SqliteActionRunStorageOptions {
+  /** Execution lookup sharing the same provider transaction. */
+  executions: ExecutionStorage
   /** Path to SQLite database file. Defaults to ':memory:' for in-memory database. */
   path?: string
   /** Internal shared connection used by bundled SqliteStorage. */
@@ -43,9 +51,12 @@ export class SqliteActionRunStorage implements ActionRunStorage {
   private readonly connection: SqliteStoreConnection
   private readonly db: Database
 
-  constructor(options: SqliteActionRunStorageOptions = {}) {
+  private readonly executions: ExecutionStorage
+
+  constructor(options: SqliteActionRunStorageOptions) {
     this.connection = openSqliteStoreConnection(options)
     this.db = this.connection.db
+    this.executions = options.executions
 
     if (this.connection.installFreshSchema) {
       installFreshSqliteSchema(this.db)
@@ -85,6 +96,13 @@ export class SqliteActionRunStorage implements ActionRunStorage {
 
   async queue(input: QueueActionRunInput): Promise<ActionRunRecord> {
     const queuedAt = input.queuedAt ?? new Date()
+    await assertActionRunExecution({
+      executions: this.executions,
+      projectId: input.projectId,
+      executionId: input.executionId,
+      runId: input.id,
+      actionId: input.actionId,
+    })
 
     try {
       this.db
@@ -93,6 +111,7 @@ export class SqliteActionRunStorage implements ActionRunStorage {
           INSERT INTO action_runs (
             project_id,
             id,
+            execution_id,
             action_id,
             subject_kind,
             object_type_id,
@@ -107,28 +126,23 @@ export class SqliteActionRunStorage implements ActionRunStorage {
             writeback_status,
             writeback_completed_at,
             writeback_result,
-            writeback_error_name,
-            writeback_error_message,
-            writeback_error_phase,
+            writeback_error,
             effects_status,
             effects_completed_at,
-            effects_error_name,
-            effects_error_message,
-            effects_error_phase,
-            error_name,
-            error_message,
-            error_phase
+            effects_error,
+            error
           ) VALUES (
-            ?, ?, ?, ?, ?, ?, ?, ?, ?, NULL, NULL, ?, ?,
-            NULL, NULL, NULL, NULL, NULL, NULL,
-            NULL, NULL, NULL, NULL, NULL,
-            NULL, NULL, NULL
+            ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NULL, NULL, ?, ?,
+            NULL, NULL, NULL, NULL,
+            NULL, NULL, NULL,
+            NULL
           )
         `
         )
         .run(
           input.projectId,
           input.id,
+          input.executionId,
           input.actionId,
           input.subject.kind,
           input.subject.kind === "object" ? input.subject.objectTypeId : null,
@@ -188,17 +202,11 @@ export class SqliteActionRunStorage implements ActionRunStorage {
             writeback_status = NULL,
             writeback_completed_at = NULL,
             writeback_result = NULL,
-            writeback_error_name = NULL,
-            writeback_error_message = NULL,
-            writeback_error_phase = NULL,
+            writeback_error = NULL,
             effects_status = NULL,
             effects_completed_at = NULL,
-            effects_error_name = NULL,
-            effects_error_message = NULL,
-            effects_error_phase = NULL,
-            error_name = NULL,
-            error_message = NULL,
-            error_phase = NULL
+            effects_error = NULL,
+            error = NULL
           WHERE project_id = ? AND id = ?
         `
         )
@@ -238,9 +246,7 @@ export class SqliteActionRunStorage implements ActionRunStorage {
             status = ?,
             phase = ?,
             started_at = ?,
-            error_name = NULL,
-            error_message = NULL,
-            error_phase = NULL
+            error = NULL
           WHERE project_id = ? AND id = ?
         `
         )
@@ -307,9 +313,7 @@ export class SqliteActionRunStorage implements ActionRunStorage {
             writeback_status = ?,
             writeback_completed_at = ?,
             writeback_result = ?,
-            writeback_error_name = ?,
-            writeback_error_message = ?,
-            writeback_error_phase = ?
+            writeback_error = ?
           WHERE project_id = ? AND id = ?
         `
         )
@@ -318,9 +322,7 @@ export class SqliteActionRunStorage implements ActionRunStorage {
           input.status,
           nextWriteback.completedAt.toISOString(),
           input.status === "succeeded" ? serializeJsonValue(input.result) : null,
-          input.status === "failed" ? (input.error.name ?? null) : null,
-          input.status === "failed" ? input.error.message : null,
-          input.status === "failed" ? (input.error.phase ?? "writeback") : null,
+          input.status === "failed" ? serializeActionRunFailure(input.error, "writeback") : null,
           input.projectId,
           input.id
         )
@@ -357,9 +359,7 @@ export class SqliteActionRunStorage implements ActionRunStorage {
             phase = ?,
             effects_status = ?,
             effects_completed_at = ?,
-            effects_error_name = ?,
-            effects_error_message = ?,
-            effects_error_phase = ?
+            effects_error = ?
           WHERE project_id = ? AND id = ?
         `
         )
@@ -367,9 +367,7 @@ export class SqliteActionRunStorage implements ActionRunStorage {
           "effects",
           input.status,
           nextEffects.completedAt.toISOString(),
-          input.status === "failed" ? (input.error.name ?? null) : null,
-          input.status === "failed" ? input.error.message : null,
-          input.status === "failed" ? (input.error.phase ?? "effects") : null,
+          input.status === "failed" ? serializeActionRunFailure(input.error, "effects") : null,
           input.projectId,
           input.id
         )
@@ -410,9 +408,7 @@ export class SqliteActionRunStorage implements ActionRunStorage {
             status = ?,
             phase = ?,
             finished_at = ?,
-            error_name = ?,
-            error_message = ?,
-            error_phase = ?
+            error = ?
           WHERE project_id = ? AND id = ?
         `
         )
@@ -420,9 +416,7 @@ export class SqliteActionRunStorage implements ActionRunStorage {
           input.status,
           phase,
           (input.finishedAt ?? new Date()).toISOString(),
-          input.status === "succeeded" ? null : (input.error?.name ?? null),
-          input.status === "succeeded" ? null : (input.error?.message ?? null),
-          input.status === "succeeded" ? null : (input.error?.phase ?? phase),
+          input.status === "succeeded" ? null : serializeActionRunFailure(input.error),
           input.projectId,
           input.id
         )
@@ -583,23 +577,14 @@ function serializeJsonValue(value: JsonValue): string {
 }
 
 function toActionRunFailure(row: DatabaseRow): ActionRunFailure | undefined {
-  return toFailure(row.error_name, row.error_message, row.error_phase)
+  return row.error === null ? undefined : parseActionRunFailure(row.error)
 }
 
-function toFailure(
-  name: string | null,
-  message: string | null,
-  phase: ActionRunPhase | null
-): ActionRunFailure | undefined {
-  if (!message) {
-    return undefined
-  }
-
-  return {
-    name: name ?? undefined,
-    message,
-    phase: phase ?? undefined,
-  }
+function parsePhaseFailure<TPhase extends Extract<ActionRunPhase, "writeback" | "effects">>(
+  value: string | null,
+  expectedPhase: TPhase
+): ActionRunFailure<TPhase> {
+  return parseActionRunFailure(value, expectedPhase)
 }
 
 function toActionRunWritebackRecord(row: DatabaseRow): ActionRunWritebackRecord | undefined {
@@ -623,11 +608,7 @@ function toActionRunWritebackRecord(row: DatabaseRow): ActionRunWritebackRecord
   return {
     status: "failed",
     completedAt,
-    error: toFailure(
-      row.writeback_error_name,
-      row.writeback_error_message,
-      row.writeback_error_phase
-    ),
+    error: parsePhaseFailure(row.writeback_error, "writeback"),
   }
 }
 
@@ -650,7 +631,7 @@ function toActionRunEffectsRecord(row: DatabaseRow): ActionRunEffectsRecord | un
   return {
     status: "failed",
     completedAt,
-    error: toFailure(row.effects_error_name, row.effects_error_message, row.effects_error_phase),
+    error: parsePhaseFailure(row.effects_error, "effects"),
   }
 }
 
@@ -695,6 +676,7 @@ function rowToActionRunRecord(row: DatabaseRow): ActionRunRecord {
   return {
     id: row.id,
     projectId: row.project_id,
+    executionId: row.execution_id,
     actionId: row.action_id,
     subject: rowToActionSubject(row),
     status: row.status,
@@ -733,6 +715,7 @@ function isUniqueConstraintError(error: unknown): boolean {
 interface DatabaseRow {
   project_id: string
   id: string
+  execution_id: string
   action_id: string
   subject_kind: ActionSubject["kind"]
   object_type_id: string | null
@@ -747,15 +730,9 @@ interface DatabaseRow {
   writeback_status: ActionRunWritebackRecord["status"] | null
   writeback_completed_at: string | null
   writeback_result: string | null
-  writeback_error_name: string | null
-  writeback_error_message: string | null
-  writeback_error_phase: ActionRunPhase | null
+  writeback_error: string | null
   effects_status: ActionRunEffectsRecord["status"] | null
   effects_completed_at: string | null
-  effects_error_name: string | null
-  effects_error_message: string | null
-  effects_error_phase: ActionRunPhase | null
-  error_name: string | null
-  error_message: string | null
-  error_phase: ActionRunPhase | null
+  effects_error: string | null
+  error: string | null
 }

package/src/agents/agent-storage.ts

@@ -1,4 +1,4 @@
-import type { AgentStorage } from "@sixb/core/storage"
+import type { AgentStorage, ExecutionStorage } from "@sixb/core/storage"
 import { installFreshSqliteSchema } from "../migrations"
 import {
   closeSqliteStoreConnection,
@@ -14,6 +14,8 @@ export interface SqliteAgentStorageOptions {
   path?: string
   /** Internal shared connection used by bundled SqliteStorage. */
   connection?: SqliteStoreConnection
+  /** Execution ledger used to validate immutable run ownership. */
+  executions: ExecutionStorage
 }
 
 /**
@@ -28,7 +30,7 @@ export class SqliteAgentStorage implements AgentStorage {
 
   private readonly connection: SqliteStoreConnection
 
-  constructor(options: SqliteAgentStorageOptions = {}) {
+  constructor(options: SqliteAgentStorageOptions) {
     this.connection = openSqliteStoreConnection(options)
 
     if (this.connection.installFreshSchema) {
@@ -36,7 +38,7 @@ export class SqliteAgentStorage implements AgentStorage {
     }
 
     this.threads = new SqliteAgentThreadStore(this.connection.db)
-    this.runs = new SqliteAgentRunStore(this.connection.db)
+    this.runs = new SqliteAgentRunStore(this.connection.db, options.executions)
     this.messages = new SqliteAgentMessageStore(this.connection.db)
   }
 

package/src/agents/rows.ts

@@ -1,10 +1,11 @@
 import type { Database } from "bun:sqlite"
-import { type AgentMessagePart, type Principal, SYSTEM_PRINCIPAL } from "@sixb/core"
+import type { AgentMessagePart, Principal } from "@sixb/core"
+import { parseSixbFailure } from "@sixb/core/internal/errors"
 import {
+  AGENT_RUN_FAILURE_CODES,
   type AgentMessageRecord,
   type AgentRunDiagnostic,
   type AgentRunRecord,
-  type AgentRunUsage,
   type AgentThreadRecord,
   coerceAgentRunFinishReason,
 } from "@sixb/core/storage"
@@ -30,21 +31,14 @@ export interface AgentThreadRow {
 export interface AgentRunRow {
   project_id: string
   id: string
+  execution_id: string
   thread_id: string
   agent_id: string
   trigger_message_id: string
-  requested_by_principal_type: Principal["type"] | null
-  requested_by_principal_id: string | null
-  execution_principal_type: "serviceAccount" | null
-  execution_principal_id: string | null
+  requester_group_ids: string
   status: AgentRunRecord["status"]
   model_id: string | null
   finish_reason: string | null
-  usage_input_tokens: number | null
-  usage_output_tokens: number | null
-  usage_total_tokens: number | null
-  usage_reasoning_tokens: number | null
-  usage_cached_input_tokens: number | null
   error: string | null
   diagnostics: string | null
   attempt: number
@@ -93,21 +87,15 @@ export function rowToRunRecord(row: AgentRunRow): AgentRunRecord {
   return {
     id: row.id,
     projectId: row.project_id,
+    executionId: row.execution_id,
     threadId: row.thread_id,
     agentId: row.agent_id,
     triggerMessageId: row.trigger_message_id,
-    requestedByPrincipal:
-      principalFromColumns(row.requested_by_principal_type, row.requested_by_principal_id) ??
-      SYSTEM_PRINCIPAL,
-    executionPrincipal: serviceAccountPrincipalFromColumns(
-      row.execution_principal_type,
-      row.execution_principal_id
-    ),
+    requesterGroupIds: JSON.parse(row.requester_group_ids) as string[],
     status: row.status,
     modelId: row.model_id ?? undefined,
     finishReason: coerceAgentRunFinishReason(row.finish_reason),
-    usage: rowToUsage(row),
-    error: row.error ?? undefined,
+    error: row.error === null ? undefined : parseSixbFailure(row.error, AGENT_RUN_FAILURE_CODES),
     diagnostics:
       row.diagnostics === null ? undefined : (JSON.parse(row.diagnostics) as AgentRunDiagnostic[]),
     attempt: row.attempt,
@@ -150,26 +138,6 @@ function principalFromColumns(
   return type && id ? { type, id } : undefined
 }
 
-function serviceAccountPrincipalFromColumns(
-  type: "serviceAccount" | null | undefined,
-  id: string | null | undefined
-): Extract<Principal, { readonly type: "serviceAccount" }> | undefined {
-  return type === "serviceAccount" && id ? { type, id } : undefined
-}
-
-function rowToUsage(row: AgentRunRow): AgentRunUsage | undefined {
-  const usage: AgentRunUsage = {
-    ...(row.usage_input_tokens === null ? {} : { inputTokens: row.usage_input_tokens }),
-    ...(row.usage_output_tokens === null ? {} : { outputTokens: row.usage_output_tokens }),
-    ...(row.usage_total_tokens === null ? {} : { totalTokens: row.usage_total_tokens }),
-    ...(row.usage_reasoning_tokens === null ? {} : { reasoningTokens: row.usage_reasoning_tokens }),
-    ...(row.usage_cached_input_tokens === null
-      ? {}
-      : { cachedInputTokens: row.usage_cached_input_tokens }),
-  }
-  return Object.keys(usage).length === 0 ? undefined : usage
-}
-
 // ── offset pagination (threads / messages order by their own column, not started_at) ─────────────
 
 export function queryAgentList<TRow>(input: {

package/src/agents/runs.ts

@@ -1,10 +1,15 @@
 import type { Database } from "bun:sqlite"
+import { assertAgentRunExecution } from "@sixb/core/internal/agent-run-storage-provider"
+import { normalizeRequesterGroupIds } from "@sixb/core/internal/auth"
+import { serializeSixbFailure } from "@sixb/core/internal/errors"
 import {
+  AGENT_RUN_FAILURE_CODES,
   type AgentRunRecord,
   type AgentRunStore,
   AgentStorageError,
   type ConfirmAgentRunExecutionOwnershipInput,
   type CreateAgentRunInput,
+  type ExecutionStorage,
   type FinishAgentRunInput,
   type FinishQueuedAgentRunInput,
   type ListAgentRunsInput,
@@ -24,10 +29,20 @@ import { type AgentRunRow, rowToRunRecord } from "./rows"
 const SQLITE_RUN_ID_BATCH_SIZE = 500
 
 export class SqliteAgentRunStore implements AgentRunStore {
-  constructor(private readonly db: Database) {}
+  constructor(
+    private readonly db: Database,
+    private readonly executions: ExecutionStorage
+  ) {}
 
   async create(input: CreateAgentRunInput): Promise<AgentRunRecord> {
     const createdAt = input.createdAt ?? new Date()
+    await assertAgentRunExecution({
+      executions: this.executions,
+      projectId: input.projectId,
+      executionId: input.executionId,
+      runId: input.id,
+      agentId: input.agentId,
+    })
 
     return this.db.transaction(() => {
       const thread = this.db
@@ -55,11 +70,11 @@ export class SqliteAgentRunStore implements AgentRunStore {
             INSERT INTO agent_runs (
               project_id,
               id,
+              execution_id,
               thread_id,
               agent_id,
               trigger_message_id,
-              requested_by_principal_type,
-              requested_by_principal_id,
+              requester_group_ids,
               status,
               attempt,
               created_at
@@ -69,11 +84,11 @@ export class SqliteAgentRunStore implements AgentRunStore {
           .run(
             input.projectId,
             input.id,
+            input.executionId,
             input.threadId,
             input.agentId,
             input.triggerMessageId,
-            input.requestedByPrincipal.type,
-            input.requestedByPrincipal.id,
+            JSON.stringify(normalizeRequesterGroupIds(input.requesterGroupIds)),
             createdAt.toISOString()
           )
       } catch (error) {
@@ -107,8 +122,6 @@ export class SqliteAgentRunStore implements AgentRunStore {
           UPDATE agent_runs
           SET
             status = 'running',
-            execution_principal_type = ?,
-            execution_principal_id = ?,
             model_id = ?,
             attempt = 1,
             execution_token = ?,
@@ -118,8 +131,6 @@ export class SqliteAgentRunStore implements AgentRunStore {
         `
         )
         .run(
-          input.executionPrincipal?.type ?? null,
-          input.executionPrincipal?.id ?? null,
           input.modelId ?? null,
           input.execution.token,
           input.execution.queueLeaseExpiresAt.toISOString(),
@@ -146,7 +157,9 @@ export class SqliteAgentRunStore implements AgentRunStore {
         )
         .run(
           input.status,
-          input.error ?? null,
+          input.error === undefined
+            ? null
+            : serializeSixbFailure(input.error, AGENT_RUN_FAILURE_CODES),
           completedAt.toISOString(),
           input.projectId,
           input.id
@@ -208,7 +221,10 @@ export class SqliteAgentRunStore implements AgentRunStore {
 
   async finish(input: FinishAgentRunInput): Promise<AgentRunRecord> {
     const completedAt = input.completedAt ?? new Date()
-    const errorValue = input.status === "succeeded" ? null : (input.error ?? null)
+    const errorValue =
+      input.status === "succeeded" || input.error === undefined
+        ? null
+        : serializeSixbFailure(input.error, AGENT_RUN_FAILURE_CODES)
 
     return this.db.transaction(() => {
       const run = this.requireRunning(input.projectId, input.id)
@@ -228,11 +244,6 @@ export class SqliteAgentRunStore implements AgentRunStore {
             status = ?,
             model_id = COALESCE(?, model_id),
             finish_reason = ?,
-            usage_input_tokens = ?,
-            usage_output_tokens = ?,
-            usage_total_tokens = ?,
-            usage_reasoning_tokens = ?,
-            usage_cached_input_tokens = ?,
             error = ?,
             diagnostics = ?,
             execution_token = NULL,
@@ -245,11 +256,6 @@ export class SqliteAgentRunStore implements AgentRunStore {
           input.status,
           input.modelId ?? null,
           input.finishReason ?? null,
-          input.usage?.inputTokens ?? null,
-          input.usage?.outputTokens ?? null,
-          input.usage?.totalTokens ?? null,
-          input.usage?.reasoningTokens ?? null,
-          input.usage?.cachedInputTokens ?? null,
           errorValue,
           input.diagnostics === undefined ? null : JSON.stringify(input.diagnostics),
           completedAt.toISOString(),