trekoon 0.3.3 → 0.3.4

package/src/sync/service.ts

@@ -4,9 +4,11 @@ import { type Database } from "bun:sqlite";
 
 import { openTrekoonDatabase, writeTransaction } from "../storage/database";
 import { countBranchEventsSince, queryBranchEventsSince } from "./branch-db";
+import { nextEventTimestamp } from "./event-writes";
 import { persistGitContext, resolveGitContext } from "./git-context";
 import {
   type PullSummary,
+  type ResolvePreviewSummary,
   type ResolveSummary,
   type SyncConflictDetail,
   type SyncConflictListItem,
@@ -15,6 +17,13 @@ import {
   type SyncStatusSummary,
 } from "./types";
 
+const SYNC_ALLOWED_FIELDS: Readonly<Record<string, readonly string[]>> = {
+  epics: ["title", "description", "status"],
+  tasks: ["epic_id", "title", "description", "status"],
+  subtasks: ["task_id", "title", "description", "status"],
+  dependencies: ["source_id", "source_kind", "depends_on_id", "depends_on_kind"],
+};
+
 function isCursorStale(db: Database, cursorToken: string, sourceBranch: string): boolean {
   if (cursorToken === "0:") {
     return false;
@@ -301,14 +310,7 @@ function currentEntityFieldValue(db: Database, entityKind: string, entityId: str
     return undefined;
   }
 
-  const allowedFields: Record<string, readonly string[]> = {
-    epics: ["title", "description", "status"],
-    tasks: ["epic_id", "title", "description", "status"],
-    subtasks: ["task_id", "title", "description", "status"],
-    dependencies: ["source_id", "source_kind", "depends_on_id", "depends_on_kind"],
-  };
-
-  const validFields = allowedFields[tableName] ?? [];
+  const validFields = SYNC_ALLOWED_FIELDS[tableName] ?? [];
   if (!validFields.includes(fieldName)) {
     return undefined;
   }
@@ -564,18 +566,11 @@ function applyUpdatePatch(db: Database, event: StoredEvent, fields: Record<strin
     return false;
   }
 
-  const allowedFields: Record<string, readonly string[]> = {
-    epics: ["title", "description", "status"],
-    tasks: ["epic_id", "title", "description", "status"],
-    subtasks: ["task_id", "title", "description", "status"],
-    dependencies: ["source_id", "source_kind", "depends_on_id", "depends_on_kind"],
-  };
-
   if (!rowExists(db, tableName, event.entity_id)) {
     return false;
   }
 
-  const allowed = new Set(allowedFields[tableName] ?? []);
+  const allowed = new Set(SYNC_ALLOWED_FIELDS[tableName] ?? []);
   const entries = Object.entries(fields).filter(([fieldName, value]) => allowed.has(fieldName) && typeof value === "string");
 
   if (entries.length === 0) {
@@ -905,7 +900,7 @@ export function syncPull(cwd: string, sourceBranch: string): PullSummary {
 }
 
 function parseConflictValue(value: string | null): unknown {
-  if (!value) {
+  if (value === null || value === undefined) {
     return null;
   }
 
@@ -922,14 +917,7 @@ function updateSingleField(db: Database, entityKind: string, entityId: string, f
     return;
   }
 
-  const allowedFields: Record<string, readonly string[]> = {
-    epics: ["title", "description", "status"],
-    tasks: ["epic_id", "title", "description", "status"],
-    subtasks: ["task_id", "title", "description", "status"],
-    dependencies: ["source_id", "source_kind", "depends_on_id", "depends_on_kind"],
-  };
-
-  const validFields: readonly string[] = allowedFields[tableName] ?? [];
+  const validFields: readonly string[] = SYNC_ALLOWED_FIELDS[tableName] ?? [];
   if (!validFields.includes(fieldName)) {
     return;
   }
@@ -948,8 +936,9 @@ function appendResolutionEvent(
   gitHead: string | null,
   conflict: ConflictRow,
   resolution: SyncResolution,
+  timestamp?: number,
 ): void {
-  const now: number = Date.now();
+  const now: number = timestamp ?? nextEventTimestamp(db);
   const resolvedValue: string | null = resolution === "theirs" ? conflict.theirs_value : conflict.ours_value;
 
   db.query(
@@ -1061,6 +1050,29 @@ export function getSyncConflict(cwd: string, conflictId: string): SyncConflictDe
   }
 }
 
+function lookupPendingConflict(db: Database, conflictId: string): ConflictRow {
+  const conflict = db
+    .query(
+      `
+      SELECT id, event_id, entity_kind, entity_id, field_name, ours_value, theirs_value, resolution, created_at, updated_at
+      FROM sync_conflicts
+      WHERE id = ?
+      LIMIT 1;
+      `,
+    )
+    .get(conflictId) as ConflictRow | null;
+
+  if (!conflict) {
+    throw new Error(`Conflict '${conflictId}' not found.`);
+  }
+
+  if (conflict.resolution !== "pending") {
+    throw new Error(`Conflict '${conflictId}' already resolved.`);
+  }
+
+  return conflict;
+}
+
 export function syncResolve(cwd: string, conflictId: string, resolution: SyncResolution): ResolveSummary {
   const storage = openTrekoonDatabase(cwd);
   const git = resolveGitContext(cwd);
@@ -1068,42 +1080,31 @@ export function syncResolve(cwd: string, conflictId: string, resolution: SyncRes
   try {
     persistGitContext(storage.db, git);
 
-    const conflict = storage.db
-      .query(
-        `
-        SELECT id, event_id, entity_kind, entity_id, field_name, ours_value, theirs_value, resolution, created_at, updated_at
-        FROM sync_conflicts
-        WHERE id = ?
-        LIMIT 1;
-        `,
-      )
-      .get(conflictId) as ConflictRow | null;
-
-    if (!conflict) {
-      throw new Error(`Conflict '${conflictId}' not found.`);
-    }
-
-    if (conflict.resolution !== "pending") {
-      throw new Error(`Conflict '${conflictId}' already resolved.`);
-    }
+    // lookupPendingConflict is inside the writeTransaction so that the
+    // "is this still pending?" check and the resolution mutation are
+    // atomic.  Without this, two concurrent resolves could both pass
+    // the check and double-resolve the same conflict.
+    const conflict = writeTransaction(storage.db, (): ConflictRow => {
+      const row = lookupPendingConflict(storage.db, conflictId);
 
-    writeTransaction(storage.db, (): void => {
       if (resolution === "theirs") {
         updateSingleField(
           storage.db,
-          conflict.entity_kind,
-          conflict.entity_id,
-          conflict.field_name,
-          parseConflictValue(conflict.theirs_value),
+          row.entity_kind,
+          row.entity_id,
+          row.field_name,
+          parseConflictValue(row.theirs_value),
         );
       }
 
-      const now: number = Date.now();
+      const now: number = nextEventTimestamp(storage.db);
       storage.db
         .query("UPDATE sync_conflicts SET resolution = ?, updated_at = ?, version = version + 1 WHERE id = ?;")
-        .run(resolution, now, conflict.id);
+        .run(resolution, now, row.id);
+
+      appendResolutionEvent(storage.db, git.branchName, git.headSha, row, resolution, now);
 
-      appendResolutionEvent(storage.db, git.branchName, git.headSha, conflict, resolution);
+      return row;
     });
 
     return {
@@ -1117,3 +1118,30 @@ export function syncResolve(cwd: string, conflictId: string, resolution: SyncRes
     storage.close();
   }
 }
+
+// Preview is read-only — no git context persistence needed.
+export function syncResolvePreview(cwd: string, conflictId: string, resolution: SyncResolution): ResolvePreviewSummary {
+  const storage = openTrekoonDatabase(cwd);
+
+  try {
+    const conflict = lookupPendingConflict(storage.db, conflictId);
+
+    const oursValue: unknown = parseConflictValue(conflict.ours_value);
+    const theirsValue: unknown = parseConflictValue(conflict.theirs_value);
+    const wouldWrite: unknown = resolution === "theirs" ? theirsValue : oursValue;
+
+    return {
+      conflictId,
+      resolution,
+      entityKind: conflict.entity_kind,
+      entityId: conflict.entity_id,
+      fieldName: conflict.field_name,
+      oursValue,
+      theirsValue,
+      wouldWrite,
+      dryRun: true,
+    };
+  } finally {
+    storage.close();
+  }
+}

package/src/sync/types.ts

@@ -43,6 +43,18 @@ export interface ResolveSummary {
   readonly fieldName: string;
 }
 
+export interface ResolvePreviewSummary {
+  readonly conflictId: string;
+  readonly resolution: SyncResolution;
+  readonly entityKind: string;
+  readonly entityId: string;
+  readonly fieldName: string;
+  readonly oursValue: unknown;
+  readonly theirsValue: unknown;
+  readonly wouldWrite: unknown;
+  readonly dryRun: true;
+}
+
 export interface SyncConflictListItem {
   readonly id: string;
   readonly event_id: string;