@stoneforge/quarry 0.1.0

package/dist/sync/merge.d.ts

@@ -0,0 +1,80 @@
+/**
+ * Merge Strategy - Conflict resolution for sync operations
+ *
+ * Implements Last-Write-Wins (LWW) strategy with special handling for:
+ * - Tombstones (soft deletes)
+ * - Status fields (closed wins over open)
+ * - Tags (set union merge)
+ * - Dependencies (removal is authoritative)
+ */
+import type { Element, Dependency } from '@stoneforge/core';
+import { MergeResolution, TombstoneStatus, type ConflictRecord, type DependencyConflictRecord } from './types.js';
+/**
+ * Merge result for elements
+ */
+export interface ElementMergeResult {
+    /** The winning element */
+    element: Element;
+    /** How the merge was resolved */
+    resolution: MergeResolution;
+    /** Whether local element was modified */
+    localModified: boolean;
+    /** Conflict record if there was a conflict */
+    conflict?: ConflictRecord;
+}
+/**
+ * Merge two versions of an element using Last-Write-Wins strategy
+ *
+ * Special cases:
+ * - Identical content hash: Skip (no conflict)
+ * - Tombstone handling: Fresh tombstone wins over live
+ * - Status merge: Closed wins over open states
+ * - Tags merge: Union of both tag sets
+ *
+ * @param local - Local element
+ * @param remote - Remote element (from import)
+ * @param tombstoneTtl - Tombstone TTL in milliseconds (default: 30 days)
+ * @returns Merge result
+ */
+export declare function mergeElements(local: Element, remote: Element, tombstoneTtl?: number): ElementMergeResult;
+/**
+ * Get tombstone status for an element
+ */
+export declare function getTombstoneStatus(element: Element, ttlMs: number): TombstoneStatus;
+/**
+ * Merge two tag arrays using set union
+ * Never loses a tag in merge
+ *
+ * @param localTags - Local tags
+ * @param remoteTags - Remote tags
+ * @returns Merged tags (sorted for determinism)
+ */
+export declare function mergeTags(localTags: string[], remoteTags: string[]): string[];
+/**
+ * Dependency merge result
+ */
+export interface DependencyMergeResult {
+    /** Dependencies to keep */
+    keep: Dependency[];
+    /** Dependencies that were added */
+    added: Dependency[];
+    /** Dependencies that were removed */
+    removed: Dependency[];
+    /** Conflict records */
+    conflicts: DependencyConflictRecord[];
+}
+/**
+ * Merge dependencies between local and remote
+ *
+ * Rules:
+ * - Removal is authoritative (if one side removed, it's removed)
+ * - Additions from both sides kept
+ * - No duplicate dependencies
+ *
+ * @param localDeps - Local dependencies
+ * @param remoteDeps - Remote dependencies
+ * @param originalDeps - Original dependencies (baseline for detecting removals)
+ * @returns Merge result
+ */
+export declare function mergeDependencies(localDeps: Dependency[], remoteDeps: Dependency[], originalDeps?: Dependency[]): DependencyMergeResult;
+//# sourceMappingURL=merge.d.ts.map

package/dist/sync/merge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../src/sync/merge.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAkB,MAAM,kBAAkB,CAAC;AAE5E,OAAO,EACL,eAAe,EACf,eAAe,EACf,KAAK,cAAc,EACnB,KAAK,wBAAwB,EAC9B,MAAM,YAAY,CAAC;AAOpB;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,0BAA0B;IAC1B,OAAO,EAAE,OAAO,CAAC;IACjB,iCAAiC;IACjC,UAAU,EAAE,eAAe,CAAC;IAC5B,yCAAyC;IACzC,aAAa,EAAE,OAAO,CAAC;IACvB,8CAA8C;IAC9C,QAAQ,CAAC,EAAE,cAAc,CAAC;CAC3B;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,aAAa,CAC3B,KAAK,EAAE,OAAO,EACd,MAAM,EAAE,OAAO,EACf,YAAY,GAAE,MAAiC,GAC9C,kBAAkB,CAgDpB;AA0DD;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,eAAe,CAenF;AA2ED;;;;;;;GAOG;AACH,wBAAgB,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAG7E;AAMD;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,2BAA2B;IAC3B,IAAI,EAAE,UAAU,EAAE,CAAC;IACnB,mCAAmC;IACnC,KAAK,EAAE,UAAU,EAAE,CAAC;IACpB,qCAAqC;IACrC,OAAO,EAAE,UAAU,EAAE,CAAC;IACtB,uBAAuB;IACvB,SAAS,EAAE,wBAAwB,EAAE,CAAC;CACvC;AASD;;;;;;;;;;;;GAYG;AACH,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,UAAU,EAAE,EACvB,UAAU,EAAE,UAAU,EAAE,EACxB,YAAY,GAAE,UAAU,EAAO,GAC9B,qBAAqB,CAkEvB"}

package/dist/sync/merge.js

@@ -0,0 +1,310 @@
+/**
+ * Merge Strategy - Conflict resolution for sync operations
+ *
+ * Implements Last-Write-Wins (LWW) strategy with special handling for:
+ * - Tombstones (soft deletes)
+ * - Status fields (closed wins over open)
+ * - Tags (set union merge)
+ * - Dependencies (removal is authoritative)
+ */
+import { createTimestamp } from '@stoneforge/core';
+import { MergeResolution, TombstoneStatus, } from './types.js';
+import { computeContentHashSync } from './hash.js';
+/**
+ * Merge two versions of an element using Last-Write-Wins strategy
+ *
+ * Special cases:
+ * - Identical content hash: Skip (no conflict)
+ * - Tombstone handling: Fresh tombstone wins over live
+ * - Status merge: Closed wins over open states
+ * - Tags merge: Union of both tag sets
+ *
+ * @param local - Local element
+ * @param remote - Remote element (from import)
+ * @param tombstoneTtl - Tombstone TTL in milliseconds (default: 30 days)
+ * @returns Merge result
+ */
+export function mergeElements(local, remote, tombstoneTtl = 30 * 24 * 60 * 60 * 1000) {
+    // Compute content hashes
+    const localHash = computeContentHashSync(local);
+    const remoteHash = computeContentHashSync(remote);
+    // Same content - no conflict
+    if (localHash.hash === remoteHash.hash) {
+        return {
+            element: local,
+            resolution: MergeResolution.IDENTICAL,
+            localModified: false,
+        };
+    }
+    // Get tombstone status for both
+    const localTombstone = getTombstoneStatus(local, tombstoneTtl);
+    const remoteTombstone = getTombstoneStatus(remote, tombstoneTtl);
+    // Apply tombstone merge rules
+    const tombstoneResolution = resolveTombstoneConflict(localTombstone, remoteTombstone);
+    if (tombstoneResolution !== null) {
+        const winner = tombstoneResolution === 'local' ? local : remote;
+        const resolution = tombstoneResolution === 'local' ? MergeResolution.LOCAL_WINS : MergeResolution.REMOTE_WINS;
+        return {
+            element: winner,
+            resolution,
+            localModified: tombstoneResolution === 'remote',
+            conflict: createConflictRecord(local, remote, localHash.hash, remoteHash.hash, resolution),
+        };
+    }
+    // Both are live elements - apply LWW with special handling
+    const merged = mergeLiveElements(local, remote);
+    return {
+        element: merged.element,
+        resolution: merged.resolution,
+        localModified: merged.resolution !== MergeResolution.LOCAL_WINS,
+        conflict: createConflictRecord(local, remote, localHash.hash, remoteHash.hash, merged.resolution),
+    };
+}
+/**
+ * Merge two live (non-tombstone) elements
+ */
+function mergeLiveElements(local, remote) {
+    // Apply status merge rules first
+    const statusResolution = resolveStatusConflict(local, remote);
+    if (statusResolution !== null) {
+        return {
+            element: statusResolution === 'local' ? local : remote,
+            resolution: statusResolution === 'local' ? MergeResolution.LOCAL_WINS : MergeResolution.REMOTE_WINS,
+        };
+    }
+    // LWW by updatedAt timestamp
+    const localTime = new Date(local.updatedAt).getTime();
+    const remoteTime = new Date(remote.updatedAt).getTime();
+    if (localTime >= remoteTime) {
+        // Local wins - but merge tags
+        const mergedTags = mergeTags(local.tags, remote.tags);
+        if (arraysEqual(mergedTags, local.tags)) {
+            return {
+                element: local,
+                resolution: MergeResolution.LOCAL_WINS,
+            };
+        }
+        // Tags were merged
+        return {
+            element: { ...local, tags: mergedTags },
+            resolution: MergeResolution.TAGS_MERGED,
+        };
+    }
+    // Remote wins - but merge tags
+    const mergedTags = mergeTags(local.tags, remote.tags);
+    if (arraysEqual(mergedTags, remote.tags)) {
+        return {
+            element: remote,
+            resolution: MergeResolution.REMOTE_WINS,
+        };
+    }
+    // Tags were merged
+    return {
+        element: { ...remote, tags: mergedTags },
+        resolution: MergeResolution.TAGS_MERGED,
+    };
+}
+// ============================================================================
+// Tombstone Handling
+// ============================================================================
+/**
+ * Get tombstone status for an element
+ */
+export function getTombstoneStatus(element, ttlMs) {
+    // Check for deletedAt field (tombstone marker)
+    const record = element;
+    const deletedAt = record.deletedAt;
+    if (!deletedAt || typeof deletedAt !== 'string') {
+        return TombstoneStatus.LIVE;
+    }
+    // Check if within TTL
+    const deletedTime = new Date(deletedAt).getTime();
+    const now = Date.now();
+    const age = now - deletedTime;
+    return age <= ttlMs ? TombstoneStatus.FRESH : TombstoneStatus.EXPIRED;
+}
+/**
+ * Resolve conflict between elements with different tombstone statuses
+ *
+ * @returns 'local', 'remote', or null if both live/need further resolution
+ */
+function resolveTombstoneConflict(local, remote) {
+    // Both live - no tombstone conflict
+    if (local === TombstoneStatus.LIVE && remote === TombstoneStatus.LIVE) {
+        return null;
+    }
+    // Fresh tombstone wins over live
+    if (local === TombstoneStatus.FRESH && remote === TombstoneStatus.LIVE) {
+        return 'local';
+    }
+    if (remote === TombstoneStatus.FRESH && local === TombstoneStatus.LIVE) {
+        return 'remote';
+    }
+    // Expired tombstone loses to live
+    if (local === TombstoneStatus.EXPIRED && remote === TombstoneStatus.LIVE) {
+        return 'remote';
+    }
+    if (remote === TombstoneStatus.EXPIRED && local === TombstoneStatus.LIVE) {
+        return 'local';
+    }
+    // Both tombstones - later deletedAt wins (handled by LWW in caller)
+    return null;
+}
+// ============================================================================
+// Status Merge
+// ============================================================================
+/**
+ * Resolve status conflict - closed always wins over open states
+ *
+ * @returns 'local', 'remote', or null if no status-based resolution
+ */
+function resolveStatusConflict(local, remote) {
+    const localStatus = local.status;
+    const remoteStatus = remote.status;
+    // Only applies to elements with status
+    if (typeof localStatus !== 'string' || typeof remoteStatus !== 'string') {
+        return null;
+    }
+    const closedStatuses = ['closed', 'tombstone'];
+    const localClosed = closedStatuses.includes(localStatus);
+    const remoteClosed = closedStatuses.includes(remoteStatus);
+    // Closed wins over open
+    if (localClosed && !remoteClosed) {
+        return 'local';
+    }
+    if (remoteClosed && !localClosed) {
+        return 'remote';
+    }
+    // Both same state - no status-based resolution
+    return null;
+}
+// ============================================================================
+// Tags Merge
+// ============================================================================
+/**
+ * Merge two tag arrays using set union
+ * Never loses a tag in merge
+ *
+ * @param localTags - Local tags
+ * @param remoteTags - Remote tags
+ * @returns Merged tags (sorted for determinism)
+ */
+export function mergeTags(localTags, remoteTags) {
+    const merged = new Set([...localTags, ...remoteTags]);
+    return [...merged].sort();
+}
+/**
+ * Dependency key for comparison
+ */
+function getDependencyKey(dep) {
+    return `${dep.blockedId}|${dep.blockerId}|${dep.type}`;
+}
+/**
+ * Merge dependencies between local and remote
+ *
+ * Rules:
+ * - Removal is authoritative (if one side removed, it's removed)
+ * - Additions from both sides kept
+ * - No duplicate dependencies
+ *
+ * @param localDeps - Local dependencies
+ * @param remoteDeps - Remote dependencies
+ * @param originalDeps - Original dependencies (baseline for detecting removals)
+ * @returns Merge result
+ */
+export function mergeDependencies(localDeps, remoteDeps, originalDeps = []) {
+    const localMap = new Map(localDeps.map((d) => [getDependencyKey(d), d]));
+    const remoteMap = new Map(remoteDeps.map((d) => [getDependencyKey(d), d]));
+    const originalMap = new Map(originalDeps.map((d) => [getDependencyKey(d), d]));
+    const keep = [];
+    const added = [];
+    const removed = [];
+    const conflicts = [];
+    // Track all keys
+    const allKeys = new Set([...localMap.keys(), ...remoteMap.keys()]);
+    for (const key of allKeys) {
+        const local = localMap.get(key);
+        const remote = remoteMap.get(key);
+        const original = originalMap.get(key);
+        if (local && remote) {
+            // Both have it - keep (prefer remote if different for consistency)
+            keep.push(remote);
+        }
+        else if (local && !remote) {
+            // Only local has it
+            if (original) {
+                // Was in original, remote removed it - honor removal
+                removed.push(local);
+                conflicts.push({
+                    blockedId: local.blockedId,
+                    blockerId: local.blockerId,
+                    type: local.type,
+                    resolution: 'removed',
+                    resolvedAt: createTimestamp(),
+                });
+            }
+            else {
+                // New in local - keep
+                keep.push(local);
+                added.push(local);
+            }
+        }
+        else if (!local && remote) {
+            // Only remote has it
+            if (original) {
+                // Was in original, local removed it - honor removal
+                removed.push(remote);
+                conflicts.push({
+                    blockedId: remote.blockedId,
+                    blockerId: remote.blockerId,
+                    type: remote.type,
+                    resolution: 'removed',
+                    resolvedAt: createTimestamp(),
+                });
+            }
+            else {
+                // New in remote - add
+                keep.push(remote);
+                added.push(remote);
+                conflicts.push({
+                    blockedId: remote.blockedId,
+                    blockerId: remote.blockerId,
+                    type: remote.type,
+                    resolution: 'added',
+                    resolvedAt: createTimestamp(),
+                });
+            }
+        }
+    }
+    return { keep, added, removed, conflicts };
+}
+// ============================================================================
+// Helpers
+// ============================================================================
+/**
+ * Create a conflict record
+ */
+function createConflictRecord(local, remote, localHash, remoteHash, resolution) {
+    return {
+        elementId: local.id,
+        localHash,
+        remoteHash,
+        resolution,
+        localUpdatedAt: local.updatedAt,
+        remoteUpdatedAt: remote.updatedAt,
+        resolvedAt: createTimestamp(),
+    };
+}
+/**
+ * Check if two string arrays are equal (order-sensitive)
+ */
+function arraysEqual(a, b) {
+    if (a.length !== b.length)
+        return false;
+    for (let i = 0; i < a.length; i++) {
+        if (a[i] !== b[i])
+            return false;
+    }
+    return true;
+}
+//# sourceMappingURL=merge.js.map

package/dist/sync/merge.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../src/sync/merge.ts"],"names":[],"mappings":"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"}

package/dist/sync/serialization.d.ts

@@ -0,0 +1,132 @@
+/**
+ * Sync Serialization - JSONL format serialization and parsing
+ *
+ * Handles conversion between Element/Dependency objects and JSONL format.
+ * All timestamps are normalized to ISO 8601 format.
+ */
+import type { Element, Dependency } from '@stoneforge/core';
+import type { SerializedElement, SerializedDependency } from './types.js';
+/**
+ * Serialize an element to JSONL format
+ *
+ * @param element - Element to serialize
+ * @returns JSON string ready for JSONL file
+ */
+export declare function serializeElement(element: Element): string;
+/**
+ * Parse a JSONL line into an element
+ *
+ * @param line - JSON string from JSONL file
+ * @returns Parsed element
+ * @throws ValidationError if parsing fails
+ */
+export declare function parseElement(line: string): Element;
+/**
+ * Try to parse a JSONL line into an element
+ *
+ * @param line - JSON string from JSONL file
+ * @returns Parsed element or null if invalid
+ */
+export declare function tryParseElement(line: string): Element | null;
+/**
+ * Serialize a dependency to JSONL format
+ *
+ * @param dependency - Dependency to serialize
+ * @returns JSON string ready for JSONL file
+ */
+export declare function serializeDependency(dependency: Dependency): string;
+/**
+ * Parse a JSONL line into a dependency
+ *
+ * @param line - JSON string from JSONL file
+ * @returns Parsed dependency
+ * @throws ValidationError if parsing fails
+ */
+export declare function parseDependency(line: string): Dependency;
+/**
+ * Try to parse a JSONL line into a dependency
+ *
+ * @param line - JSON string from JSONL file
+ * @returns Parsed dependency or null if invalid
+ */
+export declare function tryParseDependency(line: string): Dependency | null;
+/**
+ * Serialize multiple elements to JSONL content
+ *
+ * @param elements - Elements to serialize
+ * @returns JSONL content (multiple lines)
+ */
+export declare function serializeElements(elements: Element[]): string;
+/**
+ * Serialize multiple dependencies to JSONL content
+ *
+ * @param dependencies - Dependencies to serialize
+ * @returns JSONL content (multiple lines)
+ */
+export declare function serializeDependencies(dependencies: Dependency[]): string;
+/**
+ * Parse JSONL content into elements
+ *
+ * @param content - JSONL content (multiple lines)
+ * @returns Array of parsed elements and any errors
+ */
+export declare function parseElements(content: string): {
+    elements: Element[];
+    errors: ParseError[];
+};
+/**
+ * Parse JSONL content into dependencies
+ *
+ * @param content - JSONL content (multiple lines)
+ * @returns Array of parsed dependencies and any errors
+ */
+export declare function parseDependencies(content: string): {
+    dependencies: Dependency[];
+    errors: ParseError[];
+};
+/**
+ * Parse error info
+ */
+export interface ParseError {
+    /** Line number (1-indexed) */
+    line: number;
+    /** Error message */
+    message: string;
+    /** Truncated line content */
+    content: string;
+}
+/**
+ * Sort elements for export ordering
+ *
+ * Order by:
+ * 1. Type (entities first for references)
+ * 2. Creation time
+ * 3. ID (for stability)
+ *
+ * @param elements - Elements to sort
+ * @returns Sorted elements (new array)
+ */
+export declare function sortElementsForExport(elements: Element[]): Element[];
+/**
+ * Sort dependencies for export ordering
+ *
+ * Order by:
+ * 1. Creation time
+ * 2. Blocked ID
+ * 3. Blocker ID
+ * 4. Type (for stability)
+ *
+ * @param dependencies - Dependencies to sort
+ * @returns Sorted dependencies (new array)
+ */
+export declare function sortDependenciesForExport(dependencies: Dependency[]): Dependency[];
+/**
+ * Check if an object looks like a serialized element
+ * (less strict than isElement, for initial parsing)
+ */
+export declare function isSerializedElement(value: unknown): value is SerializedElement;
+/**
+ * Check if an object looks like a serialized dependency
+ */
+export declare function isSerializedDependency(value: unknown): value is SerializedDependency;
+//# sourceMappingURL=serialization.d.ts.map

package/dist/sync/serialization.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"serialization.d.ts","sourceRoot":"","sources":["../../src/sync/serialization.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE5D,OAAO,KAAK,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAO1E;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAuBzD;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAsBlD;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,IAAI,CAM5D;AAMD;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAwBlE;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,CA8BxD;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI,CAMlE;AAMD;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,CAE7D;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,UAAU,EAAE,GAAG,MAAM,CAExE;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG;IAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;IAAC,MAAM,EAAE,UAAU,EAAE,CAAA;CAAE,CAmB5F;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG;IAClD,YAAY,EAAE,UAAU,EAAE,CAAC;IAC3B,MAAM,EAAE,UAAU,EAAE,CAAC;CACtB,CAmBA;AAED;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,8BAA8B;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,oBAAoB;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,6BAA6B;IAC7B,OAAO,EAAE,MAAM,CAAC;CACjB;AAMD;;;;;;;;;;GAUG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE,CAapE;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,yBAAyB,CAAC,YAAY,EAAE,UAAU,EAAE,GAAG,UAAU,EAAE,CAiBlF;AAMD;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,iBAAiB,CAkB9E;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,oBAAoB,CAepF"}