@sudocode-ai/cli 0.1.16 → 0.1.18-dev.0

package/dist/merge-resolver.js

@@ -7,6 +7,8 @@
  * - Metadata merging (relationships, tags)
  */
 import * as fs from "fs";
+import { toYaml, fromYaml } from "./yaml-converter.js";
+import { mergeYamlContent } from "./git-merge.js";
 /**
  * Check if file contains git conflict markers
  */
@@ -135,6 +137,9 @@ function generateConflictId(originalId, uuid) {
 }
 /**
  * Merge metadata from multiple versions of same entity
+ *
+ * USE FOR: Two-way merge scenarios (manual conflict resolution)
+ * Merges both array fields (union) and scalar fields (latest-wins)
  */
 export function mergeMetadata(entities) {
     // Sort by updated_at, keep most recent as base
@@ -182,9 +187,114 @@ export function mergeMetadata(entities) {
     }
     return base;
 }
+/**
+ * Merge ONLY array fields from multiple versions (union semantics)
+ *
+ * USE FOR: Three-way merge scenarios (git merge driver)
+ * Only merges array fields (relationships, tags, feedback)
+ * Scalar fields (status, priority, title, etc.) are NOT merged
+ *
+ * This allows git merge-file to see actual differences in scalar fields
+ * for proper three-way merge semantics.
+ */
+export function mergeArrayFields(entities) {
+    const result = {};
+    // Merge relationships (union of unique)
+    const relationshipSet = new Set();
+    for (const entity of entities) {
+        if (entity.relationships) {
+            for (const rel of entity.relationships) {
+                relationshipSet.add(JSON.stringify(rel));
+            }
+        }
+    }
+    if (relationshipSet.size > 0) {
+        result.relationships = Array.from(relationshipSet).map((r) => JSON.parse(r));
+    }
+    // Merge tags (union of unique)
+    const tagSet = new Set();
+    for (const entity of entities) {
+        if (entity.tags) {
+            for (const tag of entity.tags) {
+                tagSet.add(tag);
+            }
+        }
+    }
+    if (tagSet.size > 0) {
+        result.tags = Array.from(tagSet);
+    }
+    // Merge feedback if present (union of unique by id)
+    const hasFeedback = entities.some((e) => e.feedback);
+    if (hasFeedback) {
+        const feedbackMap = new Map();
+        for (const entity of entities) {
+            if (entity.feedback) {
+                for (const fb of entity.feedback) {
+                    if (!feedbackMap.has(fb.id)) {
+                        feedbackMap.set(fb.id, fb);
+                    }
+                }
+            }
+        }
+        if (feedbackMap.size > 0) {
+            result.feedback = Array.from(feedbackMap.values());
+        }
+    }
+    return result;
+}
+/**
+ * Resolve git conflict markers in YAML content using latest-wins per block
+ *
+ * When git merge-file produces conflicts in YAML, this function resolves
+ * each conflict block individually while preserving cleanly merged sections.
+ *
+ * @param yamlWithConflicts - YAML content containing git conflict markers
+ * @param useOurs - If true, use "ours" side for conflicts; if false, use "theirs"
+ * @returns Resolved YAML content without conflict markers
+ *
+ * @example
+ * ```typescript
+ * const yaml = `title: test
+ * <<<<<<< ours
+ * content: ours text
+ * =======
+ * content: theirs text
+ * >>>>>>> theirs
+ * priority: 3`;
+ *
+ * const resolved = resolveYamlConflicts(yaml, true);
+ * // Returns: "title: test\ncontent: ours text\npriority: 3"
+ * ```
+ */
+export function resolveYamlConflicts(yamlWithConflicts, useOurs) {
+    const sections = parseMergeConflictFile(yamlWithConflicts);
+    const resolved = [];
+    for (const section of sections) {
+        if (section.type === 'clean') {
+            // Keep cleanly merged content
+            resolved.push(...section.lines);
+        }
+        else {
+            // Conflict block - apply latest-wins
+            const chosen = useOurs ? section.ours : section.theirs;
+            resolved.push(...chosen);
+        }
+    }
+    return resolved.join('\n');
+}
 /**
  * Resolve all entities using UUID-based deduplication
  * Handles different UUIDs, same UUID conflicts, and metadata merging
+ *
+ * USE CASE: TWO-WAY MERGE
+ * - Manual conflict resolution (sudocode resolve-conflicts)
+ * - Conflicts already isolated by git conflict markers
+ * - No base version available (git index cleared after conflict)
+ * - Simple UUID deduplication is sufficient and faster
+ * - No benefit from YAML expansion overhead
+ *
+ * DO NOT USE FOR: Three-way merge with base/ours/theirs
+ * For that case, use mergeThreeWay() instead.
  */
 export function resolveEntities(entities, options = {}) {
     const stats = {
@@ -288,14 +398,319 @@ export function resolveEntities(entities, options = {}) {
     stats.totalOutput = finalResolved.length;
     return { entities: finalResolved, stats };
 }
+/**
+ * Helper function to merge entities using YAML + git merge-file for line-level merging
+ */
+function mergeYamlWithGit(versions, originalTimestamps) {
+    const { base, ours, theirs } = versions;
+    // Convert to YAML
+    const baseYaml = base ? toYaml(base) : "";
+    const oursYaml = ours ? toYaml(ours) : "";
+    const theirsYaml = theirs ? toYaml(theirs) : "";
+    // Run git merge-file for line-level merging
+    const mergeResult = mergeYamlContent({
+        base: baseYaml,
+        ours: oursYaml,
+        theirs: theirsYaml,
+    });
+    if (mergeResult.success && !mergeResult.hasConflicts) {
+        // Clean merge - parse YAML back to JSON
+        const mergedEntity = fromYaml(mergeResult.content);
+        return { success: true, entity: mergedEntity, hadConflicts: false };
+    }
+    else if (mergeResult.hasConflicts) {
+        // YAML has conflicts - resolve each conflict block individually
+        // Determine which side is newer for latest-wins decision
+        // Use original timestamps if provided (since versions may have updated_at stripped)
+        // When timestamps are identical, prefer ours for stability
+        const oursTimestamp = originalTimestamps?.ours ?? ours?.updated_at;
+        const theirsTimestamp = originalTimestamps?.theirs ?? theirs?.updated_at;
+        const oursNewer = compareTimestamps(oursTimestamp, theirsTimestamp) >= 0;
+        // Resolve conflict blocks, preserving cleanly merged sections
+        const resolvedYaml = resolveYamlConflicts(mergeResult.content, oursNewer);
+        const mergedEntity = fromYaml(resolvedYaml);
+        return { success: true, entity: mergedEntity, hadConflicts: true };
+    }
+    else {
+        // Fatal error during merge
+        return { success: false, entity: ours, hadConflicts: false };
+    }
+}
 /**
  * Three-way merge for git merge driver
- * Merges base, ours, and theirs versions
+ * Uses hybrid approach: field-level merge for scalars + line-level merge for multi-line text
+ *
+ * USE CASE: THREE-WAY MERGE
+ * - Git merge driver operations (automatic merge)
+ * - Worktree sync with true base/ours/theirs versions
+ * - Field-level merging preserves changes from either branch
+ *
+ * DO NOT USE FOR: Manual conflict resolution (use resolveEntities)
+ *
+ * This function implements true three-way merge semantics:
+ * 1. Group entities by UUID across base/ours/theirs
+ * 2. Handle deletion cases (modification wins over deletion)
+ * 3. Merge array fields FIRST (tags, relationships, feedback) with union semantics
+ * 4. Field-level three-way merge for SCALAR fields only (status, priority, etc.)
+ * 5. YAML + git merge-file for multi-line text fields (content, description)
+ * 6. Handle ID collisions (hash conflicts with .1, .2 suffixes)
+ * 7. Sort by created_at (git-friendly)
+ *
+ * Field-level three-way merge logic:
+ * - If base == ours == theirs: use any value (no changes)
+ * - If base == ours && base != theirs: use theirs (only theirs changed)
+ * - If base == theirs && base != ours: use ours (only ours changed)
+ * - If base != ours && base != theirs && ours == theirs: use either (both made same change)
+ * - If base != ours && base != theirs && ours != theirs: conflict -> latest wins
  */
 export function mergeThreeWay(base, ours, theirs) {
-    // Collect all entities from all three versions
-    const allEntities = [...base, ...ours, ...theirs];
-    // Use standard resolution logic
-    return resolveEntities(allEntities);
+    const stats = {
+        totalInput: base.length + ours.length + theirs.length,
+        totalOutput: 0,
+        conflicts: [],
+    };
+    // Step 1: Group entities by UUID across all three versions
+    const byUuid = new Map();
+    // Populate from all three versions
+    for (const entity of base) {
+        const existing = byUuid.get(entity.uuid) || {};
+        byUuid.set(entity.uuid, { ...existing, base: entity });
+    }
+    for (const entity of ours) {
+        const existing = byUuid.get(entity.uuid) || {};
+        byUuid.set(entity.uuid, { ...existing, ours: entity });
+    }
+    for (const entity of theirs) {
+        const existing = byUuid.get(entity.uuid) || {};
+        byUuid.set(entity.uuid, { ...existing, theirs: entity });
+    }
+    const mergedEntities = [];
+    // Step 2: Process each UUID group
+    for (const [uuid, versions] of Array.from(byUuid.entries())) {
+        const { base: baseEntity, ours: oursEntity, theirs: theirsEntity } = versions;
+        // Step 2a: Handle deletion cases
+        // Deleted in both → skip
+        if (!oursEntity && !theirsEntity) {
+            continue;
+        }
+        // Deleted in theirs, modified in ours → modification wins
+        if (baseEntity && !theirsEntity && oursEntity) {
+            mergedEntities.push(oursEntity);
+            stats.conflicts.push({
+                type: "same-uuid-same-id",
+                uuid,
+                originalIds: [baseEntity.id],
+                resolvedIds: [oursEntity.id],
+                action: `Kept ours (deleted in theirs, modified in ours)`,
+            });
+            continue;
+        }
+        // Deleted in ours, modified in theirs → modification wins
+        if (baseEntity && !oursEntity && theirsEntity) {
+            mergedEntities.push(theirsEntity);
+            stats.conflicts.push({
+                type: "same-uuid-same-id",
+                uuid,
+                originalIds: [baseEntity.id],
+                resolvedIds: [theirsEntity.id],
+                action: `Kept theirs (deleted in ours, modified in theirs)`,
+            });
+            continue;
+        }
+        // Added in only one side (no base)
+        if (!baseEntity && oursEntity && !theirsEntity) {
+            mergedEntities.push(oursEntity);
+            continue;
+        }
+        if (!baseEntity && !oursEntity && theirsEntity) {
+            mergedEntities.push(theirsEntity);
+            continue;
+        }
+        // Added in both sides (no base) → use standard resolution
+        if (!baseEntity && oursEntity && theirsEntity) {
+            const resolved = resolveEntities([oursEntity, theirsEntity]);
+            mergedEntities.push(...resolved.entities);
+            stats.conflicts.push(...resolved.stats.conflicts);
+            continue;
+        }
+        // Check if IDs match - if not, this is an ID conflict
+        // In three-way merge, keep ours and theirs (they both moved from base)
+        const ids = new Set([baseEntity?.id, oursEntity?.id, theirsEntity?.id].filter(Boolean));
+        if (ids.size > 1) {
+            // IDs don't match - ID conflict
+            // Only keep ours and theirs (not base, since both sides moved away from it)
+            const versionsToResolve = [oursEntity, theirsEntity].filter((e) => e !== undefined);
+            const resolved = resolveEntities(versionsToResolve);
+            mergedEntities.push(...resolved.entities);
+            stats.conflicts.push(...resolved.stats.conflicts);
+            continue;
+        }
+        // Step 2b: Merge array fields FIRST (union semantics)
+        const versionsForMetadata = [baseEntity, oursEntity, theirsEntity].filter((e) => e !== undefined);
+        const arrayFieldsMerged = mergeArrayFields(versionsForMetadata);
+        // Step 2c: Get all fields from any of the three versions (except array fields)
+        const allFields = new Set();
+        for (const entity of [baseEntity, oursEntity, theirsEntity]) {
+            if (entity) {
+                for (const key of Object.keys(entity)) {
+                    // Skip array fields (already merged via mergeArrayFields)
+                    if (key === 'relationships' || key === 'tags' || key === 'feedback')
+                        continue;
+                    allFields.add(key);
+                }
+            }
+        }
+        // Step 2d: Perform field-level three-way merge for SCALAR fields only
+        // Multi-line text fields (content, description) will be handled by git merge-file
+        const fieldsMerged = { ...arrayFieldsMerged };
+        const scalarConflicts = [];
+        // Multi-line text fields that should go through git merge-file
+        const multiLineFields = new Set(['content', 'description']);
+        // updated_at always differs and causes spurious conflicts - extract latest value
+        const latestUpdatedAt = compareTimestamps(oursEntity?.updated_at, theirsEntity?.updated_at) > 0 ? oursEntity?.updated_at : theirsEntity?.updated_at;
+        for (const field of allFields) {
+            // Skip multi-line text fields - they'll be handled by git merge-file
+            if (multiLineFields.has(field)) {
+                continue;
+            }
+            // Skip updated_at - we'll add it back at the end
+            if (field === 'updated_at') {
+                continue;
+            }
+            const baseValue = baseEntity?.[field];
+            const oursValue = oursEntity?.[field];
+            const theirsValue = theirsEntity?.[field];
+            // Three-way merge logic for scalar fields:
+            // - If base == ours == theirs: use any value
+            // - If base == ours && base != theirs: use theirs (they changed it)
+            // - If base == theirs && base != ours: use ours (we changed it)
+            // - If base != ours && base != theirs && ours == theirs: use either (both made same change)
+            // - If base != ours && base != theirs && ours != theirs: conflict -> latest wins
+            if (baseValue === oursValue && baseValue === theirsValue) {
+                // No changes
+                fieldsMerged[field] = baseValue;
+            }
+            else if (baseValue === oursValue && baseValue !== theirsValue) {
+                // Only theirs changed
+                fieldsMerged[field] = theirsValue;
+            }
+            else if (baseValue === theirsValue && baseValue !== oursValue) {
+                // Only ours changed
+                fieldsMerged[field] = oursValue;
+            }
+            else if (oursValue === theirsValue) {
+                // Both made same change
+                fieldsMerged[field] = oursValue;
+            }
+            else {
+                // Conflict: both changed to different values -> latest wins
+                // When timestamps are identical, prefer ours for stability
+                const oursNewer = compareTimestamps(oursEntity?.updated_at, theirsEntity?.updated_at) >= 0;
+                fieldsMerged[field] = oursNewer ? oursValue : theirsValue;
+                scalarConflicts.push(field);
+            }
+        }
+        // Step 2e: FAST PATH - Skip expensive YAML merge if entity is unchanged
+        // Check if all multi-line text fields are identical across versions
+        const multiLineFieldsIdentical = Array.from(multiLineFields).every(field => {
+            const baseValue = baseEntity?.[field];
+            const oursValue = oursEntity?.[field];
+            const theirsValue = theirsEntity?.[field];
+            return baseValue === oursValue && oursValue === theirsValue;
+        });
+        let mergedEntity;
+        let hadYamlConflicts = false;
+        // If no scalar conflicts and multi-line fields are identical, skip YAML merge
+        if (scalarConflicts.length === 0 && multiLineFieldsIdentical) {
+            // Fast path: Entity unchanged, use any version (prefer ours)
+            mergedEntity = { ...oursEntity, ...fieldsMerged };
+        }
+        else {
+            // Slow path: Need YAML merge for multi-line fields or scalar conflicts exist
+            // For multi-line fields, keep original values for YAML conversion
+            // Git merge-file will handle the line-level merge
+            // Remove updated_at to avoid spurious conflicts in YAML
+            const versionsForYaml = {
+                base: baseEntity ? { ...baseEntity, ...fieldsMerged, updated_at: undefined } : undefined,
+                ours: oursEntity ? { ...oursEntity, ...fieldsMerged, updated_at: undefined } : undefined,
+                theirs: theirsEntity ? { ...theirsEntity, ...fieldsMerged, updated_at: undefined } : undefined,
+            };
+            // Step 2f: Convert to YAML and run git merge-file for line-level merging
+            // Pass original timestamps for conflict resolution (since we stripped updated_at from versions)
+            const yamlMergeResult = mergeYamlWithGit(versionsForYaml, {
+                ours: oursEntity?.updated_at,
+                theirs: theirsEntity?.updated_at,
+            });
+            hadYamlConflicts = yamlMergeResult.hadConflicts;
+            if (yamlMergeResult.success) {
+                mergedEntity = yamlMergeResult.entity;
+            }
+            else {
+                // Fatal error during merge - fallback to latest-wins for entire entity
+                // When timestamps are identical, prefer ours for stability
+                const oursNewer = compareTimestamps(oursEntity?.updated_at, theirsEntity?.updated_at) >= 0;
+                mergedEntity = (oursNewer ? versionsForYaml.ours : versionsForYaml.theirs);
+            }
+        }
+        // Add back the latest updated_at timestamp
+        mergedEntity.updated_at = latestUpdatedAt;
+        // Record conflicts if any
+        if (scalarConflicts.length > 0 || hadYamlConflicts) {
+            const conflictParts = [];
+            if (scalarConflicts.length > 0) {
+                conflictParts.push(`${scalarConflicts.length} scalar field conflicts (${scalarConflicts.join(', ')})`);
+            }
+            if (hadYamlConflicts) {
+                conflictParts.push('YAML conflict blocks (latest-wins per block)');
+            }
+            stats.conflicts.push({
+                type: "same-uuid-same-id",
+                uuid,
+                originalIds: [baseEntity?.id || oursEntity?.id || theirsEntity?.id || "unknown"],
+                resolvedIds: [mergedEntity.id || "unknown"],
+                action: `Resolved ${conflictParts.join(', ')}`,
+            });
+        }
+        mergedEntities.push(mergedEntity);
+    }
+    // Step 3: Handle ID collisions (hash conflicts)
+    const idCounts = new Map();
+    const finalResolved = [];
+    for (const entity of mergedEntities) {
+        const currentId = entity.id;
+        if (!idCounts.has(currentId)) {
+            // First entity with this ID
+            idCounts.set(currentId, 1);
+            finalResolved.push(entity);
+        }
+        else {
+            // ID collision - rename with suffix
+            const count = idCounts.get(currentId);
+            const newEntity = { ...entity };
+            const newId = `${currentId}.${count}`;
+            newEntity.id = newId;
+            idCounts.set(currentId, count + 1);
+            finalResolved.push(newEntity);
+            stats.conflicts.push({
+                type: "different-uuids",
+                uuid: entity.uuid,
+                originalIds: [currentId],
+                resolvedIds: [newId],
+                action: `Renamed ID to resolve hash collision (different UUIDs)`,
+            });
+        }
+    }
+    // Step 4: Sort by created_at (git-friendly)
+    finalResolved.sort((a, b) => {
+        const aDate = a.created_at || "";
+        const bDate = b.created_at || "";
+        if (aDate < bDate)
+            return -1;
+        if (aDate > bDate)
+            return 1;
+        return (a.id || "").localeCompare(b.id || "");
+    });
+    stats.totalOutput = finalResolved.length;
+    return { entities: finalResolved, stats };
 }
 //# sourceMappingURL=merge-resolver.js.map

package/dist/merge-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"merge-resolver.js","sourceRoot":"","sources":["../src/merge-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AA8DzB;;GAEG;AACH,MAAM,UAAU,qBAAqB,CAAC,QAAgB;IACpD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC7B,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAClD,OAAO,CACL,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;QAC3B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;QAC3B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAC5B,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,sBAAsB,CAAC,OAAe;IACpD,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAClC,MAAM,QAAQ,GAAsB,EAAE,CAAC;IACvC,IAAI,cAAc,GAA2B,IAAI,CAAC;IAClD,IAAI,UAAU,GAAG,KAAK,CAAC;IACvB,IAAI,aAAa,GAAG,CAAC,CAAC,CAAC;IACvB,IAAI,cAAc,GAAG,CAAC,CAAC,CAAC;IACxB,IAAI,SAAS,GAAG,EAAE,CAAC;IACnB,IAAI,WAAW,GAAG,EAAE,CAAC;IACrB,IAAI,SAAS,GAAa,EAAE,CAAC;IAC7B,IAAI,WAAW,GAAa,EAAE,CAAC;IAE/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QAEtB,oBAAoB;QACpB,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YAC/B,yBAAyB;YACzB,IAAI,cAAc,EAAE,CAAC;gBACnB,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAChC,CAAC;YAED,UAAU,GAAG,IAAI,CAAC;YAClB,aAAa,GAAG,CAAC,CAAC;YAClB,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YACrC,SAAS,GAAG,EAAE,CAAC;YACf,cAAc,GAAG,IAAI,CAAC;YACtB,SAAS;QACX,CAAC;QAED,qBAAqB;QACrB,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,UAAU,EAAE,CAAC;YAC7C,cAAc,GAAG,CAAC,CAAC;YACnB,WAAW,GAAG,EAAE,CAAC;YACjB,SAAS;QACX,CAAC;QAED,kBAAkB;QAClB,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,UAAU,EAAE,CAAC;YAC7C,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YAEvC,QAAQ,CAAC,IAAI,CAAC;gBACZ,IAAI,EAAE,UAAU;gBAChB,KAAK,EAAE,EAAE;gBACT,IAAI,EAAE,SAAS;gBACf,MAAM,EAAE,WAAW;gBACnB,MAAM,EAAE;oBACN,KAAK,EAAE,aAAa;oBACpB,MAAM,EAAE,cAAc;oBACtB,GAAG,EAAE,CAAC;oBACN,SAAS;oBACT,WAAW;iBACZ;aACF,CAAC,CAAC;YAEH,UAAU,GAAG,KAAK,CAAC;YACnB,aAAa,GAAG,CAAC,CAAC,CAAC;YACnB,cAAc,GAAG,CAAC,CAAC,CAAC;YACpB,SAAS,GAAG,EAAE,CAAC;YACf,WAAW,GAAG,EAAE,CAAC;YACjB,SAAS,GAAG,EAAE,CAAC;YACf,WAAW,GAAG,EAAE,CAAC;YACjB,SAAS;QACX,CAAC;QAED,mBAAmB;QACnB,IAAI,UAAU,EAAE,CAAC;YACf,IAAI,cAAc,KAAK,CAAC,CAAC,EAAE,CAAC;gBAC1B,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACvB,CAAC;iBAAM,CAAC;gBACN,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACzB,CAAC;QACH,CAAC;aAAM,CAAC;YACN,aAAa;YACb,IAAI,CAAC,cAAc,IAAI,cAAc,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBACvD,cAAc,GAAG;oBACf,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE,EAAE;iBACV,CAAC;YACJ,CAAC;YACD,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClC,CAAC;IACH,CAAC;IAED,2BAA2B;IAC3B,IAAI,cAAc,EAAE,CAAC;QACnB,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IAChC,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;GAEG;AACH,SAAS,iBAAiB,CACxB,CAAqB,EACrB,CAAqB;IAErB,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC;QAAE,OAAO,CAAC,CAAC;IACvB,IAAI,CAAC,CAAC;QAAE,OAAO,CAAC,CAAC,CAAC;IAClB,IAAI,CAAC,CAAC;QAAE,OAAO,CAAC,CAAC;IAEjB,qCAAqC;IACrC,MAAM,WAAW,GAAG,CAAC,EAAU,EAAE,EAAE;QACjC,MAAM,OAAO,GACX,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC;YAChB,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC;YAChB,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC9B,OAAO,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,GAAG,CAAC;IACnD,CAAC,CAAC;IAEF,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;IACvC,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;IAEvC,OAAO,KAAK,CAAC,OAAO,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC;AAC3C,CAAC;AAED;;GAEG;AACH,SAAS,kBAAkB,CAAC,UAAkB,EAAE,IAAY;IAC1D,OAAO,GAAG,UAAU,aAAa,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;AACtD,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,aAAa,CAAwB,QAAa;IAChE,+CAA+C;IAC/C,MAAM,MAAM,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACzC,iBAAiB,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,UAAU,CAAC,CAC9C,CAAC;IAEF,MAAM,IAAI,GAAG,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;IAE9B,wCAAwC;IACxC,MAAM,eAAe,GAAG,IAAI,GAAG,EAAU,CAAC;IAC1C,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE,CAAC;QAC9B,IAAK,MAAc,CAAC,aAAa,EAAE,CAAC;YAClC,KAAK,MAAM,GAAG,IAAK,MAAc,CAAC,aAAa,EAAE,CAAC;gBAChD,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;YAC3C,CAAC;QACH,CAAC;IACH,CAAC;IACD,IAAI,eAAe,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;QAC5B,IAAY,CAAC,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAClE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CACd,CAAC;IACJ,CAAC;IAED,+BAA+B;IAC/B,MAAM,MAAM,GAAG,IAAI,GAAG,EAAU,CAAC;IACjC,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE,CAAC;QAC9B,IAAK,MAAc,CAAC,IAAI,EAAE,CAAC;YACzB,KAAK,MAAM,GAAG,IAAK,MAAc,CAAC,IAAI,EAAE,CAAC;gBACvC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAClB,CAAC;QACH,CAAC;IACH,CAAC;IACD,IAAI,MAAM,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;QACnB,IAAY,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1C,CAAC;IAED,oDAAoD;IACpD,IAAK,QAAQ,CAAC,CAAC,CAAS,CAAC,QAAQ,EAAE,CAAC;QAClC,MAAM,WAAW,GAAG,IAAI,GAAG,EAAe,CAAC;QAC3C,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE,CAAC;YAC9B,IAAK,MAAc,CAAC,QAAQ,EAAE,CAAC;gBAC7B,KAAK,MAAM,EAAE,IAAK,MAAc,CAAC,QAAQ,EAAE,CAAC;oBAC1C,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;wBAC5B,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;oBAC7B,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QACD,IAAI,WAAW,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;YACxB,IAAY,CAAC,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;QAC5D,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,eAAe,CAC7B,QAAa,EACb,UAA0B,EAAE;IAE5B,MAAM,KAAK,GAAoB;QAC7B,UAAU,EAAE,QAAQ,CAAC,MAAM;QAC3B,WAAW,EAAE,CAAC;QACd,SAAS,EAAE,EAAE;KACd,CAAC;IAEF,yBAAyB;IACzB,MAAM,MAAM,GAAG,IAAI,GAAG,EAAe,CAAC;IACtC,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE,CAAC;QAC9B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7B,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC9B,CAAC;QACD,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACxC,CAAC;IAED,MAAM,QAAQ,GAAQ,EAAE,CAAC;IAEzB,0BAA0B;IAC1B,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;QACzD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvB,6CAA6C;YAC7C,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YACxB,SAAS;QACX,CAAC;QAED,4BAA4B;QAC5B,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAE5C,IAAI,GAAG,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YACnB,wDAAwD;YACxD,MAAM,MAAM,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;YACpC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAEtB,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC;gBACnB,IAAI,EAAE,mBAAmB;gBACzB,IAAI;gBACJ,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC1B,WAAW,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;gBACxB,MAAM,EAAE,oCAAoC,KAAK,CAAC,MAAM,WAAW;aACpE,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,yDAAyD;YACzD,MAAM,MAAM,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACtC,iBAAiB,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,UAAU,CAAC,CAC9C,CAAC;YAEF,4BAA4B;YAC5B,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YACzC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAEtB,MAAM,WAAW,GAAa,EAAE,CAAC;YACjC,MAAM,WAAW,GAAa,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAE1C,wBAAwB;YACxB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC3C,MAAM,MAAM,GAAG,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,EAAO,CAAC;gBACrC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBAE5B,+BAA+B;gBAC/B,MAAM,CAAC,EAAE,GAAG,kBAAkB,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;gBAEhD,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBAC5B,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACxB,CAAC;YAED,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC;gBACnB,IAAI,EAAE,wBAAwB;gBAC9B,IAAI;gBACJ,WAAW;gBACX,WAAW;gBACX,MAAM,EAAE,WAAW,MAAM,CAAC,MAAM,GAAG,CAAC,kBAAkB;aACvD,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,gEAAgE;IAChE,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC3C,MAAM,aAAa,GAAQ,EAAE,CAAC;IAE9B,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE,CAAC;QAC9B,MAAM,SAAS,GAAG,MAAM,CAAC,EAAE,CAAC;QAE5B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7B,4BAA4B;YAC5B,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;YAC3B,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC7B,CAAC;aAAM,CAAC;YACN,oCAAoC;YACpC,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAE,CAAC;YACvC,MAAM,SAAS,GAAG,EAAE,GAAG,MAAM,EAAO,CAAC;YACrC,MAAM,KAAK,GAAG,GAAG,SAAS,IAAI,KAAK,EAAE,CAAC;YACtC,SAAS,CAAC,EAAE,GAAG,KAAK,CAAC;YAErB,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;YACnC,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAE9B,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC;gBACnB,IAAI,EAAE,iBAAiB;gBACvB,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,WAAW,EAAE,CAAC,SAAS,CAAC;gBACxB,WAAW,EAAE,CAAC,KAAK,CAAC;gBACpB,MAAM,EAAE,wDAAwD;aACjE,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,oCAAoC;IACpC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QAC1B,MAAM,KAAK,GAAG,CAAC,CAAC,UAAU,IAAI,EAAE,CAAC;QACjC,MAAM,KAAK,GAAG,CAAC,CAAC,UAAU,IAAI,EAAE,CAAC;QACjC,IAAI,KAAK,GAAG,KAAK;YAAE,OAAO,CAAC,CAAC,CAAC;QAC7B,IAAI,KAAK,GAAG,KAAK;YAAE,OAAO,CAAC,CAAC;QAC5B,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,WAAW,GAAG,aAAa,CAAC,MAAM,CAAC;IAEzC,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC;AAC5C,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,aAAa,CAC3B,IAAS,EACT,IAAS,EACT,MAAW;IAEX,+CAA+C;IAC/C,MAAM,WAAW,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,IAAI,EAAE,GAAG,MAAM,CAAC,CAAC;IAElD,gCAAgC;IAChC,OAAO,eAAe,CAAC,WAAW,CAAC,CAAC;AACtC,CAAC"}
+{"version":3,"file":"merge-resolver.js","sourceRoot":"","sources":["../src/merge-resolver.ts"],"names":[],"mappings":"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"}

package/dist/watcher.d.ts

@@ -4,6 +4,12 @@
  */
 import type Database from "better-sqlite3";
 import type { EntitySyncEvent, FileChangeEvent } from "@sudocode-ai/types/events";
+/**
+ * Parse a timestamp string to milliseconds, handling both ISO and SQLite formats
+ * SQLite's CURRENT_TIMESTAMP returns 'YYYY-MM-DD HH:MM:SS' (no timezone)
+ * which JavaScript incorrectly parses as local time. We need to treat it as UTC.
+ */
+export declare function parseTimestampAsUTC(timestamp: string): number;
 export interface WatcherOptions {
     /**
      * Database instance

package/dist/watcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"watcher.d.ts","sourceRoot":"","sources":["../src/watcher.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAkB3C,OAAO,KAAK,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAsElF,MAAM,WAAW,cAAc;IAC7B;;OAEG;IACH,EAAE,EAAE,QAAQ,CAAC,QAAQ,CAAC;IACtB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC;;OAEG;IACH,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IACjC;;;OAGG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;;OAGG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAE9B;;;OAGG;IACH,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEhE;;;OAGG;IACH,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACjE;AAED,MAAM,WAAW,cAAc;IAC7B;;OAEG;IACH,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B;;OAEG;IACH,QAAQ,EAAE,MAAM,YAAY,CAAC;CAC9B;AAED,MAAM,WAAW,YAAY;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,cAAc,GAAG,cAAc,CAszBpE;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI,CA+BnE"}
+{"version":3,"file":"watcher.d.ts","sourceRoot":"","sources":["../src/watcher.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAkB3C,OAAO,KAAK,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAuClF;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAQ7D;AAiCD,MAAM,WAAW,cAAc;IAC7B;;OAEG;IACH,EAAE,EAAE,QAAQ,CAAC,QAAQ,CAAC;IACtB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC;;OAEG;IACH,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IACjC;;;OAGG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;;OAGG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAE9B;;;OAGG;IACH,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEhE;;;OAGG;IACH,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACjE;AAED,MAAM,WAAW,cAAc;IAC7B;;OAEG;IACH,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B;;OAEG;IACH,QAAQ,EAAE,MAAM,YAAY,CAAC;CAC9B;AAED,MAAM,WAAW,YAAY;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,cAAc,GAAG,cAAc,CAszBpE;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI,CA+BnE"}

package/dist/watcher.js

@@ -46,6 +46,20 @@ class AsyncMutex {
     }
 }
 const processingMutex = new AsyncMutex();
+/**
+ * Parse a timestamp string to milliseconds, handling both ISO and SQLite formats
+ * SQLite's CURRENT_TIMESTAMP returns 'YYYY-MM-DD HH:MM:SS' (no timezone)
+ * which JavaScript incorrectly parses as local time. We need to treat it as UTC.
+ */
+export function parseTimestampAsUTC(timestamp) {
+    // If it's already ISO format with Z, parse directly
+    if (timestamp.includes('T') && timestamp.endsWith('Z')) {
+        return new Date(timestamp).getTime();
+    }
+    // SQLite format: "YYYY-MM-DD HH:MM:SS" - convert to ISO and append Z for UTC
+    const isoFormat = timestamp.replace(' ', 'T') + 'Z';
+    return new Date(isoFormat).getTime();
+}
 /**
  * Compute SHA256 hash of file content for change detection
  */
@@ -361,7 +375,7 @@ export function startWatcher(options) {
                             else {
                                 const fileStat = fs.statSync(filePath);
                                 const fileTime = fileStat.mtimeMs;
-                                const dbTime = new Date(dbEntity.updated_at).getTime();
+                                const dbTime = parseTimestampAsUTC(dbEntity.updated_at);
                                 if (dbTime > fileTime) {
                                     // DB is newer than file - sync DB → markdown
                                     syncDirection = "db-to-markdown";