trekoon 0.1.5 → 0.1.7

package/src/sync/types.ts

@@ -1,4 +1,5 @@
 export type SyncResolution = "ours" | "theirs";
+export type SyncConflictMode = "pending" | "all";
 
 export interface GitContextSnapshot {
   readonly worktreePath: string;
@@ -20,6 +21,15 @@ export interface PullSummary {
   readonly appliedEvents: number;
   readonly createdConflicts: number;
   readonly cursorToken: string | null;
+  readonly diagnostics: SyncPullDiagnostics;
+}
+
+export interface SyncPullDiagnostics {
+  readonly malformedPayloadEvents: number;
+  readonly applyRejectedEvents: number;
+  readonly quarantinedEvents: number;
+  readonly conflictEvents: number;
+  readonly errorHints: readonly string[];
 }
 
 export interface ResolveSummary {
@@ -29,3 +39,37 @@ export interface ResolveSummary {
   readonly entityId: string;
   readonly fieldName: string;
 }
+
+export interface SyncConflictListItem {
+  readonly id: string;
+  readonly event_id: string;
+  readonly entity_kind: string;
+  readonly entity_id: string;
+  readonly field_name: string;
+  readonly ours_value: string | null;
+  readonly theirs_value: string | null;
+  readonly resolution: string;
+  readonly created_at: number;
+  readonly updated_at: number;
+}
+
+export interface SyncConflictDetail {
+  readonly id: string;
+  readonly eventId: string;
+  readonly entityKind: string;
+  readonly entityId: string;
+  readonly fieldName: string;
+  readonly oursValue: unknown;
+  readonly theirsValue: unknown;
+  readonly resolution: string;
+  readonly createdAt: number;
+  readonly updatedAt: number;
+  readonly event: {
+    readonly id: string;
+    readonly operation: string;
+    readonly payload: string;
+    readonly git_branch: string | null;
+    readonly git_head: string | null;
+    readonly created_at: number;
+  } | null;
+}