trekoon 0.3.7 → 0.3.8

package/src/sync/service.ts

@@ -2,6 +2,7 @@ import { randomUUID } from "node:crypto";
 
 import { type Database } from "bun:sqlite";
 
+import { ENTITY_OPERATIONS } from "../domain/mutation-operations";
 import { openTrekoonDatabase, writeTransaction } from "../storage/database";
 import { countBranchEventsSince, queryBranchEventsSinceBatch } from "./branch-db";
 import { nextEventTimestamp } from "./event-writes";
@@ -29,6 +30,8 @@ const SYNC_ALLOWED_FIELDS: Readonly<Record<string, readonly string[]>> = {
   dependencies: ["source_id", "source_kind", "depends_on_id", "depends_on_kind"],
 };
 
+const SYNC_EVENT_METADATA_FIELDS = new Set(["dependency_id", "source_event_id"]);
+
 function isSyncNullableStringField(tableName: string, fieldName: string): boolean {
   return (tableName === "tasks" || tableName === "subtasks") && fieldName === "owner";
 }
@@ -156,6 +159,13 @@ interface LocalEntityEventRow {
   readonly id: string;
 }
 
+interface DependencyEventIdentity {
+  readonly sourceId: string;
+  readonly sourceKind: string;
+  readonly dependsOnId: string;
+  readonly dependsOnKind: string;
+}
+
 const SYNC_PULL_BATCH_SIZE = 250;
 const CONFLICT_HISTORY_SCAN_BATCH_SIZE = 250;
 const RESOLVE_ALL_CHUNK_SIZE = 200;
@@ -387,6 +397,37 @@ function currentEntityFieldValue(db: Database, entityKind: string, entityId: str
   return row?.value;
 }
 
+function dependencyEventIdentityFromFields(fields: Record<string, unknown>): DependencyEventIdentity | null {
+  const sourceId = validateRequiredStringField(fields, "source_id");
+  const sourceKind = validateRequiredStringField(fields, "source_kind");
+  const dependsOnId = validateRequiredStringField(fields, "depends_on_id");
+  const dependsOnKind = validateRequiredStringField(fields, "depends_on_kind");
+
+  if (!sourceId || !sourceKind || !dependsOnId || !dependsOnKind) {
+    return null;
+  }
+
+  return {
+    sourceId,
+    sourceKind,
+    dependsOnId,
+    dependsOnKind,
+  };
+}
+
+function dependencyEventIdentity(event: StoredEvent): DependencyEventIdentity | null {
+  if (event.entity_kind !== "dependency") {
+    return null;
+  }
+
+  const payloadValidation = parsePayload(event.payload);
+  if (!payloadValidation.ok) {
+    return null;
+  }
+
+  return dependencyEventIdentityFromFields(payloadValidation.fields);
+}
+
 function entityFieldConflict(
   localDb: Database,
   sourceBranch: string,
@@ -429,6 +470,8 @@ function entityFieldConflict(
         CONFLICT_HISTORY_SCAN_BATCH_SIZE,
       ) as LocalEntityEventRow[];
 
+    const incomingDependencyIdentity = dependencyEventIdentity(event);
+
     if (rows.length === 0) {
       return null;
     }
@@ -439,6 +482,19 @@ function entityFieldConflict(
         continue;
       }
 
+      if (incomingDependencyIdentity !== null) {
+        const localDependencyIdentity = dependencyEventIdentityFromFields(payloadValidation.fields);
+        if (
+          localDependencyIdentity === null ||
+          localDependencyIdentity.sourceId !== incomingDependencyIdentity.sourceId ||
+          localDependencyIdentity.sourceKind !== incomingDependencyIdentity.sourceKind ||
+          localDependencyIdentity.dependsOnId !== incomingDependencyIdentity.dependsOnId ||
+          localDependencyIdentity.dependsOnKind !== incomingDependencyIdentity.dependsOnKind
+        ) {
+          continue;
+        }
+      }
+
       const payload: EventPayload = { fields: payloadValidation.fields };
       const localValue: unknown = readFieldValue(payload, fieldName);
 
@@ -724,6 +780,124 @@ function hasLocalDependencyEditsTouchingNodes(db: Database, nodeIds: readonly st
   return false;
 }
 
+function hasLocalDependencyEditsForIdentity(
+  db: Database,
+  sourceBranch: string,
+  identity: DependencyEventIdentity,
+): boolean {
+  const row = db
+    .query(
+      `
+      SELECT 1
+      FROM events
+      WHERE entity_kind = 'dependency'
+        AND (git_branch IS NULL OR git_branch != ?)
+        AND json_extract(payload, '$.fields.source_id') = ?
+        AND json_extract(payload, '$.fields.source_kind') = ?
+        AND json_extract(payload, '$.fields.depends_on_id') = ?
+        AND json_extract(payload, '$.fields.depends_on_kind') = ?
+      LIMIT 1;
+      `,
+    )
+    .get(sourceBranch, identity.sourceId, identity.sourceKind, identity.dependsOnId, identity.dependsOnKind);
+
+  return row !== null;
+}
+
+function dependencyRowExistsForIdentity(db: Database, identity: DependencyEventIdentity): boolean {
+  const row = db
+    .query(
+      `
+      SELECT 1
+      FROM dependencies
+      WHERE source_id = ?
+        AND source_kind = ?
+        AND depends_on_id = ?
+        AND depends_on_kind = ?
+      LIMIT 1;
+      `,
+    )
+    .get(identity.sourceId, identity.sourceKind, identity.dependsOnId, identity.dependsOnKind);
+
+  return row !== null;
+}
+
+function latestLocalDependencyOperationForIdentity(
+  db: Database,
+  sourceBranch: string,
+  identity: DependencyEventIdentity,
+): string | null {
+  const row = db
+    .query(
+      `
+      SELECT operation
+      FROM events
+      WHERE entity_kind = 'dependency'
+        AND (git_branch IS NULL OR git_branch != ?)
+        AND json_extract(payload, '$.fields.source_id') = ?
+        AND json_extract(payload, '$.fields.source_kind') = ?
+        AND json_extract(payload, '$.fields.depends_on_id') = ?
+        AND json_extract(payload, '$.fields.depends_on_kind') = ?
+      ORDER BY created_at DESC, id DESC
+      LIMIT 1;
+      `,
+    )
+    .get(sourceBranch, identity.sourceId, identity.sourceKind, identity.dependsOnId, identity.dependsOnKind) as
+    | { operation: string }
+    | null;
+
+  return row?.operation ?? null;
+}
+
+function hasLocalDependencyRemovalForIdentity(
+  db: Database,
+  sourceBranch: string,
+  identity: DependencyEventIdentity,
+): boolean {
+  const row = db
+    .query(
+      `
+      SELECT 1
+      FROM events
+      WHERE entity_kind = 'dependency'
+        AND operation = 'dependency.removed'
+        AND (git_branch IS NULL OR git_branch != ?)
+        AND json_extract(payload, '$.fields.source_id') = ?
+        AND json_extract(payload, '$.fields.depends_on_id') = ?
+        AND (
+          json_extract(payload, '$.fields.source_kind') IS NULL
+          OR json_extract(payload, '$.fields.source_kind') = ?
+        )
+        AND (
+          json_extract(payload, '$.fields.depends_on_kind') IS NULL
+          OR json_extract(payload, '$.fields.depends_on_kind') = ?
+        )
+      LIMIT 1;
+      `,
+    )
+    .get(sourceBranch, identity.sourceId, identity.dependsOnId, identity.sourceKind, identity.dependsOnKind);
+
+  return row !== null;
+}
+
+function hasLocalDependencyDeleteConflict(db: Database, event: StoredEvent, sourceBranch: string): boolean {
+  const identity = dependencyEventIdentity(event);
+  if (identity === null) {
+    return false;
+  }
+
+  if (!dependencyRowExistsForIdentity(db, identity)) {
+    return false;
+  }
+
+  const latestOperation = latestLocalDependencyOperationForIdentity(db, sourceBranch, identity);
+  if (latestOperation === ENTITY_OPERATIONS.dependency.removed) {
+    return false;
+  }
+
+  return hasLocalDependencyEditsForIdentity(db, sourceBranch, identity);
+}
+
 function hasLocalDeleteCascadeEdits(db: Database, event: StoredEvent, sourceBranch: string): boolean {
   if (hasLocalEntityEdits(db, event.entity_kind, event.entity_id, sourceBranch)) {
     return true;
@@ -869,6 +1043,7 @@ function applyCreate(db: Database, event: StoredEvent, fields: Record<string, un
   const sourceKind = validateRequiredStringField(fields, "source_kind");
   const dependsOnId = validateRequiredStringField(fields, "depends_on_id");
   const dependsOnKind = validateRequiredStringField(fields, "depends_on_kind");
+  const dependencyId = validateRequiredStringField(fields, "dependency_id") ?? event.entity_id;
 
   if (!sourceId || !sourceKind || !dependsOnId || !dependsOnKind) {
     return false;
@@ -891,13 +1066,12 @@ function applyCreate(db: Database, event: StoredEvent, fields: Record<string, un
       version
     ) VALUES (?, ?, ?, ?, ?, ?, ?, 1)
     ON CONFLICT(source_id, depends_on_id) DO UPDATE SET
-      id = excluded.id,
       source_kind = excluded.source_kind,
       depends_on_kind = excluded.depends_on_kind,
       updated_at = excluded.updated_at,
       version = dependencies.version + 1;
     `,
-  ).run(event.entity_id, sourceId, sourceKind, dependsOnId, dependsOnKind, now, now);
+  ).run(dependencyId, sourceId, sourceKind, dependsOnId, dependsOnKind, now, now);
 
   return true;
 }
@@ -1242,8 +1416,8 @@ export function syncPull(cwd: string, sourceBranch: string): PullSummary {
           }
 
           const isDeleteWithLocalEdits =
-            incoming.operation.endsWith(".deleted") &&
-            hasLocalDeleteCascadeEdits(storage.db, incoming, sourceBranch);
+            (incoming.operation.endsWith(".deleted") && hasLocalDeleteCascadeEdits(storage.db, incoming, sourceBranch)) ||
+            (incoming.operation === "dependency.removed" && hasLocalDependencyDeleteConflict(storage.db, incoming, sourceBranch));
           if (isDeleteWithLocalEdits) {
             createConflict(storage.db, incoming, "__delete__", null, "Entity deleted on source branch");
             createdConflicts += 1;
@@ -1258,6 +1432,11 @@ export function syncPull(cwd: string, sourceBranch: string): PullSummary {
           let withheldConflictCount = 0;
 
           for (const [fieldName, value] of Object.entries(payload.fields)) {
+            if (SYNC_EVENT_METADATA_FIELDS.has(fieldName)) {
+              fieldsToApply[fieldName] = value;
+              continue;
+            }
+
             const conflict = entityFieldConflict(storage.db, sourceBranch, incoming, fieldName, value);
 
             if (conflict) {