@sixb/sqlite 0.1.1 → 0.1.2

package/src/workflow-run-storage.ts

@@ -1,11 +1,17 @@
 import type { Database } from "bun:sqlite"
-import type { Principal, WorkflowRunSource } from "@sixb/core"
+import { normalizeRequesterGroupIds } from "@sixb/core/internal/auth"
+import { parseSixbFailure, serializeSixbFailure } from "@sixb/core/internal/errors"
+import {
+  assertWorkflowAgentNodeRunExecution,
+  assertWorkflowRunExecution,
+} from "@sixb/core/internal/workflow-run-storage-provider"
 import type { WorkflowIOSnapshot } from "@sixb/core/internal/workflows"
 import type {
   CancelWorkflowAgentNodeRunInput,
   ConfirmWorkflowAgentNodeRunExecutionOwnershipInput,
   ConfirmWorkflowRunExecutionOwnershipInput,
   CreateWorkflowAgentNodeRunInput,
+  ExecutionStorage,
   FinishWorkflowAgentNodeRunInput,
   FinishWorkflowNodeRunInput,
   FinishWorkflowRunInput,
@@ -33,7 +39,11 @@ import type {
   WorkflowRunRecord,
   WorkflowRunStorage,
 } from "@sixb/core/storage"
-import { WorkflowRunError } from "@sixb/core/storage"
+import {
+  AGENT_RUN_FAILURE_CODES,
+  WORKFLOW_RUN_FAILURE_CODES,
+  WorkflowRunError,
+} from "@sixb/core/storage"
 import { queryLatestRunsByOwnerId } from "./latest-run-query"
 import { installFreshSqliteSchema } from "./migrations"
 import {
@@ -50,6 +60,8 @@ import {
 } from "./transactions"
 
 export interface SqliteWorkflowRunStorageOptions {
+  /** 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. */
@@ -62,21 +74,30 @@ export class SqliteWorkflowRunStorage implements WorkflowRunStorage {
 
   private readonly connection: SqliteStoreConnection
   private readonly db: Database
+  private readonly executions: ExecutionStorage
 
-  constructor(options: SqliteWorkflowRunStorageOptions = {}) {
+  constructor(options: SqliteWorkflowRunStorageOptions) {
     this.connection = openSqliteStoreConnection(options)
     this.db = this.connection.db
+    this.executions = options.executions
 
     if (this.connection.installFreshSchema) {
       installFreshSqliteSchema(this.db)
     }
 
     this.nodes = new SqliteWorkflowNodeRunStorage(this.db)
-    this.agentNodes = new SqliteWorkflowAgentNodeRunStorage(this.db)
+    this.agentNodes = new SqliteWorkflowAgentNodeRunStorage(this.db, this.executions)
   }
 
   async queue(input: QueueWorkflowRunInput): Promise<WorkflowRunRecord> {
     const queuedAt = input.queuedAt ?? new Date()
+    await assertWorkflowRunExecution({
+      executions: this.executions,
+      projectId: input.projectId,
+      executionId: input.executionId,
+      runId: input.id,
+      workflowId: input.workflowId,
+    })
 
     try {
       this.db
@@ -85,35 +106,33 @@ export class SqliteWorkflowRunStorage implements WorkflowRunStorage {
           INSERT INTO workflow_runs (
             project_id,
             id,
+            execution_id,
             workflow_id,
             status,
             input,
             queued_at,
             started_at,
-            source,
-            requested_by_principal_type,
-            requested_by_principal_id,
+            requester_group_ids,
             attempt
-          ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+          ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
         `
         )
         .run(
           input.projectId,
           input.id,
+          input.executionId,
           input.workflowId,
           "queued",
           serializeRecord(input.input),
           queuedAt.toISOString(),
           queuedAt.toISOString(),
-          input.source ? JSON.stringify(input.source) : null,
-          input.requestedByPrincipal?.type ?? "system",
-          input.requestedByPrincipal?.id ?? "system",
+          JSON.stringify(normalizeRequesterGroupIds(input.requesterGroupIds)),
           0
         )
     } catch (error) {
       if (isUniqueConstraintError(error)) {
         throw new WorkflowRunError(
-          `[SixbSqlite] Workflow run '${input.id}' already exists for project '${input.projectId}'.`
+          `[SixbSqlite] Workflow run '${input.id}' or execution '${input.executionId}' is already linked for project '${input.projectId}'.`
         )
       }
 
@@ -131,92 +150,36 @@ export class SqliteWorkflowRunStorage implements WorkflowRunStorage {
         .query("SELECT * FROM workflow_runs WHERE project_id = ? AND id = ?")
         .get(input.projectId, input.id) as WorkflowRunDatabaseRow | null
 
-      if (existing) {
-        if (existing.status !== "queued") {
-          throw new WorkflowRunError(
-            `[SixbSqlite] Workflow run '${input.id}' already exists for project '${input.projectId}'.`
-          )
-        }
-
-        if (existing.workflow_id !== input.workflowId) {
-          throw new WorkflowRunError(
-            `[SixbSqlite] Workflow run '${input.id}' workflow '${input.workflowId}' does not match existing workflow '${existing.workflow_id}'.`
-          )
-        }
-
-        this.db
-          .query(
-            `
-            UPDATE workflow_runs
-            SET
-              status = ?,
-              input = ?,
-              started_at = ?,
-              finished_at = NULL,
-              error = NULL,
-              source = COALESCE(source, ?)
-              , attempt = attempt + 1,
-              execution_token = ?, execution_queue_lease_expires_at = ?
-            WHERE project_id = ? AND id = ?
-          `
-          )
-          .run(
-            "running",
-            serializeRecord(input.input),
-            startedAt.toISOString(),
-            input.source ? JSON.stringify(input.source) : null,
-            input.execution?.token ?? null,
-            input.execution?.queueLeaseExpiresAt.toISOString() ?? null,
-            input.projectId,
-            input.id
-          )
-
-        return this.requireWorkflowRun(input.projectId, input.id)
+      if (!existing || existing.status !== "queued") {
+        throw new WorkflowRunError(
+          existing
+            ? `[SixbSqlite] Workflow run '${input.id}' cannot start from status '${existing.status}'.`
+            : `[SixbSqlite] Workflow run '${input.id}' not found for project '${input.projectId}'.`
+        )
       }
 
-      try {
-        this.db
-          .query(
-            `
-            INSERT INTO workflow_runs (
-              project_id,
-              id,
-              workflow_id,
-              status,
-              input,
-              started_at,
-              source,
-              requested_by_principal_type,
-              requested_by_principal_id,
-              attempt,
-              execution_token,
-              execution_queue_lease_expires_at
-            ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+      this.db
+        .query(
           `
-          )
-          .run(
-            input.projectId,
-            input.id,
-            input.workflowId,
-            "running",
-            serializeRecord(input.input),
-            startedAt.toISOString(),
-            input.source ? JSON.stringify(input.source) : null,
-            input.requestedByPrincipal?.type ?? "system",
-            input.requestedByPrincipal?.id ?? "system",
-            1,
-            input.execution?.token ?? null,
-            input.execution?.queueLeaseExpiresAt.toISOString() ?? null
-          )
-      } catch (error) {
-        if (isUniqueConstraintError(error)) {
-          throw new WorkflowRunError(
-            `[SixbSqlite] Workflow run '${input.id}' already exists for project '${input.projectId}'.`
-          )
-        }
-
-        throw error
-      }
+          UPDATE workflow_runs
+          SET
+            status = ?,
+            started_at = ?,
+            finished_at = NULL,
+            error = NULL,
+            attempt = attempt + 1,
+            execution_token = ?, execution_queue_lease_expires_at = ?
+          WHERE project_id = ? AND id = ?
+        `
+        )
+        .run(
+          "running",
+          startedAt.toISOString(),
+          input.execution?.token ?? null,
+          input.execution?.queueLeaseExpiresAt.toISOString() ?? null,
+          input.projectId,
+          input.id
+        )
 
       return this.requireWorkflowRun(input.projectId, input.id)
     })()
@@ -301,7 +264,9 @@ export class SqliteWorkflowRunStorage implements WorkflowRunStorage {
           input.status,
           (input.finishedAt ?? new Date()).toISOString(),
           input.status === "succeeded" ? serializeRecord(input.output) : null,
-          input.status === "succeeded" ? null : (input.error ?? null),
+          input.status === "succeeded" || input.error === undefined
+            ? null
+            : serializeSixbFailure(input.error, WORKFLOW_RUN_FAILURE_CODES),
           input.projectId,
           input.id
         )
@@ -496,19 +461,51 @@ export class SqliteWorkflowRunStorage implements WorkflowRunStorage {
 }
 
 export class SqliteWorkflowAgentNodeRunStorage implements WorkflowAgentNodeRunStorage {
-  constructor(private readonly db: Database) {}
+  constructor(
+    private readonly db: Database,
+    private readonly executions: ExecutionStorage
+  ) {}
 
   async create(input: CreateWorkflowAgentNodeRunInput): Promise<WorkflowAgentNodeRunRecord> {
+    const parent = this.db
+      .query(
+        `
+        SELECT workflow_runs.execution_id
+        FROM workflow_node_runs
+        JOIN workflow_runs
+          ON workflow_runs.project_id = workflow_node_runs.project_id
+          AND workflow_runs.id = workflow_node_runs.workflow_run_id
+        WHERE workflow_node_runs.project_id = ?
+          AND workflow_node_runs.id = ?
+          AND workflow_node_runs.node_type = 'agent'
+      `
+      )
+      .get(input.projectId, input.nodeRunId) as { execution_id: string } | null
+    if (!parent) {
+      throw new WorkflowRunError(
+        `[SixbSqlite] Agent workflow node run '${input.nodeRunId}' was not found.`
+      )
+    }
+    await assertWorkflowAgentNodeRunExecution({
+      executions: this.executions,
+      projectId: input.projectId,
+      executionId: input.executionId,
+      nodeRunId: input.nodeRunId,
+      agentId: input.agentId,
+      workflowExecutionId: parent.execution_id,
+    })
+
     try {
       this.db
         .query(`
           INSERT INTO workflow_agent_node_runs (
-            project_id, node_run_id, agent_id, status, prompt, attempt, created_at
-          ) VALUES (?, ?, ?, ?, ?, ?, ?)
+            project_id, node_run_id, execution_id, agent_id, status, prompt, attempt, created_at
+          ) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
         `)
         .run(
           input.projectId,
           input.nodeRunId,
+          input.executionId,
           input.agentId,
           "queued",
           input.prompt,
@@ -532,14 +529,12 @@ export class SqliteWorkflowAgentNodeRunStorage implements WorkflowAgentNodeRunSt
       this.db
         .query(`
         UPDATE workflow_agent_node_runs SET
-          status = ?, execution_principal_type = ?, execution_principal_id = ?, model_id = ?,
-          attempt = 1, execution_token = ?, execution_queue_lease_expires_at = ?, started_at = ?
+          status = ?, model_id = ?, attempt = 1, execution_token = ?,
+          execution_queue_lease_expires_at = ?, started_at = ?
         WHERE project_id = ? AND node_run_id = ?
       `)
         .run(
           "running",
-          input.executionPrincipal?.type ?? null,
-          input.executionPrincipal?.id ?? null,
           input.modelId ?? null,
           input.execution.token,
           input.execution.queueLeaseExpiresAt.toISOString(),
@@ -601,7 +596,7 @@ export class SqliteWorkflowAgentNodeRunStorage implements WorkflowAgentNodeRunSt
       this.db
         .query(`
         UPDATE workflow_agent_node_runs SET
-          status = ?, model_id = COALESCE(?, model_id), finish_reason = ?, usage = ?, trace = ?,
+          status = ?, model_id = COALESCE(?, model_id), finish_reason = ?, trace = ?,
           diagnostics = ?, error = ?, execution_token = NULL,
           execution_queue_lease_expires_at = NULL, completed_at = ?
         WHERE project_id = ? AND node_run_id = ?
@@ -610,10 +605,11 @@ export class SqliteWorkflowAgentNodeRunStorage implements WorkflowAgentNodeRunSt
           input.status,
           input.modelId ?? null,
           input.finishReason ?? null,
-          input.usage ? JSON.stringify(input.usage) : null,
           input.trace ? JSON.stringify(input.trace) : null,
           input.diagnostics ? JSON.stringify(input.diagnostics) : null,
-          input.status === "succeeded" ? null : (input.error ?? null),
+          input.status === "succeeded" || input.error === undefined
+            ? null
+            : serializeSixbFailure(input.error, AGENT_RUN_FAILURE_CODES),
           (input.completedAt ?? new Date()).toISOString(),
           input.projectId,
           input.nodeRunId
@@ -638,7 +634,9 @@ export class SqliteWorkflowAgentNodeRunStorage implements WorkflowAgentNodeRunSt
         )
         .run(
           "cancelled",
-          input.error ?? null,
+          input.error === undefined
+            ? null
+            : serializeSixbFailure(input.error, AGENT_RUN_FAILURE_CODES),
           (input.completedAt ?? new Date()).toISOString(),
           input.projectId,
           input.nodeRunId
@@ -835,7 +833,9 @@ export class SqliteWorkflowNodeRunStorage implements WorkflowNodeRunStorage {
           input.status,
           (input.finishedAt ?? new Date()).toISOString(),
           input.status === "succeeded" && input.output ? serializeRecord(input.output) : null,
-          input.status === "succeeded" ? null : (input.error ?? null),
+          input.status === "succeeded" || input.error === undefined
+            ? null
+            : serializeSixbFailure(input.error, WORKFLOW_RUN_FAILURE_CODES),
           input.projectId,
           input.id
         )
@@ -974,6 +974,7 @@ function rowToWorkflowRunRecord(row: WorkflowRunDatabaseRow): WorkflowRunRecord
   return {
     id: row.id,
     projectId: row.project_id,
+    executionId: row.execution_id,
     workflowId: row.workflow_id,
     status: row.status,
     input: parseRecord(row.input),
@@ -981,12 +982,8 @@ function rowToWorkflowRunRecord(row: WorkflowRunDatabaseRow): WorkflowRunRecord
     queuedAt: row.queued_at ? new Date(row.queued_at) : undefined,
     startedAt: new Date(row.started_at),
     finishedAt: row.finished_at ? new Date(row.finished_at) : undefined,
-    error: row.error ?? undefined,
-    source: row.source ? (JSON.parse(row.source) as WorkflowRunSource) : undefined,
-    requestedByPrincipal: {
-      type: row.requested_by_principal_type,
-      id: row.requested_by_principal_id,
-    },
+    error: row.error === null ? undefined : parseSixbFailure(row.error, WORKFLOW_RUN_FAILURE_CODES),
+    requesterGroupIds: JSON.parse(row.requester_group_ids) as string[],
     attempt: row.attempt,
     ...(row.execution_token && row.execution_queue_lease_expires_at
       ? {
@@ -1014,7 +1011,7 @@ function rowToWorkflowNodeRunRecord(row: WorkflowNodeRunDatabaseRow): WorkflowNo
     startedAt: new Date(row.started_at),
     finishedAt: row.finished_at ? new Date(row.finished_at) : undefined,
     output: row.output ? parseRecord(row.output) : undefined,
-    error: row.error ?? undefined,
+    error: row.error === null ? undefined : parseSixbFailure(row.error, WORKFLOW_RUN_FAILURE_CODES),
   }
 }
 
@@ -1040,6 +1037,7 @@ function canFinishWorkflowRun(
 interface WorkflowRunDatabaseRow {
   project_id: string
   id: string
+  execution_id: string
   workflow_id: string
   status: WorkflowRunRecord["status"]
   input: string
@@ -1048,9 +1046,7 @@ interface WorkflowRunDatabaseRow {
   started_at: string
   finished_at: string | null
   error: string | null
-  source: string | null
-  requested_by_principal_type: Principal["type"]
-  requested_by_principal_id: string
+  requester_group_ids: string
   attempt: number
   execution_token: string | null
   execution_queue_lease_expires_at: string | null
@@ -1076,14 +1072,12 @@ interface WorkflowNodeRunDatabaseRow {
 interface WorkflowAgentNodeRunDatabaseRow {
   project_id: string
   node_run_id: string
+  execution_id: string
   agent_id: string
   status: WorkflowAgentNodeRunRecord["status"]
   prompt: string
-  execution_principal_type: "serviceAccount" | null
-  execution_principal_id: string | null
   model_id: string | null
   finish_reason: WorkflowAgentNodeRunRecord["finishReason"] | null
-  usage: string | null
   trace: string | null
   diagnostics: string | null
   error: string | null
@@ -1112,23 +1106,15 @@ function rowToWorkflowAgentNodeRunRecord(
   return {
     projectId: row.project_id,
     nodeRunId: row.node_run_id,
+    executionId: row.execution_id,
     agentId: row.agent_id,
     status: row.status,
     prompt: row.prompt,
-    ...(row.execution_principal_type && row.execution_principal_id
-      ? {
-          executionPrincipal: {
-            type: row.execution_principal_type,
-            id: row.execution_principal_id,
-          },
-        }
-      : {}),
     ...(row.model_id ? { modelId: row.model_id } : {}),
     ...(row.finish_reason ? { finishReason: row.finish_reason } : {}),
-    ...(row.usage ? { usage: JSON.parse(row.usage) } : {}),
     ...(row.trace ? { trace: JSON.parse(row.trace) } : {}),
     ...(row.diagnostics ? { diagnostics: JSON.parse(row.diagnostics) } : {}),
-    ...(row.error ? { error: row.error } : {}),
+    ...(row.error ? { error: parseSixbFailure(row.error, AGENT_RUN_FAILURE_CODES) } : {}),
     attempt: row.attempt,
     ...(row.execution_token && row.execution_queue_lease_expires_at
       ? {

package/dist/validation.d.ts

@@ -1,5 +0,0 @@
-export declare function assertProjectionRunFieldNonEmpty(value: string, fieldName: string): void;
-export declare function assertProjectionRunCounter(value: number, fieldName: string): void;
-export declare function assertOptionalProjectionRunCounter(value: number | undefined, fieldName: string): void;
-export declare function assertProjectionRunListWindowValue(value: number, fieldName: string): void;
-//# sourceMappingURL=validation.d.ts.map

package/dist/validation.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../src/validation.ts"],"names":[],"mappings":"AAEA,wBAAgB,gCAAgC,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAIvF;AAED,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAMjF;AAED,wBAAgB,kCAAkC,CAChD,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,SAAS,EAAE,MAAM,GAChB,IAAI,CAIN;AAED,wBAAgB,kCAAkC,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAIzF"}

package/dist/webhook-delivery-storage.d.ts

@@ -1,27 +0,0 @@
-import type { WebhookDeliveryClaimRecord, WebhookDeliveryKey, WebhookDeliveryRecord, WebhookDeliveryStorage } from "@sixb/core/storage";
-import { type SqliteStoreConnection } from "./transactions";
-export interface SqliteWebhookDeliveryStorageOptions {
-    /** Path to SQLite database file. Defaults to ':memory:' for in-memory database. */
-    path?: string;
-    /** Internal shared connection used by bundled SqliteStorage. */
-    connection?: SqliteStoreConnection;
-}
-export declare class SqliteWebhookDeliveryStorage implements WebhookDeliveryStorage {
-    private readonly connection;
-    private readonly db;
-    constructor(options?: SqliteWebhookDeliveryStorageOptions);
-    claim(input: WebhookDeliveryKey & {
-        receivedAt: string;
-    }): Promise<WebhookDeliveryClaimRecord>;
-    complete(input: WebhookDeliveryKey & {
-        completedAt: string;
-    }): Promise<WebhookDeliveryRecord>;
-    fail(input: WebhookDeliveryKey & {
-        failedAt: string;
-        error: string;
-    }): Promise<WebhookDeliveryRecord>;
-    close(): void;
-    private getDeliveryRecord;
-    private requireDeliveryRecord;
-}
-//# sourceMappingURL=webhook-delivery-storage.d.ts.map

package/dist/webhook-delivery-storage.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"webhook-delivery-storage.d.ts","sourceRoot":"","sources":["../src/webhook-delivery-storage.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,0BAA0B,EAE1B,kBAAkB,EAClB,qBAAqB,EACrB,sBAAsB,EACvB,MAAM,oBAAoB,CAAA;AAE3B,OAAO,EAGL,KAAK,qBAAqB,EAC3B,MAAM,gBAAgB,CAAA;AAEvB,MAAM,WAAW,mCAAmC;IAClD,mFAAmF;IACnF,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,gEAAgE;IAChE,UAAU,CAAC,EAAE,qBAAqB,CAAA;CACnC;AAED,qBAAa,4BAA6B,YAAW,sBAAsB;IACzE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAuB;IAClD,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAU;gBAEjB,OAAO,GAAE,mCAAwC;IASvD,KAAK,CACT,KAAK,EAAE,kBAAkB,GAAG;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,GACjD,OAAO,CAAC,0BAA0B,CAAC;IAyFhC,QAAQ,CACZ,KAAK,EAAE,kBAAkB,GAAG;QAAE,WAAW,EAAE,MAAM,CAAA;KAAE,GAClD,OAAO,CAAC,qBAAqB,CAAC;IA0B3B,IAAI,CACR,KAAK,EAAE,kBAAkB,GAAG;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAC9D,OAAO,CAAC,qBAAqB,CAAC;IA0BjC,KAAK,IAAI,IAAI;IAIb,OAAO,CAAC,iBAAiB;IA+BzB,OAAO,CAAC,qBAAqB;CAc9B"}

package/src/validation.ts

@@ -1,30 +0,0 @@
-import { ProjectionRunError } from "@sixb/core/storage"
-
-export function assertProjectionRunFieldNonEmpty(value: string, fieldName: string): void {
-  if (value.trim().length === 0) {
-    throw new ProjectionRunError(`[SixbSqlite] Projection run ${fieldName} must not be empty.`)
-  }
-}
-
-export function assertProjectionRunCounter(value: number, fieldName: string): void {
-  if (!Number.isInteger(value) || value < 0) {
-    throw new ProjectionRunError(
-      `[SixbSqlite] Projection run ${fieldName} must be a non-negative integer.`
-    )
-  }
-}
-
-export function assertOptionalProjectionRunCounter(
-  value: number | undefined,
-  fieldName: string
-): void {
-  if (value !== undefined) {
-    assertProjectionRunCounter(value, fieldName)
-  }
-}
-
-export function assertProjectionRunListWindowValue(value: number, fieldName: string): void {
-  if (!Number.isInteger(value) || value < 0) {
-    throw new ProjectionRunError(`[SixbSqlite] Projection run list ${fieldName} must be >= 0.`)
-  }
-}