@leadcms/sdk 3.2.0 → 3.3.1

package/dist/lib/content-merge.js

@@ -0,0 +1,350 @@
+/**
+ * Three-way merge utilities for LeadCMS content
+ *
+ * Uses the node-diff3 library to perform git-style three-way merges between
+ * a base version, a local version, and a remote version of content files.
+ *
+ * For JSON content, a structural (field-level) merge is used instead of
+ * line-based diff to avoid false conflicts from adjacent line changes.
+ *
+ * The base version comes from the server via the sync API (the state of the
+ * content at the time of the client's last sync token). This avoids needing
+ * any local storage of base snapshots.
+ */
+import { diff3Merge } from 'node-diff3';
+/**
+ * Fields that are controlled by the server and should always take the remote
+ * value during merge, even if they differ between base and local.
+ * These fields are set/updated by the server automatically and should never
+ * be treated as meaningful local edits.
+ */
+const SERVER_CONTROLLED_FIELDS = new Set([
+    'updatedAt',
+    'createdAt',
+]);
+/**
+ * Regex to match a YAML frontmatter line for a server-controlled field.
+ * Matches lines like:
+ *   updatedAt: "2026-02-01T00:00:00Z"
+ *   createdAt: "2026-01-01T00:00:00Z"
+ *   updatedAt: 2026-02-01T00:00:00Z
+ */
+const SERVER_CONTROLLED_YAML_LINE = /^\s*(updatedAt|createdAt)\s*:/;
+/**
+ * Perform a three-way merge between base, local, and remote content.
+ *
+ * This works like git merge:
+ * - Changes that don't overlap are merged automatically
+ * - Changes that modify the same lines produce conflict markers
+ * - Server-controlled fields (updatedAt, createdAt) in YAML frontmatter
+ *   are auto-resolved to the remote value, never producing conflicts
+ *
+ * For JSON content, prefer threeWayMergeJson() which does structural merging
+ * and avoids false conflicts from adjacent line changes.
+ *
+ * @param base   - The original content at the time of last sync (from server's baseItems)
+ * @param local  - The current local file content (possibly user-modified)
+ * @param remote - The current remote content (fetched from server)
+ * @returns MergeResult with merged content and conflict information
+ */
+export function threeWayMerge(base, local, remote) {
+    const baseLines = base.split('\n');
+    const localLines = local.split('\n');
+    const remoteLines = remote.split('\n');
+    const regions = diff3Merge(localLines, baseLines, remoteLines);
+    let conflictCount = 0;
+    const resultLines = [];
+    for (const region of regions) {
+        if ('ok' in region && region.ok) {
+            resultLines.push(...region.ok);
+        }
+        else if ('conflict' in region && region.conflict) {
+            const localConflictLines = region.conflict.a;
+            const remoteConflictLines = region.conflict.b;
+            // Try to auto-resolve server-controlled fields within the conflict
+            const resolved = resolveServerControlledConflict(localConflictLines, remoteConflictLines);
+            if (resolved.remainingConflict) {
+                // There are still real conflicts after extracting server-controlled fields
+                conflictCount++;
+                resultLines.push(...resolved.resolvedLines);
+                resultLines.push('<<<<<<< local');
+                resultLines.push(...resolved.remainingConflict.local);
+                resultLines.push('=======');
+                resultLines.push(...resolved.remainingConflict.remote);
+                resultLines.push('>>>>>>> remote');
+            }
+            else {
+                // All lines in this conflict were server-controlled → fully auto-resolved
+                resultLines.push(...resolved.resolvedLines);
+            }
+        }
+    }
+    const merged = resultLines.join('\n');
+    return {
+        success: conflictCount === 0,
+        merged,
+        hasConflicts: conflictCount > 0,
+        conflictCount,
+    };
+}
+/**
+ * Attempt to auto-resolve server-controlled fields within a conflict region.
+ *
+ * For each line in the conflict, if it's a server-controlled YAML field
+ * (updatedAt, createdAt), take the remote version. Non-server-controlled
+ * lines remain as conflicts.
+ *
+ * Returns:
+ * - resolvedLines: lines that were auto-resolved (server-controlled)
+ * - remainingConflict: null if fully resolved, or { local, remote } with
+ *   the non-server-controlled lines that still conflict
+ */
+function resolveServerControlledConflict(localLines, remoteLines) {
+    const resolvedLines = [];
+    const remainingLocal = [];
+    const remainingRemote = [];
+    // Separate server-controlled from non-server-controlled lines on each side
+    const localServerControlled = [];
+    const localOther = [];
+    for (const line of localLines) {
+        if (SERVER_CONTROLLED_YAML_LINE.test(line)) {
+            localServerControlled.push(line);
+        }
+        else {
+            localOther.push(line);
+        }
+    }
+    const remoteServerControlled = [];
+    const remoteOther = [];
+    for (const line of remoteLines) {
+        if (SERVER_CONTROLLED_YAML_LINE.test(line)) {
+            remoteServerControlled.push(line);
+        }
+        else {
+            remoteOther.push(line);
+        }
+    }
+    // Auto-resolve server-controlled fields: always take remote version
+    resolvedLines.push(...remoteServerControlled);
+    // Check if there are remaining non-server-controlled lines
+    if (localOther.length === 0 && remoteOther.length === 0) {
+        // Entire conflict was server-controlled → fully resolved
+        return { resolvedLines, remainingConflict: null };
+    }
+    // There are real conflicting lines remaining
+    return {
+        resolvedLines,
+        remainingConflict: { local: localOther, remote: remoteOther },
+    };
+}
+/**
+ * Perform a structural three-way merge on JSON content.
+ *
+ * Instead of doing a line-based diff (which produces false conflicts for
+ * adjacent field changes), this parses the JSON and merges field-by-field:
+ *
+ * - Fields changed only locally → keep local value
+ * - Fields changed only remotely → take remote value
+ * - Fields changed identically on both sides → take either (same value)
+ * - Fields changed differently on both sides → conflict
+ * - Server-controlled fields (updatedAt, createdAt) → always take remote
+ *
+ * For nested objects, the merge recurses into each level.
+ *
+ * @param base   - The base JSON content (from server's baseItems, transformed to local format)
+ * @param local  - The current local JSON file content
+ * @param remote - The current remote JSON content (transformed to local format)
+ * @returns MergeResult with the merged JSON string
+ */
+export function threeWayMergeJson(base, local, remote) {
+    let baseObj;
+    let localObj;
+    let remoteObj;
+    try {
+        baseObj = JSON.parse(base);
+        localObj = JSON.parse(local);
+        remoteObj = JSON.parse(remote);
+    }
+    catch {
+        // If any version is not valid JSON, fall back to line-based merge
+        return threeWayMerge(base, local, remote);
+    }
+    const { value: mergedObj, conflicted, conflictCount } = mergeValues(baseObj, localObj, remoteObj);
+    const merged = JSON.stringify(mergedObj, null, 2);
+    return {
+        success: !conflicted,
+        merged,
+        hasConflicts: conflicted,
+        conflictCount,
+    };
+}
+/**
+ * Recursively merge three values (base, local, remote).
+ * Returns the merged value and whether any conflicts were found.
+ */
+function mergeValues(base, local, remote) {
+    // If both local and remote are objects (not arrays), merge field by field
+    if (isPlainObject(base) && isPlainObject(local) && isPlainObject(remote)) {
+        return mergeObjects(base, local, remote);
+    }
+    // For non-object values (primitives, arrays, etc.): compare as JSON strings
+    const baseStr = JSON.stringify(base);
+    const localStr = JSON.stringify(local);
+    const remoteStr = JSON.stringify(remote);
+    if (baseStr === localStr && baseStr === remoteStr) {
+        // No changes
+        return { value: local, conflicted: false, conflictCount: 0 };
+    }
+    if (baseStr === localStr) {
+        // Only remote changed → take remote
+        return { value: remote, conflicted: false, conflictCount: 0 };
+    }
+    if (baseStr === remoteStr) {
+        // Only local changed → keep local
+        return { value: local, conflicted: false, conflictCount: 0 };
+    }
+    if (localStr === remoteStr) {
+        // Both changed identically → take either
+        return { value: local, conflicted: false, conflictCount: 0 };
+    }
+    // Both changed differently → conflict
+    // Use a special marker object that will be serialized with conflict info
+    return {
+        value: {
+            '<<<<<<< local': local,
+            '=======': '---',
+            '>>>>>>> remote': remote,
+        },
+        conflicted: true,
+        conflictCount: 1,
+    };
+}
+/**
+ * Merge three plain objects field by field.
+ */
+function mergeObjects(base, local, remote) {
+    const allKeys = new Set([
+        ...Object.keys(base),
+        ...Object.keys(local),
+        ...Object.keys(remote),
+    ]);
+    const merged = {};
+    let hasConflict = false;
+    let totalConflicts = 0;
+    for (const key of allKeys) {
+        const inBase = key in base;
+        const inLocal = key in local;
+        const inRemote = key in remote;
+        // Server-controlled fields: always take remote value
+        if (SERVER_CONTROLLED_FIELDS.has(key)) {
+            if (inRemote) {
+                merged[key] = remote[key];
+            }
+            else if (inLocal) {
+                merged[key] = local[key];
+            }
+            // If only in base, it was deleted from both → omit
+            continue;
+        }
+        if (inBase && inLocal && inRemote) {
+            // Key exists in all three — merge the values
+            const result = mergeValues(base[key], local[key], remote[key]);
+            merged[key] = result.value;
+            if (result.conflicted) {
+                hasConflict = true;
+                totalConflicts += result.conflictCount;
+            }
+        }
+        else if (!inBase && inLocal && inRemote) {
+            // Key added by both sides
+            const result = mergeValues(undefined, local[key], remote[key]);
+            merged[key] = result.value;
+            if (result.conflicted) {
+                hasConflict = true;
+                totalConflicts += result.conflictCount;
+            }
+        }
+        else if (!inBase && inLocal && !inRemote) {
+            // Key added only locally → keep
+            merged[key] = local[key];
+        }
+        else if (!inBase && !inLocal && inRemote) {
+            // Key added only remotely → take
+            merged[key] = remote[key];
+        }
+        else if (inBase && !inLocal && inRemote) {
+            // Key deleted locally — check if remote also changed it
+            const baseStr = JSON.stringify(base[key]);
+            const remoteStr = JSON.stringify(remote[key]);
+            if (baseStr === remoteStr) {
+                // Remote didn't change it, local deleted it → keep deleted (omit)
+            }
+            else {
+                // Remote changed it but local deleted it → conflict, prefer remote
+                merged[key] = remote[key];
+                hasConflict = true;
+                totalConflicts++;
+            }
+        }
+        else if (inBase && inLocal && !inRemote) {
+            // Key deleted remotely — check if local also changed it
+            const baseStr = JSON.stringify(base[key]);
+            const localStr = JSON.stringify(local[key]);
+            if (baseStr === localStr) {
+                // Local didn't change it, remote deleted it → keep deleted (omit)
+            }
+            else {
+                // Local changed it but remote deleted it → conflict, prefer local
+                merged[key] = local[key];
+                hasConflict = true;
+                totalConflicts++;
+            }
+        }
+        else if (inBase && !inLocal && !inRemote) {
+            // Deleted by both sides → omit
+        }
+    }
+    return { value: merged, conflicted: hasConflict, conflictCount: totalConflicts };
+}
+/**
+ * Check if a value is a plain object (not array, null, Date, etc.)
+ */
+function isPlainObject(value) {
+    return value !== null && typeof value === 'object' && !Array.isArray(value);
+}
+/**
+ * Determine whether a local file has been modified compared to the base version.
+ *
+ * This is used to decide whether three-way merge is needed:
+ * - If local === base  → local is unmodified, safe to overwrite with remote
+ * - If local !== base  → local was modified, need three-way merge
+ *
+ * Uses timestamp normalization to avoid false positives from precision differences
+ * (e.g. server returns 7 decimal places but local file has 6).
+ *
+ * @param base  - The base content (from server's baseItems, transformed to local format)
+ * @param local - The current local file content
+ * @returns true if local content differs from base
+ */
+export function isLocallyModified(base, local) {
+    return normalizeForMergeComparison(base) !== normalizeForMergeComparison(local);
+}
+/**
+ * Normalize content for merge comparison.
+ * Handles trivial whitespace and timestamp precision differences that shouldn't
+ * trigger a merge.
+ */
+function normalizeForMergeComparison(content) {
+    return content
+        .replace(/\r\n/g, '\n')
+        .replace(/\s+\n/g, '\n')
+        // Normalize ISO timestamp precision: truncate fractional seconds to 6 decimal
+        // places (microsecond precision) then strip trailing zeros.
+        // e.g. "2026-02-13T10:32:20.2939836Z" → "2026-02-13T10:32:20.293983Z"
+        // This prevents false diffs from servers returning 7-digit precision while
+        // local serializers use 6-digit precision.
+        .replace(/(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{1,6})\d*Z/g, '$1Z')
+        .replace(/(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+?)0+Z/g, '$1Z')
+        .trimEnd();
+}
+//# sourceMappingURL=content-merge.js.map

package/dist/lib/content-merge.js.map

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

package/dist/scripts/fetch-leadcms-content.d.ts

@@ -11,6 +11,7 @@ interface MediaDeletedItem {
 interface ContentSyncResult {
     items: ContentItem[];
     deleted: number[];
+    baseItems: Record<string, ContentItem>;
     nextSyncToken: string;
 }
 interface MediaSyncResult {

package/dist/scripts/fetch-leadcms-content.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetch-leadcms-content.d.ts","sourceRoot":"","sources":["../../src/scripts/fetch-leadcms-content.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,CAAC;AAIvB,OAAO,EAQL,WAAW,EACZ,MAAM,sBAAsB,CAAC;AAU9B,UAAU,SAAS;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,UAAU,gBAAgB;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;CACd;AAQD,UAAU,iBAAiB;IACzB,KAAK,EAAE,WAAW,EAAE,CAAC;IACrB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,UAAU,eAAe;IACvB,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,OAAO,EAAE,gBAAgB,EAAE,CAAC;IAC5B,aAAa,EAAE,MAAM,CAAC;CACvB;AA0RD;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;AAEnD;;;;GAIG;AACH,iBAAe,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAqCvE;AAED;;;;GAIG;AACH,iBAAS,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAU7D;AAED;;;GAGG;AACH,iBAAe,sBAAsB,CAAC,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAezF;AAED;;;;;;GAMG;AACH,iBAAe,wBAAwB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA0BjF;AAED,iBAAe,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CA2LnC;AAGD,OAAO,EAAE,IAAI,IAAI,mBAAmB,EAAE,CAAC;AAGvC,OAAO,EAAE,wBAAwB,EAAE,CAAC;AACpC,OAAO,EAAE,mBAAmB,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,CAAC;AAMzE,YAAY,EAAE,iBAAiB,EAAE,eAAe,EAAE,SAAS,EAAE,gBAAgB,EAAE,CAAC"}
+{"version":3,"file":"fetch-leadcms-content.d.ts","sourceRoot":"","sources":["../../src/scripts/fetch-leadcms-content.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,CAAC;AAIvB,OAAO,EAQL,WAAW,EACZ,MAAM,sBAAsB,CAAC;AAa9B,UAAU,SAAS;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,UAAU,gBAAgB;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;CACd;AAQD,UAAU,iBAAiB;IACzB,KAAK,EAAE,WAAW,EAAE,CAAC;IACrB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACvC,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,UAAU,eAAe;IACvB,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,OAAO,EAAE,gBAAgB,EAAE,CAAC;IAC5B,aAAa,EAAE,MAAM,CAAC;CACvB;AAuSD;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;AAEnD;;;;GAIG;AACH,iBAAe,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAqCvE;AAED;;;;GAIG;AACH,iBAAS,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAU7D;AAED;;;GAGG;AACH,iBAAe,sBAAsB,CAAC,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAezF;AAED;;;;;;GAMG;AACH,iBAAe,wBAAwB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA0BjF;AAED,iBAAe,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CA4QnC;AAGD,OAAO,EAAE,IAAI,IAAI,mBAAmB,EAAE,CAAC;AAGvC,OAAO,EAAE,wBAAwB,EAAE,CAAC;AACpC,OAAO,EAAE,mBAAmB,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,CAAC;AAMzE,YAAY,EAAE,iBAAiB,EAAE,eAAe,EAAE,SAAS,EAAE,gBAAgB,EAAE,CAAC"}

package/dist/scripts/fetch-leadcms-content.js

@@ -3,7 +3,9 @@ import fs from "fs/promises";
 import path from "path";
 import axios from "axios";
 import { downloadMediaFileDirect, leadCMSUrl, leadCMSApiKey, defaultLanguage, CONTENT_DIR, MEDIA_DIR, fetchContentTypes, } from "./leadcms-helpers.js";
-import { saveContentFile } from "../lib/content-transformation.js";
+import { saveContentFile, transformRemoteToLocalFormat } from "../lib/content-transformation.js";
+import { threeWayMerge, threeWayMergeJson, isLocallyModified } from "../lib/content-merge.js";
+import { getConfig } from "../lib/config.js";
 // Add axios request/response interceptors for debugging
 axios.interceptors.request.use((config) => {
     console.log(`[AXIOS REQUEST] ${config.method?.toUpperCase()} ${config.url}`);
@@ -112,6 +114,7 @@ async function fetchContentSync(syncToken) {
     console.log(`[FETCH_CONTENT_SYNC] Fetching public content (no authentication)`);
     let allItems = [];
     let allDeleted = [];
+    let allBaseItems = {};
     let token = syncToken || "";
     let nextSyncToken = undefined;
     let page = 0;
@@ -119,6 +122,10 @@ async function fetchContentSync(syncToken) {
         const url = new URL("/api/content/sync", leadCMSUrl);
         url.searchParams.set("filter[limit]", "100");
         url.searchParams.set("syncToken", token);
+        // Request base versions for three-way merge when doing incremental sync
+        if (syncToken) {
+            url.searchParams.set("includeBase", "true");
+        }
         console.log(`[FETCH_CONTENT_SYNC] Page ${page}, URL: ${url.toString()}`);
         try {
             // SECURITY: Never send API key for read operations
@@ -135,6 +142,11 @@ async function fetchContentSync(syncToken) {
             if (data.deleted && Array.isArray(data.deleted)) {
                 allDeleted.push(...data.deleted);
             }
+            // Collect base items for three-way merge support
+            if (data.baseItems && typeof data.baseItems === 'object') {
+                Object.assign(allBaseItems, data.baseItems);
+                console.log(`[FETCH_CONTENT_SYNC] Page ${page} - Got ${Object.keys(data.baseItems).length} base items for merge`);
+            }
             const newSyncToken = res.headers["x-next-sync-token"] || token;
             console.log(`[FETCH_CONTENT_SYNC] Next sync token: ${newSyncToken}`);
             if (!newSyncToken || newSyncToken === token) {
@@ -151,10 +163,11 @@ async function fetchContentSync(syncToken) {
             throw error;
         }
     }
-    console.log(`[FETCH_CONTENT_SYNC] Completed - Total items: ${allItems.length}, deleted: ${allDeleted.length}`);
+    console.log(`[FETCH_CONTENT_SYNC] Completed - Total items: ${allItems.length}, deleted: ${allDeleted.length}, base items: ${Object.keys(allBaseItems).length}`);
     return {
         items: allItems,
         deleted: allDeleted,
+        baseItems: allBaseItems,
         nextSyncToken: nextSyncToken || token,
     };
 }
@@ -380,18 +393,18 @@ async function main() {
     const typeMap = await fetchContentTypes();
     const { token: lastSyncToken, migrated: contentTokenMigrated } = await readSyncToken();
     const { token: lastMediaSyncToken, migrated: mediaTokenMigrated } = await readMediaSyncToken();
-    let items = [], deleted = [], nextSyncToken = "";
+    let items = [], deleted = [], baseItems = {}, nextSyncToken = "";
     let mediaItems = [], mediaDeleted = [], nextMediaSyncToken = "";
     // Sync content (only if supported)
     if (contentSupported) {
         try {
             if (lastSyncToken) {
                 console.log(`Syncing content from LeadCMS using sync token: ${lastSyncToken}`);
-                ({ items, deleted, nextSyncToken } = await fetchContentSync(lastSyncToken));
+                ({ items, deleted, baseItems, nextSyncToken } = await fetchContentSync(lastSyncToken));
             }
             else {
                 console.log("No content sync token found. Doing full fetch from LeadCMS...");
-                ({ items, deleted, nextSyncToken } = await fetchContentSync(undefined));
+                ({ items, deleted, baseItems, nextSyncToken } = await fetchContentSync(undefined));
             }
         }
         catch (error) {
@@ -430,23 +443,103 @@ async function main() {
     const contentIdIndex = (items.length > 0 || deleted.length > 0)
         ? await buildContentIdIndex(CONTENT_DIR)
         : new Map();
-    // Save content files
+    // Save content files (with three-way merge support)
+    const hasBaseItems = Object.keys(baseItems).length > 0;
+    let mergedCount = 0;
+    let conflictCount = 0;
+    let overwrittenCount = 0;
+    let newCount = 0;
+    // Build a ContentTypeMap for transformation
+    const contentTypeMap = {};
+    for (const [key, value] of Object.entries(typeMap)) {
+        contentTypeMap[key] = value === 'JSON' ? 'JSON' : 'MDX';
+    }
     for (const content of items) {
         if (content && typeof content === "object") {
+            const idStr = content.id != null ? String(content.id) : undefined;
+            // Determine the file path where this content would be saved
+            const contentConfig = getConfig();
+            const contentLanguage = content.language || contentConfig.defaultLanguage;
+            let targetContentDir = CONTENT_DIR;
+            if (contentLanguage !== contentConfig.defaultLanguage) {
+                targetContentDir = path.join(CONTENT_DIR, contentLanguage);
+            }
+            const contentType = contentTypeMap[content.type] || 'MDX';
+            const extension = contentType === 'MDX' ? '.mdx' : '.json';
+            const expectedPath = path.join(targetContentDir, `${content.slug}${extension}`);
+            // Check if local file exists before deleting old paths
+            let localContent = null;
+            try {
+                localContent = await fs.readFile(expectedPath, 'utf8');
+            }
+            catch {
+                // File does not exist — this is new content
+            }
             // Before saving, remove any existing file with the same id.
             // This handles slug renames, type changes (MDX↔JSON), and language
             // changes — the old file at the previous path is cleaned up before the
             // new version is written at the (potentially different) new path.
-            if (content.id != null) {
-                await deleteContentFilesById(contentIdIndex, String(content.id));
+            if (idStr != null) {
+                await deleteContentFilesById(contentIdIndex, idStr);
+            }
+            // Try three-way merge if we have a base version and local file exists
+            const baseContent = idStr ? baseItems[idStr] : undefined;
+            if (localContent && baseContent && hasBaseItems) {
+                // Transform both base and remote to local file format for comparison
+                const baseTransformed = await transformRemoteToLocalFormat(baseContent, contentTypeMap);
+                const remoteTransformed = await transformRemoteToLocalFormat(content, contentTypeMap);
+                if (!isLocallyModified(baseTransformed, localContent)) {
+                    // Local file is unchanged from base — safe to overwrite with remote
+                    await saveContentFile({ content, typeMap, contentDir: CONTENT_DIR });
+                    overwrittenCount++;
+                }
+                else {
+                    // Local file was modified — perform three-way merge
+                    // Use structural merge for JSON (avoids false conflicts from adjacent lines)
+                    // and line-based merge for MDX
+                    const mergeResult = contentType === 'JSON'
+                        ? threeWayMergeJson(baseTransformed, localContent, remoteTransformed)
+                        : threeWayMerge(baseTransformed, localContent, remoteTransformed);
+                    if (mergeResult.success) {
+                        // Clean merge — write the merged result
+                        await fs.mkdir(path.dirname(expectedPath), { recursive: true });
+                        await fs.writeFile(expectedPath, mergeResult.merged, 'utf8');
+                        console.log(`🔀 Auto-merged: ${content.slug} (local + remote changes combined)`);
+                        mergedCount++;
+                    }
+                    else {
+                        // Conflicts — write merged content with conflict markers
+                        await fs.mkdir(path.dirname(expectedPath), { recursive: true });
+                        await fs.writeFile(expectedPath, mergeResult.merged, 'utf8');
+                        console.warn(`⚠️  Conflict in: ${content.slug} (${mergeResult.conflictCount} conflict(s) — manual resolution needed)`);
+                        conflictCount++;
+                    }
+                }
+            }
+            else {
+                // No base available or file is new — overwrite (current behavior)
+                await saveContentFile({ content, typeMap, contentDir: CONTENT_DIR });
+                if (localContent) {
+                    overwrittenCount++;
+                }
+                else {
+                    newCount++;
+                }
             }
-            await saveContentFile({
-                content,
-                typeMap,
-                contentDir: CONTENT_DIR,
-            });
         }
     }
+    // Print merge summary
+    if (hasBaseItems && items.length > 0) {
+        console.log(`\n📊 Content sync summary:`);
+        if (newCount > 0)
+            console.log(`   ✨ New: ${newCount}`);
+        if (overwrittenCount > 0)
+            console.log(`   📝 Updated (no local changes): ${overwrittenCount}`);
+        if (mergedCount > 0)
+            console.log(`   🔀 Auto-merged: ${mergedCount}`);
+        if (conflictCount > 0)
+            console.log(`   ⚠️  Conflicts (need manual resolution): ${conflictCount}`);
+    }
     // Remove deleted content files from all language directories
     for (const id of deleted) {
         await deleteContentFilesById(contentIdIndex, String(id));