@sixb/sqlite 0.1.15 → 0.1.17

package/src/ontology-storage/shared.ts

@@ -2,6 +2,7 @@ import type { Database } from "bun:sqlite"
 import { parseSixbFailure } from "@sixb/core/internal/errors"
 import { MaterializationConflictError } from "@sixb/core/internal/materialization"
 import {
+  type ClaimedOutboxDraft,
   sourceAssertionFromColumns,
   sourceEntityFromKey,
 } from "@sixb/core/internal/ontology-storage-provider"
@@ -9,7 +10,6 @@ import type {
   AssertSourceMaterializationExecutionInput,
   OntologyCommitRecord,
   OntologyCommitWrite,
-  OntologyOutboxRecord,
   OntologySourceRecord,
   StageSourceAssertion,
 } from "@sixb/core/storage"
@@ -40,8 +40,6 @@ export interface SqliteOntologyCommitRow {
   readonly origin_run_id: string | null
   readonly origin_batch_ordinal: number | null
   readonly origin: string
-  readonly requested_by: string | null
-  readonly executor: string
   readonly ontology_revision: string
   readonly projection_revision: string | null
   readonly ownership_hash: string | null
@@ -102,7 +100,10 @@ export interface SqliteStoredOverrideRow {
 }
 
 export interface SqliteOntologyOutboxRow {
-  readonly envelope: string
+  readonly id: string
+  readonly commit_id: string
+  readonly commit_ordinal: number
+  readonly event: string
   readonly available_at: string
   readonly attempts: number
   readonly lease_id: string | null
@@ -172,12 +173,6 @@ export function commitRecord(row: SqliteOntologyCommitRow): OntologyCommitRecord
     requestHash: row.request_hash,
     executionId: row.execution_id,
     origin: parseJson<OntologyCommitWrite["origin"]>(row.origin),
-    ...(row.requested_by === null
-      ? {}
-      : {
-          requestedBy: parseJson<NonNullable<OntologyCommitWrite["requestedBy"]>>(row.requested_by),
-        }),
-    executor: parseJson<OntologyCommitWrite["executor"]>(row.executor),
     ontologyRevision: row.ontology_revision,
     ...(row.projection_revision === null ? {} : { projectionRevision: row.projection_revision }),
     ...(row.ownership_hash === null ? {} : { ownershipHash: row.ownership_hash }),
@@ -188,9 +183,19 @@ export function commitRecord(row: SqliteOntologyCommitRow): OntologyCommitRecord
   return { ...base, intent, result } as OntologyCommitRecord
 }
 
-export function outboxRecord(row: SqliteOntologyOutboxRow): OntologyOutboxRecord {
+/** A claimed row as stored: its draft, to rebuild from its commit. */
+export function claimedOutboxDraft(row: SqliteOntologyOutboxRow): ClaimedOutboxDraft {
+  if (row.lease_id === null || row.lease_expires_at === null) {
+    throw new MaterializationConflictError(
+      "outbox-lease",
+      "Ontology outbox claim returned an unpaired lease."
+    )
+  }
   return {
-    envelope: parseJson<OntologyOutboxRecord["envelope"]>(row.envelope),
+    id: row.id,
+    commitId: row.commit_id,
+    commitOrdinal: row.commit_ordinal,
+    event: parseJson<ClaimedOutboxDraft["event"]>(row.event),
     availableAt: row.available_at,
     attempts: row.attempts,
     leaseId: row.lease_id,

package/src/ontology-storage/source-cleanup.ts

@@ -5,6 +5,14 @@ import type {
   PurgeAbandonedSourceMaterializationsInput,
 } from "@sixb/core/storage"
 
+/**
+ * A version outlives its replacement plan, which references it: the next version may take a
+ * deleted one's id, and would then resume the plan left under it.
+ */
+const PLAN_PURGED = `NOT EXISTS (
+  SELECT 1 FROM ontology_replacement_plans AS plans WHERE plans.version_id = versions.version_id
+)`
+
 /**
  * Superseded versions can still hold live roots (a delta keeps unchanged roots where they were),
  * so they are cleaned root by root once retired. An abandoned candidate was never published:
@@ -18,8 +26,8 @@ export function purgeAbandonedSourceVersions(
   let rowsDeleted = 0
   let materializationsDeleted = 0
   const nextCandidate = db.query(`
-    SELECT version_id FROM ontology_sources
-    WHERE project_id = ? AND status = 'abandoned'
+    SELECT version_id FROM ontology_sources AS versions
+    WHERE project_id = ? AND status = 'abandoned' AND ${PLAN_PURGED}
     ORDER BY terminal_at, source_id, materialization_id LIMIT 1
   `)
   const deleteRows = db.query(`DELETE FROM ontology_source_rows WHERE rowid IN (
@@ -75,10 +83,18 @@ export function cleanupSourceVersions(
       WHERE ${retired}
         AND NOT EXISTS (SELECT 1 FROM ontology_source_rows AS rows WHERE rows.root_id = roots.id)
       ORDER BY roots.retired_at, roots.id LIMIT ?
-    )`)
-      .run(input.projectId, input.terminalBefore, remaining).changes
-    rowsDeleted += removed
-    remaining -= removed
+    ) RETURNING version_id`)
+      .all(input.projectId, input.terminalBefore, remaining) as { readonly version_id: number }[]
+    // Each version's root_count follows its roots down, so a drained version is found by index.
+    const counts = new Map<number, number>()
+    for (const root of removed) counts.set(root.version_id, (counts.get(root.version_id) ?? 0) + 1)
+    const drain = db.query(
+      "UPDATE ontology_sources SET root_count = root_count - ? WHERE version_id = ?"
+    )
+    // These commit with the delete: every ontology storage call runs in the caller's BEGIN IMMEDIATE.
+    for (const [versionId, count] of counts) drain.run(count, versionId)
+    rowsDeleted += removed.length
+    remaining -= removed.length
   }
   const materializationsDeleted =
     remaining === 0
@@ -86,9 +102,8 @@ export function cleanupSourceVersions(
       : db
           .query(`DELETE FROM ontology_sources WHERE version_id IN (
     SELECT versions.version_id FROM ontology_sources AS versions
-    WHERE project_id = ? AND status = 'superseded' AND terminal_at < ?
-      AND NOT EXISTS (SELECT 1 FROM ontology_source_roots AS roots
-        WHERE roots.version_id = versions.version_id)
+    WHERE project_id = ? AND status = 'superseded' AND root_count = 0 AND terminal_at < ?
+      AND ${PLAN_PURGED}
     ORDER BY terminal_at, source_id, materialization_id LIMIT ?
   )`)
           .run(input.projectId, input.terminalBefore, remaining).changes

package/src/ontology-storage/source-roots.ts

@@ -22,7 +22,7 @@ import { canonicalJson, type SqliteOntologySourceRow } from "./shared"
  * version; the candidate's own roots are never rewritten. One live root per source and key holds
  * because activation, under the source fence, retires every root the candidate replaces.
  */
-const PUBLISHED = "('active', 'superseded')"
+export const PUBLISHED = "('active', 'superseded')"
 
 /** The columns `sourceAssertion` reads, over `versions`, `roots` and `rows`. */
 export const SOURCE_ASSERTION_COLUMNS = `versions.source_id, versions.materialization_id,
@@ -162,10 +162,14 @@ export function stageSourceRoots(
   }
 }
 
-/** Retires what the candidate replaces; its own roots go live when its version turns active. */
+/**
+ * Retires what the candidate replaces; its own roots go live when its version turns active. Every
+ * link those roots assert changes its live source, which commit `commitId` records as touched.
+ */
 export function activateSourceRoots(
   db: Database,
   projectId: string,
+  commitId: string,
   candidate: SqliteOntologySourceRow,
   activation: SourceActivationWrite
 ): void {
@@ -180,20 +184,40 @@ export function activateSourceRoots(
     )
   if (candidate.base_materialization_id !== null && candidate.root_count === 0) return
   const delta = candidate.base_materialization_id !== null
-  db.query(`UPDATE ontology_source_roots SET retired_at = ?
-    WHERE retired_at IS NULL AND deleted = 0
-      AND version_id IN (SELECT version_id FROM ontology_sources
-        WHERE project_id = ? AND source_id = ? AND status IN ${PUBLISHED})
-      ${
-        delta
-          ? `AND project_id = ? AND root_key IN (
-        SELECT root_key FROM ontology_source_roots WHERE version_id = ?)`
-          : ""
-      }`).run(
-    activation.updatedAt,
+  const replaced = `retired_at IS NULL AND deleted = 0
+    AND version_id IN (SELECT version_id FROM ontology_sources
+      WHERE project_id = ? AND source_id = ? AND status IN ${PUBLISHED})
+    ${
+      delta
+        ? `AND project_id = ? AND root_key IN (
+      SELECT root_key FROM ontology_source_roots WHERE version_id = ?)`
+        : ""
+    }`
+  const replacedParams = [
     projectId,
     activation.source.projectionId,
-    ...(delta ? [projectId, candidate.version_id] : [])
+    ...(delta ? [projectId, candidate.version_id] : []),
+  ]
+  db.query(`INSERT INTO ontology_commit_touches (project_id, commit_id, entity_kind, identity_key)
+    SELECT DISTINCT ?, ?, 'link', json_array(
+      rows.source_type_id, rows.source_primary_id, rows.link_id, rows.target_type_id,
+      rows.target_primary_id
+    )
+    FROM (
+      SELECT id FROM ontology_source_roots WHERE ${replaced}
+      UNION ALL
+      SELECT id FROM ontology_source_roots WHERE version_id = ?
+    ) AS changed
+    CROSS JOIN ontology_source_rows AS rows ON rows.root_id = changed.id
+    WHERE rows.entity_kind = 'link'`).run(
+    projectId,
+    commitId,
+    ...replacedParams,
+    candidate.version_id
+  )
+  db.query(`UPDATE ontology_source_roots SET retired_at = ? WHERE ${replaced}`).run(
+    activation.updatedAt,
+    ...replacedParams
   )
   // Deletions are never live; retiring them lets cleanup remove them with their version.
   db.query(`UPDATE ontology_source_roots SET retired_at = ?

package/src/ontology-storage/sources.ts

@@ -33,8 +33,6 @@ import type {
   PurgeAbandonedSourceMaterializationsInput,
   StageSourceRowsInput,
   StageSourceRowsResult,
-  SummarizeTerminalSourceMaterializationsInput,
-  TerminalSourceMaterializationSummary,
 } from "@sixb/core/storage"
 import { yieldSqliteEventLoop } from "../transactions"
 import {
@@ -317,30 +315,6 @@ export class SqliteOntologySourceStorage implements OntologySourceStorage {
     })
   }
 
-  async summarizeTerminal(
-    input: SummarizeTerminalSourceMaterializationsInput
-  ): Promise<TerminalSourceMaterializationSummary> {
-    return this.runRootOperation(() => {
-      assertNonblank(input.projectId, "Terminal source summary project id")
-      const summary = this.db
-        .query(
-          `
-            SELECT COUNT(*) AS terminal_count, MIN(terminal_at) AS oldest_terminal_at
-            FROM ontology_sources
-            WHERE project_id = ? AND status IN ('superseded', 'abandoned')
-          `
-        )
-        .get(input.projectId) as {
-        readonly terminal_count: number
-        readonly oldest_terminal_at: string | null
-      }
-      return {
-        count: summary.terminal_count,
-        oldestTerminalAt: summary.oldest_terminal_at,
-      }
-    })
-  }
-
   private abandonCandidate(
     input: AbandonSourceMaterializationCandidateInput
   ): OntologySourceRecord {

package/src/projection-run-storage.ts

@@ -396,7 +396,7 @@ export class SqliteProjectionRunStorage implements ProjectionRunStorage {
   async list(input: ListProjectionRunsInput): Promise<ListProjectionRunsResult> {
     assertProjectionRunNonEmpty(input.projectId, "projectId")
 
-    if (input.statuses && input.statuses.length === 0) {
+    if (input.statuses?.length === 0 || input.errorCodes?.length === 0) {
       return { runs: [], hasMore: false, total: 0 }
     }
 
@@ -435,6 +435,12 @@ export class SqliteProjectionRunStorage implements ProjectionRunStorage {
       whereClauses.push(`status IN (${input.statuses.map(() => "?").join(", ")})`)
       args.push(...input.statuses)
     }
+    if (input.errorCodes) {
+      whereClauses.push(
+        `json_extract(error, '$.code') IN (${input.errorCodes.map(() => "?").join(", ")})`
+      )
+      args.push(...input.errorCodes)
+    }
     if (input.startedAfter) {
       whereClauses.push("COALESCE(started_at, queued_at) >= ?")
       args.push(input.startedAfter.toISOString())

package/src/rules-storage.ts

@@ -175,28 +175,23 @@ export class SqliteRulesStorage implements RulesStorage {
     input: ListRuleStatesReconciliationPageInput
   ): Promise<ListRuleStatesReconciliationPageResult> {
     assertPositiveLimit(input.limit)
+    const { after } = input
+    const cursor = after ? [after.ruleId, after.objectTypeId, after.primaryId] : []
+    // The cursor and order follow the primary key column for column so each page seeks to its
+    // start. `subject_kind` is always 'object' (CHECK); filtering on it steers SQLite onto
+    // idx_rule_states_project_rule and a full sort per page.
     const rows = this.db
       .query(
         `
           SELECT project_id, rule_id, subject_kind, object_type_id, primary_id, triggered_at
           FROM rule_states
-          WHERE project_id = ? AND subject_kind = 'object'
-            AND (
-              ? IS NULL OR
-              (rule_id, object_type_id, primary_id) > (?, ?, ?)
-            )
-          ORDER BY rule_id ASC, object_type_id ASC, primary_id ASC
+          WHERE project_id = ?
+            ${cursor.length > 0 ? "AND (rule_id, subject_kind, object_type_id, primary_id) > (?, 'object', ?, ?)" : ""}
+          ORDER BY rule_id ASC, subject_kind ASC, object_type_id ASC, primary_id ASC
           LIMIT ?
         `
       )
-      .all(
-        input.projectId,
-        input.after?.ruleId ?? null,
-        input.after?.ruleId ?? null,
-        input.after?.objectTypeId ?? null,
-        input.after?.primaryId ?? null,
-        input.limit + 1
-      ) as SqliteRuleStateRow[]
+      .all(input.projectId, ...cursor, input.limit + 1) as SqliteRuleStateRow[]
     return reconciliationPage(rows, input.limit)
   }
 

package/src/testing.ts

@@ -1,16 +1,18 @@
+import type { Database } from "bun:sqlite"
+
 export interface SqliteStorageTestingAdapter {
   advanceConnectorConnectionTime(durationMs: number): void
+  /** The store's write connection, for tests that inspect tables no public read exposes. */
+  readonly db: Database
 }
 
 const adapters = new WeakMap<object, SqliteStorageTestingAdapter>()
 
 export function registerSqliteStorageTestingAdapter(
   storage: object,
-  advanceConnectorConnectionTime: (durationMs: number) => void
+  adapter: SqliteStorageTestingAdapter
 ): void {
-  adapters.set(storage, {
-    advanceConnectorConnectionTime,
-  })
+  adapters.set(storage, adapter)
 }
 
 export function getSqliteStorageTestingAdapter(storage: object): SqliteStorageTestingAdapter {