@sixb/core 0.1.15 → 0.1.17

package/src/storage/ontology/materializations.ts

@@ -20,7 +20,7 @@ import type {
   TelemetrySeriesRef,
 } from "../../materialization/model"
 import type { OntologyCommitRecord, OntologyCommitWrite } from "./commits"
-import type { OntologyMaterializationEventDraft, OntologyOutboxWrite } from "./outbox"
+import type { OntologyMaterializationEventDraft } from "./outbox"
 import type { StoredSourceLinkAssertion, StoredSourceObjectAssertion } from "./sources"
 
 export interface StoredObjectOverride {
@@ -112,11 +112,6 @@ export interface SourceReplacementLinkState extends Omit<MaterializationLinkStat
   readonly diffRequired: boolean
 }
 
-export interface SourceReplacementStatePage {
-  readonly objects: readonly SourceReplacementObjectState[]
-  readonly links: readonly SourceReplacementLinkState[]
-}
-
 export interface MaterializationStateRequestChunk {
   readonly objects: readonly OntologyObjectRef[]
   readonly links: readonly OntologyLinkRef[]
@@ -162,6 +157,14 @@ export interface MaterializationPlanHeader {
    */
   readonly commit: OntologyCommitWrite
   readonly expected: MaterializationCasState
+  /**
+   * A projection commit applies the durable plan of this candidate, refreshed in the same
+   * transaction, instead of work staged on the session.
+   */
+  readonly plan?: {
+    readonly source: ProjectionSourceRef
+    readonly materializationId: string
+  }
 }
 
 export interface ExactObjectOverrideWrite {
@@ -204,23 +207,6 @@ export interface ExactLinkSlotOverrideDelete {
   readonly expectedLastCommitId: string
 }
 
-export interface ExactOverrideWrites {
-  readonly objects: {
-    readonly upserts: readonly ExactObjectOverrideWrite[]
-    readonly deletes: readonly ExactObjectOverrideDelete[]
-  }
-  readonly links: {
-    readonly edges: {
-      readonly upserts: readonly ExactLinkOverrideWrite[]
-      readonly deletes: readonly ExactLinkOverrideDelete[]
-    }
-    readonly slots: {
-      readonly upserts: readonly ExactLinkSlotOverrideWrite[]
-      readonly deletes: readonly ExactLinkSlotOverrideDelete[]
-    }
-  }
-}
-
 export interface ExactEffectiveObjectWrite {
   readonly row: EffectiveObjectSnapshot
   readonly expected: ExpectedObjectRevision
@@ -241,29 +227,11 @@ export interface ExactEffectiveLinkDelete {
   readonly expected: Extract<ExpectedLinkRevision, { readonly exists: true }>
 }
 
-export interface ExactEffectiveWrites {
-  readonly objectUpserts: readonly ExactEffectiveObjectWrite[]
-  readonly objectDeletes: readonly ExactEffectiveObjectDelete[]
-  readonly linkUpserts: readonly ExactEffectiveLinkWrite[]
-  readonly linkDeletes: readonly ExactEffectiveLinkDelete[]
-}
-
 export interface ExactTimeseriesPointWrite {
   readonly point: StoredTelemetryPoint
   readonly expected: ExpectedTimeseriesPointRevision
 }
 
-export interface ExactTimeseriesWrites {
-  readonly pointUpserts: readonly ExactTimeseriesPointWrite[]
-}
-
-export interface MaterializationPlanChunk {
-  readonly overrides: ExactOverrideWrites
-  readonly effective: ExactEffectiveWrites
-  readonly timeseries: ExactTimeseriesWrites
-  readonly outbox: readonly OntologyOutboxWrite[]
-}
-
 export interface SourceActivationWrite {
   readonly source: ProjectionSourceRef
   readonly materializationId: string
@@ -284,11 +252,6 @@ export interface MaterializationPlanFinalization {
   readonly result: EditCommitResult | ProjectionCommitResult | TelemetryCommitResult
 }
 
-export interface ApplyMaterializationChunkInput {
-  readonly session: MaterializationSession
-  readonly chunk: MaterializationPlanChunk
-}
-
 export interface FinalizeMaterializationInput {
   readonly session: MaterializationSession
   readonly finalization: MaterializationPlanFinalization
@@ -304,14 +267,6 @@ export interface StreamMaterializationStateInput {
   readonly pageRows: number
 }
 
-export interface StreamSourceReplacementStateInput {
-  readonly session: MaterializationSession
-  readonly source: ProjectionSourceRef
-  readonly candidateMaterializationId: string
-  readonly entityKind: "object" | "link"
-  readonly pageRows: number
-}
-
 export type MaterializationWorkEntityKind = "object" | "link" | "point"
 
 export interface MaterializationClassificationWorkRecord {
@@ -321,6 +276,7 @@ export interface MaterializationClassificationWorkRecord {
   readonly identityKey: string
 }
 
+/** Replacement plans only: the existence an object is planned to have, read by its links. */
 export interface MaterializationObjectExistenceWorkRecord {
   readonly kind: "object-existence"
   readonly recordKey: string
@@ -328,6 +284,7 @@ export interface MaterializationObjectExistenceWorkRecord {
   readonly exists: boolean
 }
 
+/** Replacement plans only: an object whose existence flips, so its links join the plan. */
 export interface MaterializationIncidentObjectWorkRecord {
   readonly kind: "incident-object"
   readonly recordKey: string
@@ -419,28 +376,36 @@ export type MaterializationWorkRecord =
 
 export interface StageMaterializationWorkInput {
   readonly session: MaterializationSession
-  /** Insert-only and batch-atomic. Staging closes when any work lane starts streaming. */
+  /**
+   * Insert-only and batch-atomic. Staging closes once vector changes stream or the plan applies.
+   * Object existence and incident objects belong to replacement plans and are rejected here.
+   */
   readonly records: readonly MaterializationWorkRecord[]
 }
 
-export interface StreamMaterializationWorkInput {
+export interface StreamMaterializationVectorChangesInput {
   readonly session: MaterializationSession
-  /** Canonical provider-owned lanes: physical writes, cardinality occupants, then event drafts. */
-  readonly order: "apply" | "cardinality" | "event"
+  /** Object types that declare vector profiles. */
+  readonly objectTypeIds: readonly string[]
   readonly pageRows: number
 }
 
-export interface MaterializationWorkPage {
-  readonly records: readonly (
-    | MaterializationPlanWorkRecord
-    | MaterializationCardinalityOccupantWorkRecord
-    | MaterializationEventWorkRecord
-  )[]
+export type MaterializationVectorChange = Extract<
+  MaterializationPlanWorkItem,
+  { readonly kind: "object-upsert" | "object-delete" }
+>
+
+export interface MaterializationVectorChangePage {
+  readonly items: readonly MaterializationVectorChange[]
 }
 
-export interface ReadMaterializationObjectExistenceInput {
+export interface ApplyMaterializationInput {
   readonly session: MaterializationSession
-  readonly refs: readonly OntologyObjectRef[]
+}
+
+export interface AppliedMaterialization {
+  /** Outbox events written, with commit ordinals contiguous from zero. */
+  readonly eventCount: number
 }
 
 export interface MaterializationObjectExistence {
@@ -451,15 +416,21 @@ export interface MaterializationObjectExistence {
 export interface OntologyMaterializationStorage {
   begin(input: MaterializationPlanHeader): Promise<MaterializationSession>
   streamState(input: StreamMaterializationStateInput): AsyncIterable<MaterializationStatePage>
-  streamSourceReplacementState(
-    input: StreamSourceReplacementStateInput
-  ): AsyncIterable<SourceReplacementStatePage>
+  /** Not on a plan-bound session: its work is the durable plan. */
   stageWork(input: StageMaterializationWorkInput): Promise<void>
-  streamWork(input: StreamMaterializationWorkInput): AsyncIterable<MaterializationWorkPage>
-  readObjectExistence(
-    input: ReadMaterializationObjectExistenceInput
-  ): Promise<readonly MaterializationObjectExistence[]>
-  applyChunk(input: ApplyMaterializationChunkInput): Promise<void>
+  /**
+   * Staged object upserts and deletes that vector profiles must see before they apply: those of
+   * `objectTypeIds`, and any other object that still holds a stored vector. Streams once, before
+   * `apply`.
+   */
+  streamVectorChanges(
+    input: StreamMaterializationVectorChangesInput
+  ): AsyncIterable<MaterializationVectorChangePage>
+  /**
+   * Validates the staged cardinality, applies the staged plan in phase order and writes the staged
+   * events to the outbox in canonical order. Once per session, before `finalize`.
+   */
+  apply(input: ApplyMaterializationInput): Promise<AppliedMaterialization>
   /**
    * Finalizes ontology-owned state only. Execution checkpoints remain owned by their run stores
    * and are coordinated by the Materializer through the enclosing Storage transaction.

package/src/storage/ontology/outbox.ts

@@ -6,13 +6,6 @@ export type {
   OntologyMaterializationEventDraft,
 } from "../../materialization/events"
 
-export interface OntologyOutboxWrite {
-  /** Providers may index envelope identity fields, but the envelope remains authoritative. */
-  readonly envelope: OntologyMaterializationEvent
-  readonly availableAt: string
-  readonly createdAt: string
-}
-
 /** Error codes a durable ontology outbox delivery can persist. */
 export const ONTOLOGY_OUTBOX_FAILURE_CODES = ["event.delivery_failed"] as const satisfies readonly [
   SixbErrorCode,
@@ -23,6 +16,10 @@ export type OntologyOutboxFailureCode = (typeof ONTOLOGY_OUTBOX_FAILURE_CODES)[n
 export type OntologyOutboxFailure = SixbFailure<OntologyOutboxFailureCode>
 
 export interface OntologyOutboxRecord {
+  /**
+   * The event as consumers receive it. Providers store only its draft and rebuild the rest from
+   * its commit.
+   */
   readonly envelope: OntologyMaterializationEvent
   readonly availableAt: string
   readonly attempts: number

package/src/storage/ontology/provider-header-validation.ts

@@ -38,55 +38,6 @@ function assertCommitEnvelope(commit: OntologyCommitWrite): void {
   assertNonblank(commit.executionId, "Materialization execution id")
   assertNonblank(commit.ontologyRevision, "Materialization ontology revision")
   assertTimestamp(commit.committedAt, "Materialization commit time")
-  assertCommitAttribution(commit)
-}
-
-/** Shape only: the Materializer copies both values from the execution it has already verified. */
-function assertCommitAttribution(commit: OntologyCommitWrite): void {
-  const { requestedBy, executor } = commit
-  if (requestedBy !== undefined) {
-    if (requestedBy.type !== "user" && requestedBy.type !== "serviceAccount") {
-      invalidCorrelation("Materialization requester must be a user or service account.")
-    }
-    assertNonblank(requestedBy.id, "Materialization requester id")
-  }
-
-  switch (executor?.type) {
-    case "request":
-      assertNonblank(executor.requestId, "Materialization executor request id")
-      return
-    case "primitive":
-      assertNonblank(executor.kind, "Materialization executor primitive kind")
-      assertNonblank(executor.id, "Materialization executor primitive id")
-      assertNonblank(executor.runId, "Materialization executor run id")
-      return
-    case "agent":
-      assertNonblank(executor.runId, "Materialization executor Agent run id")
-      return
-    case "kernel":
-      assertNonblank(executor.operation?.type, "Materialization executor kernel operation")
-      return
-    default:
-      invalidCorrelation("Materialization executor is invalid.")
-  }
-}
-
-/** A governed or projected write is attributed to exactly the primitive run that owns it. */
-function assertPrimitiveExecutor(
-  commit: OntologyCommitWrite,
-  kind: "action" | "projection",
-  id: string,
-  runId: string
-): void {
-  const { executor } = commit
-  if (
-    executor.type !== "primitive" ||
-    executor.kind !== kind ||
-    executor.id !== id ||
-    executor.runId !== runId
-  ) {
-    invalidCorrelation(`Commit ${kind} origin does not match its executor.`)
-  }
 }
 
 function assertEditCommit(commit: OntologyCommitWrite, intent: EditOntologyCommitIntent): void {
@@ -96,7 +47,6 @@ function assertEditCommit(commit: OntologyCommitWrite, intent: EditOntologyCommi
     case "action":
       assertNonblank(commit.origin.actionId, "Action origin action id")
       assertNonblank(commit.origin.runId, "Action origin run id")
-      assertPrimitiveExecutor(commit, "action", commit.origin.actionId, commit.origin.runId)
       return
     case "runtime":
       assertNonblank(commit.origin.requestId, "Runtime origin request id")
@@ -127,12 +77,6 @@ function assertProjectionCommit(
   ) {
     invalidCorrelation("Projection commit origin does not match its dataset version.")
   }
-  assertPrimitiveExecutor(
-    commit,
-    "projection",
-    commit.origin.projectionId,
-    commit.origin.projectionRunId
-  )
 }
 
 function assertTelemetryCommit(
@@ -198,7 +142,6 @@ function assertProjectionTelemetryCommit(
   if (origin.batchOrdinal !== source.batchOrdinal) {
     invalidCorrelation("Projection telemetry origin does not match its batch ordinal.")
   }
-  assertPrimitiveExecutor(commit, "projection", origin.projectionId, origin.projectionRunId)
 }
 
 function assertProjectionTelemetryBatch(