@sixb/core 0.1.2 → 0.1.4

package/dist/chunk-96swp2wd.js

@@ -0,0 +1,47 @@
+// @bun
+// src/projections/timestamp.ts
+var DATASET_TIMESTAMP = /^(\d{4})-(\d{1,2})-(\d{1,2})(?:[ T](\d{1,2}):(\d{2})(?::(\d{2})(?:\.(\d{1,9}))?)?)?([zZ]|[+-]\d{2}:?\d{2})?$/;
+function parseDatasetTimestamp(value) {
+  if (value instanceof Date)
+    return Number.isNaN(value.getTime()) ? null : value;
+  if (typeof value !== "string")
+    return null;
+  const match = DATASET_TIMESTAMP.exec(value.trim());
+  if (!match)
+    return null;
+  const [, year, month, day, hour, minute, second, fraction, zone] = match;
+  const offsetMinutes = parseZoneOffsetMinutes(zone);
+  if (offsetMinutes === null)
+    return null;
+  const components = {
+    year: Number(year),
+    month: Number(month),
+    day: Number(day),
+    hour: hour === undefined ? 0 : Number(hour),
+    minute: minute === undefined ? 0 : Number(minute),
+    second: second === undefined ? 0 : Number(second),
+    milliseconds: fraction === undefined ? 0 : Math.trunc(Number(`0.${fraction}`) * 1000)
+  };
+  const wallClock = Date.UTC(components.year, components.month - 1, components.day, components.hour, components.minute, components.second, components.milliseconds);
+  if (!wallClockMatchesComponents(wallClock, components))
+    return null;
+  return new Date(wallClock - offsetMinutes * 60000);
+}
+function parseZoneOffsetMinutes(zone) {
+  if (zone === undefined || zone === "Z" || zone === "z")
+    return 0;
+  const digits = zone.slice(1).replace(":", "");
+  const hours = Number(digits.slice(0, 2));
+  const minutes = Number(digits.slice(2, 4));
+  if (hours > 23 || minutes > 59)
+    return null;
+  return (zone[0] === "-" ? -1 : 1) * (hours * 60 + minutes);
+}
+function wallClockMatchesComponents(wallClock, components) {
+  const date = new Date(wallClock);
+  return date.getUTCFullYear() === components.year && date.getUTCMonth() === components.month - 1 && date.getUTCDate() === components.day && date.getUTCHours() === components.hour && date.getUTCMinutes() === components.minute && date.getUTCSeconds() === components.second;
+}
+
+export { parseDatasetTimestamp };
+
+//# debugId=E9A28815FA1B574C64756E2164756E21

package/dist/chunk-96swp2wd.js.map

@@ -0,0 +1,10 @@
+{
+  "version": 3,
+  "sources": ["../src/projections/timestamp.ts"],
+  "sourcesContent": [
+    "const DATASET_TIMESTAMP =\n  /^(\\d{4})-(\\d{1,2})-(\\d{1,2})(?:[ T](\\d{1,2}):(\\d{2})(?::(\\d{2})(?:\\.(\\d{1,9}))?)?)?([zZ]|[+-]\\d{2}:?\\d{2})?$/\n\ninterface TimestampComponents {\n  readonly year: number\n  readonly month: number\n  readonly day: number\n  readonly hour: number\n  readonly minute: number\n  readonly second: number\n  readonly milliseconds: number\n}\n\n/** Parses a projection dataset timestamp, interpreting zone-less values as UTC. */\nexport function parseDatasetTimestamp(value: unknown): Date | null {\n  if (value instanceof Date) return Number.isNaN(value.getTime()) ? null : value\n  if (typeof value !== \"string\") return null\n\n  const match = DATASET_TIMESTAMP.exec(value.trim())\n  if (!match) return null\n  const [, year, month, day, hour, minute, second, fraction, zone] = match\n  const offsetMinutes = parseZoneOffsetMinutes(zone)\n  if (offsetMinutes === null) return null\n\n  const components: TimestampComponents = {\n    year: Number(year),\n    month: Number(month),\n    day: Number(day),\n    hour: hour === undefined ? 0 : Number(hour),\n    minute: minute === undefined ? 0 : Number(minute),\n    second: second === undefined ? 0 : Number(second),\n    milliseconds: fraction === undefined ? 0 : Math.trunc(Number(`0.${fraction}`) * 1000),\n  }\n  const wallClock = Date.UTC(\n    components.year,\n    components.month - 1,\n    components.day,\n    components.hour,\n    components.minute,\n    components.second,\n    components.milliseconds\n  )\n  if (!wallClockMatchesComponents(wallClock, components)) return null\n  return new Date(wallClock - offsetMinutes * 60_000)\n}\n\nfunction parseZoneOffsetMinutes(zone: string | undefined): number | null {\n  if (zone === undefined || zone === \"Z\" || zone === \"z\") return 0\n  const digits = zone.slice(1).replace(\":\", \"\")\n  const hours = Number(digits.slice(0, 2))\n  const minutes = Number(digits.slice(2, 4))\n  if (hours > 23 || minutes > 59) return null\n  return (zone[0] === \"-\" ? -1 : 1) * (hours * 60 + minutes)\n}\n\nfunction wallClockMatchesComponents(wallClock: number, components: TimestampComponents): boolean {\n  const date = new Date(wallClock)\n  return (\n    date.getUTCFullYear() === components.year &&\n    date.getUTCMonth() === components.month - 1 &&\n    date.getUTCDate() === components.day &&\n    date.getUTCHours() === components.hour &&\n    date.getUTCMinutes() === components.minute &&\n    date.getUTCSeconds() === components.second\n  )\n}\n"
+  ],
+  "mappings": ";;AAAA,IAAM,oBACJ;AAaK,SAAS,qBAAqB,CAAC,OAA6B;AAAA,EACjE,IAAI,iBAAiB;AAAA,IAAM,OAAO,OAAO,MAAM,MAAM,QAAQ,CAAC,IAAI,OAAO;AAAA,EACzE,IAAI,OAAO,UAAU;AAAA,IAAU,OAAO;AAAA,EAEtC,MAAM,QAAQ,kBAAkB,KAAK,MAAM,KAAK,CAAC;AAAA,EACjD,IAAI,CAAC;AAAA,IAAO,OAAO;AAAA,EACnB,SAAS,MAAM,OAAO,KAAK,MAAM,QAAQ,QAAQ,UAAU,QAAQ;AAAA,EACnE,MAAM,gBAAgB,uBAAuB,IAAI;AAAA,EACjD,IAAI,kBAAkB;AAAA,IAAM,OAAO;AAAA,EAEnC,MAAM,aAAkC;AAAA,IACtC,MAAM,OAAO,IAAI;AAAA,IACjB,OAAO,OAAO,KAAK;AAAA,IACnB,KAAK,OAAO,GAAG;AAAA,IACf,MAAM,SAAS,YAAY,IAAI,OAAO,IAAI;AAAA,IAC1C,QAAQ,WAAW,YAAY,IAAI,OAAO,MAAM;AAAA,IAChD,QAAQ,WAAW,YAAY,IAAI,OAAO,MAAM;AAAA,IAChD,cAAc,aAAa,YAAY,IAAI,KAAK,MAAM,OAAO,KAAK,UAAU,IAAI,IAAI;AAAA,EACtF;AAAA,EACA,MAAM,YAAY,KAAK,IACrB,WAAW,MACX,WAAW,QAAQ,GACnB,WAAW,KACX,WAAW,MACX,WAAW,QACX,WAAW,QACX,WAAW,YACb;AAAA,EACA,IAAI,CAAC,2BAA2B,WAAW,UAAU;AAAA,IAAG,OAAO;AAAA,EAC/D,OAAO,IAAI,KAAK,YAAY,gBAAgB,KAAM;AAAA;AAGpD,SAAS,sBAAsB,CAAC,MAAyC;AAAA,EACvE,IAAI,SAAS,aAAa,SAAS,OAAO,SAAS;AAAA,IAAK,OAAO;AAAA,EAC/D,MAAM,SAAS,KAAK,MAAM,CAAC,EAAE,QAAQ,KAAK,EAAE;AAAA,EAC5C,MAAM,QAAQ,OAAO,OAAO,MAAM,GAAG,CAAC,CAAC;AAAA,EACvC,MAAM,UAAU,OAAO,OAAO,MAAM,GAAG,CAAC,CAAC;AAAA,EACzC,IAAI,QAAQ,MAAM,UAAU;AAAA,IAAI,OAAO;AAAA,EACvC,QAAQ,KAAK,OAAO,MAAM,KAAK,MAAM,QAAQ,KAAK;AAAA;AAGpD,SAAS,0BAA0B,CAAC,WAAmB,YAA0C;AAAA,EAC/F,MAAM,OAAO,IAAI,KAAK,SAAS;AAAA,EAC/B,OACE,KAAK,eAAe,MAAM,WAAW,QACrC,KAAK,YAAY,MAAM,WAAW,QAAQ,KAC1C,KAAK,WAAW,MAAM,WAAW,OACjC,KAAK,YAAY,MAAM,WAAW,QAClC,KAAK,cAAc,MAAM,WAAW,UACpC,KAAK,cAAc,MAAM,WAAW;AAAA;",
+  "debugId": "E9A28815FA1B574C64756E2164756E21",
+  "names": []
+}

package/dist/{chunk-4x43bkbp.js → chunk-a09jx26t.js}

@@ -1,7 +1,7 @@
 // @bun
 import {
   agentServiceAccountId
-} from "./chunk-qvybnnpe.js";
+} from "./chunk-nzw7sm3b.js";
 import {
   findAgentRunExecution,
   findPrimitiveRunExecution

package/dist/{chunk-st4xgxey.js → chunk-afjpa2hs.js}

@@ -1,11 +1,14 @@
 // @bun
+import {
+  parseDatasetTimestamp
+} from "./chunk-96swp2wd.js";
 import {
   ensureExecutionRecord,
   executionRecordInputFromRuntime
-} from "./chunk-8ryen3p3.js";
+} from "./chunk-f6erf2vv.js";
 import {
   isStorageSerializationFailure
-} from "./chunk-ys1nse2v.js";
+} from "./chunk-1wk20wn3.js";
 import {
   createCommitId,
   createEventId,
@@ -13,7 +16,7 @@ import {
   materializationApplyPhase,
   materializationEventKindOrdinal,
   sha256Canonical
-} from "./chunk-fmx1sz2h.js";
+} from "./chunk-72q2y8hn.js";
 import {
   assertPinnedDatasetWatermark
 } from "./chunk-9dzba0f2.js";
@@ -41,6 +44,12 @@ import {
   MaterializationObjectNotFoundError,
   MaterializationValidationError
 } from "./chunk-ry24jbr1.js";
+import {
+  ProjectionValidationError,
+  isProjectionDefinition,
+  resolveExecutionScopeAuthorization,
+  validateProjectionsAtStartup
+} from "./chunk-f83ka50g.js";
 import {
   assertKnownProperties,
   normalizeLinkProperties,
@@ -51,12 +60,6 @@ import {
   validatePropertyValue,
   validateTelemetryUnit
 } from "./chunk-rnshztfq.js";
-import {
-  ProjectionValidationError,
-  isProjectionDefinition,
-  resolveExecutionScopeAuthorization,
-  validateProjectionsAtStartup
-} from "./chunk-34bqh420.js";
 import {
   assertJsonValue,
   cloneJsonValue,
@@ -169,7 +172,8 @@ function normalizeProjectionDefinition(projection) {
           sourceField: link.sourceField ?? null,
           targetObjectTypeId: link.targetObjectTypeId
         }
-      ]))
+      ])),
+      conflictResolution: projection.conflictResolution ?? { strategy: "editsWin" }
     };
   }
   if (projection._tag === "LinkProjectionDefinition") {
@@ -182,21 +186,39 @@ function normalizeProjectionDefinition(projection) {
       targetField: projection.targetField
     };
   }
+  const properties = Object.entries(projection.properties).sort(([left], [right]) => compareStrings(left, right));
+  if (properties.length === 1) {
+    const [propertyId, mapping] = properties[0];
+    return {
+      kind: "telemetry",
+      objectTypeId: projection.objectTypeId,
+      propertyId,
+      objectIdField: projection.objectIdField,
+      atField: projection.atField,
+      valueField: mapping.valueField,
+      unitField: mapping.unitField ?? null
+    };
+  }
   return {
     kind: "telemetry",
     objectTypeId: projection.objectTypeId,
-    propertyId: projection.propertyId,
     objectIdField: projection.objectIdField,
     atField: projection.atField,
-    valueField: projection.valueField,
-    unitField: projection.unitField ?? null
+    properties: Object.fromEntries(properties.map(([propertyId, mapping]) => [
+      propertyId,
+      {
+        valueField: mapping.valueField,
+        unitField: mapping.unitField ?? null
+      }
+    ]))
   };
 }
 function projectionColumns(projection) {
   if (projection._tag === "ObjectProjectionDefinition") {
     return new Set([
       ...Object.values(projection.properties),
-      ...Object.values(projection.links).flatMap((link) => link.sourceField === undefined ? [] : [link.sourceField])
+      ...Object.values(projection.links).flatMap((link) => link.sourceField === undefined ? [] : [link.sourceField]),
+      ...projection.conflictResolution?.strategy === "mostRecent" ? [projection.conflictResolution.sourceTimestamp] : []
     ]);
   }
   if (projection._tag === "LinkProjectionDefinition") {
@@ -205,8 +227,10 @@ function projectionColumns(projection) {
   return new Set([
     projection.objectIdField,
     projection.atField,
-    projection.valueField,
-    ...projection.unitField === undefined ? [] : [projection.unitField]
+    ...Object.values(projection.properties).flatMap((mapping) => [
+      mapping.valueField,
+      ...mapping.unitField === undefined ? [] : [mapping.unitField]
+    ])
   ]);
 }
 function normalizeProperty(property) {
@@ -424,7 +448,11 @@ function cloneObjectProjectionDefinition(projection) {
         ...descriptor.sourceField !== undefined ? { sourceField: descriptor.sourceField } : {},
         targetObjectTypeId: descriptor.targetObjectTypeId
       }
-    ]))
+    ])),
+    conflictResolution: projection.conflictResolution?.strategy === "mostRecent" ? {
+      strategy: "mostRecent",
+      sourceTimestamp: projection.conflictResolution.sourceTimestamp
+    } : { strategy: "editsWin" }
   };
 }
 function cloneLinkProjectionDefinition(projection) {
@@ -444,12 +472,16 @@ function cloneTelemetryProjectionDefinition(projection) {
     _tag: "TelemetryProjectionDefinition",
     id: projection.id,
     objectTypeId: projection.objectTypeId,
-    propertyId: projection.propertyId,
     datasetId: projection.datasetId,
     objectIdField: projection.objectIdField,
     atField: projection.atField,
-    valueField: projection.valueField,
-    ...projection.unitField !== undefined ? { unitField: projection.unitField } : {}
+    properties: Object.fromEntries(Object.entries(projection.properties).map(([propertyId, mapping]) => [
+      propertyId,
+      {
+        valueField: mapping.valueField,
+        ...mapping.unitField !== undefined ? { unitField: mapping.unitField } : {}
+      }
+    ]))
   };
 }
 function deepFreeze(value) {
@@ -882,7 +914,7 @@ function appendItem(chunk, item) {
 
 // src/materializer/execution/work-records.ts
 function appendObjectOverrideWork(items, working, identity) {
-  if (stableJsonStringify(working.originalOverride?.value ?? null) === stableJsonStringify(working.override)) {
+  if (stableJsonStringify(working.originalOverride?.value ?? null) === stableJsonStringify(working.override) && stableJsonStringify(working.originalEditedAt) === stableJsonStringify(working.editedAt)) {
     return;
   }
   if (working.override) {
@@ -891,6 +923,7 @@ function appendObjectOverrideWork(items, working, identity) {
       value: {
         ref: working.ref,
         value: working.override,
+        editedAt: working.editedAt,
         expectedLastCommitId: working.originalOverride?.lastCommitId ?? null,
         lastCommitId: identity.commitId,
         updatedAt: identity.committedAt
@@ -1160,6 +1193,13 @@ function normalizeTimestamp(value, label) {
   }
   return new Date(milliseconds).toISOString();
 }
+function normalizeProjectionSourceTimestamp(value) {
+  const timestamp = parseDatasetTimestamp(value);
+  if (!timestamp) {
+    throw new MaterializationValidationError("Projection source update timestamp must be a valid timestamp.");
+  }
+  return timestamp.toISOString();
+}
 function normalizePropertyIds(values, label) {
   const seen = new Set;
   const normalized = [];
@@ -1369,7 +1409,10 @@ function normalizeProjectionAssertion(assertion) {
   return assertion.kind === "object" ? Object.freeze({
     kind: "object",
     ref: normalizeObjectRef(assertion.ref),
-    properties: normalizeJsonProperties(assertion.properties)
+    properties: normalizeJsonProperties(assertion.properties),
+    ...assertion.sourceUpdatedAt !== undefined ? {
+      sourceUpdatedAt: normalizeProjectionSourceTimestamp(assertion.sourceUpdatedAt)
+    } : {}
   }) : Object.freeze({
     kind: "link",
     ref: normalizeLinkRef(assertion.ref),
@@ -1526,35 +1569,76 @@ function usableLinkSlotOverride(stored) {
   throw new MaterializationConflictError("effective-state", `Cardinality-one link slot ${scopeLabel} could not be migrated automatically because it ` + "contains multiple legacy upsert overrides. Consolidate the stored overrides and clear " + "the migration conflict marker before materializing this scope.");
 }
 function resolveEffectiveObject(input) {
-  const properties = resolveObjectAuthority(input.source, input.override);
+  const properties = resolveObjectAuthority(input.source, input.override, input.editedAt);
   if (!properties)
     return null;
   properties[input.primaryPropertyId] = input.ref.primaryId;
   applyLatestTelemetry(properties, input.latestTelemetry);
   return { ref: input.ref, properties };
 }
-function resolveObjectAuthority(source, override) {
+function resolveObjectAuthority(source, override, editedAt) {
   switch (override?.kind) {
     case "delete":
       return null;
     case "create":
-      return { ...override.properties };
+      if (!source)
+        return { ...override.properties };
+      return resolveSourceAndEdits(source, override, editedAt);
     case "patch":
       if (!source)
         return null;
-      return applyObjectPatch(source.assertion.properties, override);
+      return resolveSourceAndEdits(source, override, editedAt);
     default:
       if (!source)
         return null;
       return { ...source.assertion.properties };
   }
 }
-function applyObjectPatch(sourceProperties, override) {
-  const properties = { ...sourceProperties, ...override.set };
-  for (const propertyId of override.unset)
-    delete properties[propertyId];
+function resolveSourceAndEdits(source, override, editedAt) {
+  const properties = { ...source.assertion.properties };
+  const absentSourcePropertyIds = new Set(source.assertion.absentSourcePropertyIds ?? []);
+  for (const propertyId of objectEditCandidateIds(override, editedAt)) {
+    const edit = objectEditCandidate(override, propertyId);
+    const editTimestamp = editedAt[propertyId];
+    const hasSourceCandidate = Object.hasOwn(source.assertion.properties, propertyId) || absentSourcePropertyIds.has(propertyId);
+    const sourceWins = hasSourceCandidate && source.assertion.sourceUpdatedAt !== undefined && editTimestamp !== undefined && source.assertion.sourceUpdatedAt.localeCompare(editTimestamp) >= 0;
+    if (!sourceWins)
+      applyObjectEditCandidate(properties, propertyId, edit);
+  }
   return properties;
 }
+function objectEditCandidateIds(override, editedAt) {
+  const ids = new Set(Object.keys(editedAt));
+  if (override.kind === "create") {
+    for (const propertyId of Object.keys(override.properties))
+      ids.add(propertyId);
+  } else {
+    for (const propertyId of Object.keys(override.set))
+      ids.add(propertyId);
+    for (const propertyId of override.unset)
+      ids.add(propertyId);
+  }
+  return [...ids];
+}
+function objectEditCandidate(override, propertyId) {
+  const values = override.kind === "create" ? override.properties : override.set;
+  return Object.hasOwn(values, propertyId) ? { present: true, value: values[propertyId] } : { present: false };
+}
+function applyObjectEditCandidate(properties, propertyId, candidate) {
+  if (candidate.present)
+    properties[propertyId] = candidate.value;
+  else
+    delete properties[propertyId];
+}
+function storedObjectEditedAt(stored) {
+  if (!stored || stored.value.kind === "delete")
+    return {};
+  const editedAt = { ...stored.editedAt ?? {} };
+  const candidateIds = stored.value.kind === "create" ? Object.keys(stored.value.properties) : [...Object.keys(stored.value.set), ...stored.value.unset];
+  for (const propertyId of candidateIds)
+    editedAt[propertyId] ??= stored.updatedAt;
+  return editedAt;
+}
 function applyLatestTelemetry(properties, latestTelemetry) {
   for (const point of latestTelemetry)
     properties[point.series.propertyId] = point.value;
@@ -1683,11 +1767,14 @@ function workingLinkSlotFromState(scope) {
   };
 }
 function workingObjectFromState(object) {
+  const editedAt = storedObjectEditedAt(object.override);
   return {
     ref: object.ref,
     source: object.source,
     originalOverride: object.override,
     override: object.override?.value ?? null,
+    originalEditedAt: editedAt,
+    editedAt: { ...editedAt },
     before: object.effective,
     latestTelemetry: [...object.latestTelemetry]
   };
@@ -1707,6 +1794,7 @@ function resolveObject(ontology, working) {
     primaryPropertyId: ontology.getPrimaryPropertyId(working.ref.objectTypeId),
     source: working.source,
     override: working.override,
+    editedAt: working.editedAt,
     latestTelemetry: working.latestTelemetry
   });
 }
@@ -2136,7 +2224,7 @@ function applyObjectEdit(input) {
       next = applyObjectUpsert(input, input.operation);
       break;
     case "object.patch":
-      next = applyObjectPatch2(input, input.operation);
+      next = applyObjectPatch(input, input.operation);
       break;
     case "object.delete":
       next = applyObjectDelete(input);
@@ -2147,7 +2235,47 @@ function applyObjectEdit(input) {
     default:
       throw new MaterializationValidationError("Expected an object edit operation.");
   }
-  return transition(current, next);
+  const editedAt = applyObjectEditTimes(input, next);
+  const authority = transition(current, next);
+  return {
+    ...authority,
+    editedAt,
+    changed: authority.changed || !sameStringRecord(input.editedAt, editedAt)
+  };
+}
+function applyObjectEditTimes(input, next) {
+  if (!next || next.kind === "delete")
+    return {};
+  const editedAt = input.operation.kind === "object.create" || input.authority?.kind === "delete" ? {} : { ...input.editedAt };
+  switch (input.operation.kind) {
+    case "object.create":
+    case "object.upsert": {
+      const properties = input.normalizedProperties ?? input.operation.properties;
+      for (const propertyId of Object.keys(properties))
+        editedAt[propertyId] = input.committedAt;
+      break;
+    }
+    case "object.patch":
+      for (const propertyId of input.operation.reset)
+        delete editedAt[propertyId];
+      for (const propertyId of input.operation.unset)
+        editedAt[propertyId] = input.committedAt;
+      for (const propertyId of Object.keys(input.normalizedSet ?? input.operation.set)) {
+        editedAt[propertyId] = input.committedAt;
+      }
+      break;
+    case "object.delete":
+      return editedAt;
+    case "object.restore":
+      break;
+  }
+  return editedAt;
+}
+function sameStringRecord(left, right) {
+  const leftKeys = Object.keys(left);
+  if (leftKeys.length !== Object.keys(right).length)
+    return false;
+  return leftKeys.every((key) => left[key] === right[key]);
 }
 function applyObjectCreate(input, operation) {
   if (input.sourceProperties || input.authority) {
@@ -2178,7 +2306,7 @@ function mergeUpsertIntoPatch(current, properties, hasSource) {
     delete created[propertyId];
   return { kind: "create", properties: { ...created, ...properties } };
 }
-function applyObjectPatch2(input, operation) {
+function applyObjectPatch(input, operation) {
   const current = input.authority;
   if (!input.effectiveExists && current?.kind !== "patch") {
     throw new MaterializationValidationError(`Object patch requires an effective object for ${operation.ref.objectTypeId}:${operation.ref.primaryId}.`);
@@ -2304,10 +2432,12 @@ function applyObjectOperation(context, state, operation, identity, journal) {
     operation,
     sourceProperties: working.source?.assertion.properties ?? null,
     authority: working.override,
+    editedAt: working.editedAt,
+    committedAt: identity.committedAt,
     effectiveExists: currentEffective !== null,
     ...normalized
   });
-  applyObjectTransition(context, state, working, transition2.next, journal);
+  applyObjectTransition(context, state, working, transition2.next, transition2.editedAt, journal);
   return objectOperationOutcome(operation, working, transition2.changed, context, identity);
 }
 function requireWorkingObject(state, operation) {
@@ -2334,9 +2464,11 @@ function validateObjectOperation(context, operation) {
       return {};
   }
 }
-function applyObjectTransition(context, state, working, next, journal) {
+function applyObjectTransition(context, state, working, next, nextEditedAt, journal) {
   const previous = working.override;
+  const previousEditedAt = working.editedAt;
   working.override = next;
+  working.editedAt = { ...nextEditedAt };
   try {
     const resolved = resolveObject(context.ontology, working);
     if (resolved)
@@ -2344,11 +2476,13 @@ function applyObjectTransition(context, state, working, next, journal) {
     validateWorkingCardinality(state.links.slots);
   } catch (error) {
     working.override = previous;
+    working.editedAt = previousEditedAt;
     throw error;
   }
   journal?.push({
     restore: () => {
       working.override = previous;
+      working.editedAt = previousEditedAt;
     }
   });
 }
@@ -3035,7 +3169,22 @@ function validateObjectAssertion(ontology, resolved, policy, assertion) {
       continue;
     throw new MaterializationValidationError(`Projection '${resolved.projectionId}' asserted unowned property '${assertion.ref.objectTypeId}.${propertyId}'.`);
   }
-  return { ...assertion, properties };
+  const conflictResolution = resolved.definition.conflictResolution ?? { strategy: "editsWin" };
+  if (conflictResolution.strategy !== "mostRecent") {
+    return { kind: "object", ref: assertion.ref, properties };
+  }
+  if (assertion.sourceUpdatedAt === undefined) {
+    throw new MaterializationValidationError(`Projection '${resolved.projectionId}' requires source update timestamp ` + `'${conflictResolution.sourceTimestamp}' on every object assertion.`);
+  }
+  const primaryPropertyId = ontology.getPrimaryPropertyId(assertion.ref.objectTypeId);
+  const absentSourcePropertyIds = [...owned].filter((propertyId) => propertyId !== primaryPropertyId && !Object.hasOwn(properties, propertyId)).sort();
+  return {
+    kind: "object",
+    ref: assertion.ref,
+    properties,
+    sourceUpdatedAt: assertion.sourceUpdatedAt,
+    ...absentSourcePropertyIds.length === 0 ? {} : { absentSourcePropertyIds }
+  };
 }
 function validateLinkAssertion(ontology, resolved, policy, assertion) {
   const ownershipKey = linkOwnershipKey(assertion.ref.source.objectTypeId, assertion.ref.linkId);
@@ -3283,6 +3432,7 @@ function resolveReplacementObject(context, state) {
     primaryPropertyId: context.ontology.getPrimaryPropertyId(state.ref.objectTypeId),
     source: state.candidateSource,
     override: state.override?.value ?? null,
+    editedAt: storedObjectEditedAt(state.override),
     latestTelemetry: state.latestTelemetry
   });
 }
@@ -3845,7 +3995,6 @@ function prepareTelemetryAppend(context, raw) {
     points: raw.input.points.map((point) => validateTelemetryPoint(context.ontology, point))
   });
   const inputPointCount = telemetryInputPointCount(input, rawInputPointCount);
-  validateTelemetryBatch(input, inputPointCount);
   const ontologyRevision = context.projectionRegistry.ontologyRevision;
   const execution = prepareMaterializerExecution(context.projectId, raw.scope);
   if (input.source.kind === "runtime") {
@@ -3864,16 +4013,6 @@ function telemetryInputPointCount(input, rawInputPointCount) {
     return rawInputPointCount;
   return input.points.length;
 }
-function validateTelemetryBatch(input, inputPointCount) {
-  if (input.source.kind === "projection") {
-    if (input.source.sourceRowCount === 0) {
-      throw new MaterializationValidationError("Projection telemetry batches must consume at least one source row; an empty dataset produces no batch commit.");
-    }
-    if (input.source.sourceRowCount !== inputPointCount + input.source.sourceRowsSkipped) {
-      throw new MaterializationValidationError("Projection telemetry sourceRowCount must equal input points plus skipped rows.");
-    }
-  }
-}
 function prepareRuntimeTelemetry(context, input, source, inputPointCount, ontologyRevision) {
   const identity = createTimedCommitIdentity({
     projectId: context.projectId,
@@ -3887,6 +4026,7 @@ function prepareProjectionTelemetry(context, input, source, inputPointCount, ont
   const resolvedProjection = context.projectionRegistry.resolveTelemetry(source.projection.projectionId);
   validateTelemetryProjectionDataset(resolvedProjection, source);
   validateTelemetryOwnership(resolvedProjection, input);
+  validateTelemetryBatchCardinality(resolvedProjection, source, inputPointCount);
   const runIdentity = createProjectionRunMaterializationIdentity({
     resolved: resolvedProjection,
     datasetVersion: source.datasetVersion,
@@ -3909,6 +4049,23 @@ function prepareProjectionTelemetry(context, input, source, inputPointCount, ont
     runIdentity
   };
 }
+function validateTelemetryBatchCardinality(resolved, source, inputPointCount) {
+  if (source.sourceRowCount === 0) {
+    throw new MaterializationValidationError("Projection telemetry batches must consume at least one source row; an empty dataset produces no batch commit.");
+  }
+  const mappedPropertyCount = resolved.ownership.telemetry.length;
+  if (mappedPropertyCount === 0) {
+    throw new MaterializationValidationError(`Telemetry projection '${resolved.projectionId}' must own at least one telemetry property.`);
+  }
+  const sourceRowsEmitted = source.sourceRowCount - source.sourceRowsSkipped;
+  const maximumPointCount = sourceRowsEmitted * mappedPropertyCount;
+  if (!Number.isSafeInteger(maximumPointCount)) {
+    throw new MaterializationValidationError(`Telemetry projection '${resolved.projectionId}' batch point capacity exceeds the safe integer range.`);
+  }
+  if (inputPointCount < sourceRowsEmitted || inputPointCount > maximumPointCount) {
+    throw new MaterializationValidationError(`Telemetry projection '${resolved.projectionId}' must emit between ${sourceRowsEmitted} and ${maximumPointCount} points for ${source.sourceRowCount} source rows with ${source.sourceRowsSkipped} skipped.`);
+  }
+}
 function validateTelemetryProjectionDataset(resolved, source) {
   if (resolved.datasetId === source.datasetVersion.datasetId)
     return;
@@ -4171,4 +4328,4 @@ function createOntologyMaterializer(input) {
 }
 export { computeOntologyRevision, computeProjectionRevision, computeProjectionOwnershipHash, ProjectionRegistry, createActionIdempotencyKey, createRuntimeIdempotencyKey, createProjectionIdempotencyKey, createRuntimeTelemetryIdempotencyKey, createProjectionTelemetryIdempotencyKey, createCommitIdentity, timestampCommitIdentity, createTimedCommitIdentity, createProjectionMaterializationId, createLinkScopeFingerprint, normalizeJsonProperties, normalizeOntologyEditCommit, normalizeProjectionExecution, normalizeProjectionSourceEntry, normalizeTelemetryAppend, OntologyMaterializer, createOntologyMaterializer };
 
-//# debugId=E9E5C3996D8CF74864756E2164756E21
+//# debugId=D96E192C1BE0917864756E2164756E21