@leadcms/sdk 3.2.0 → 3.3.0

package/README.md

@@ -152,14 +152,17 @@ npm run test:watch
 
 ### Test Coverage
 
-The SDK maintains high test coverage with comprehensive unit tests covering:
+The SDK maintains high test coverage with **481 tests across 30 test suites**, covering:
 
-- 📄 Content retrieval and parsing
+- 📄 Content retrieval, parsing, and transformation
 - 🌍 Multi-language support and translations
 - 📝 Draft content handling and user-specific overrides
 - 🏗️ Build-time optimizations and caching
 - 🔧 Configuration management and validation
 - 🔄 Push/Pull synchronization with conflict detection
+- 🗂️ Content rename, type change, and deletion handling
+- 🗑️ Media deletion sync and file cleanup
+- 🔁 Sync token migration and edge cases
 - 🖥️ CLI command functionality with mocked API responses
 
 ### Testing with Mock Data
@@ -395,6 +398,9 @@ npx leadcms pull-media
 
 # Pull only comments
 npx leadcms pull-comments
+
+# Reset and pull everything from scratch
+npx leadcms pull --reset
 ```
 
 > **Note:** `npx leadcms fetch` is still supported as an alias for backward compatibility.
@@ -402,11 +408,17 @@ npx leadcms pull-comments
 What each command does:
 
 - `npx leadcms pull` - Syncs content, media and comments into your project using the configured directories. Updates incremental sync tokens so subsequent runs are faster.
+- `npx leadcms pull --reset` - Deletes all local content, media, comments, and sync tokens, then performs a full pull from scratch. Useful when local state has become inconsistent or after configuration changes.
 - `npx leadcms pull-content` - Downloads only content entities (MDX/JSON files) and updates local metadata.
 - `npx leadcms pull-media` - Downloads media files to your `mediaDir` (e.g., `public/media`). Use this when you changed media or want to refresh assets separately from content.
 - `npx leadcms pull-comments` - Downloads comments to the comments directory (e.g., `.leadcms/comments/`). Useful when you only need comment updates.
 
-> **Note:** The CLI uses incremental sync tokens to avoid re-downloading unchanged items where supported by the LeadCMS API.
+**Intelligent sync handling:**
+
+- **Incremental sync** — Sync tokens avoid re-downloading unchanged items on subsequent pulls.
+- **Rename & type-change cleanup** — When content is renamed (slug change), moved to a different type, or switched format (MDX ↔ JSON), the old file is automatically removed before the new version is written.
+- **Deleted content removal** — Content and media deleted on the server are removed locally during the next pull.
+- **Sync token migration** — When upgrading from SDK ≤ 3.1, legacy sync tokens are automatically migrated to their new location inside each data directory.
 
 ### Push local content to LeadCMS
 

package/dist/cli/bin/generate-env.d.ts

@@ -2,5 +2,5 @@
 /**
  * LeadCMS Generate Env CLI Entry Point
  */
-import '../../scripts/generate-env-js.js';
+export {};
 //# sourceMappingURL=generate-env.d.ts.map

package/dist/cli/bin/generate-env.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate-env.d.ts","sourceRoot":"","sources":["../../../src/cli/bin/generate-env.ts"],"names":[],"mappings":";AACA;;GAEG;AAGH,OAAO,kCAAkC,CAAC"}
+{"version":3,"file":"generate-env.d.ts","sourceRoot":"","sources":["../../../src/cli/bin/generate-env.ts"],"names":[],"mappings":";AACA;;GAEG"}

package/dist/cli/bin/generate-env.js

@@ -2,6 +2,6 @@
 /**
  * LeadCMS Generate Env CLI Entry Point
  */
-// Import and run the generate-env script directly
-import '../../scripts/generate-env-js.js';
+import { generateEnv } from '../../scripts/generate-env-js.js';
+generateEnv();
 //# sourceMappingURL=generate-env.js.map

package/dist/cli/bin/generate-env.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate-env.js","sourceRoot":"","sources":["../../../src/cli/bin/generate-env.ts"],"names":[],"mappings":";AACA;;GAEG;AAEH,kDAAkD;AAClD,OAAO,kCAAkC,CAAC"}
+{"version":3,"file":"generate-env.js","sourceRoot":"","sources":["../../../src/cli/bin/generate-env.ts"],"names":[],"mappings":";AACA;;GAEG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAE/D,WAAW,EAAE,CAAC"}

package/dist/cli/bin/pull-comments.js

@@ -3,7 +3,9 @@
  * LeadCMS Pull Comments CLI Entry Point
  */
 import { pullComments } from '../../scripts/pull-comments.js';
-pullComments().catch((error) => {
+const args = process.argv.slice(2);
+const reset = args.includes('--reset');
+pullComments({ reset }).catch((error) => {
     console.error('Error running LeadCMS pull comments:', error.message);
     process.exit(1);
 });

package/dist/cli/bin/pull-comments.js.map

@@ -1 +1 @@
-{"version":3,"file":"pull-comments.js","sourceRoot":"","sources":["../../../src/cli/bin/pull-comments.ts"],"names":[],"mappings":";AACA;;GAEG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAE9D,YAAY,EAAE,CAAC,KAAK,CAAC,CAAC,KAAU,EAAE,EAAE;IAClC,OAAO,CAAC,KAAK,CAAC,sCAAsC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IACrE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"}
+{"version":3,"file":"pull-comments.js","sourceRoot":"","sources":["../../../src/cli/bin/pull-comments.ts"],"names":[],"mappings":";AACA;;GAEG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAE9D,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AACnC,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;AAEvC,YAAY,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,KAAU,EAAE,EAAE;IAC3C,OAAO,CAAC,KAAK,CAAC,sCAAsC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IACrE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"}

package/dist/cli/bin/pull-content.js

@@ -15,7 +15,8 @@ const slugIndex = args.findIndex(arg => arg === '--slug');
 if (slugIndex !== -1 && args[slugIndex + 1]) {
     targetSlug = args[slugIndex + 1];
 }
-pullContent({ targetId, targetSlug }).catch((error) => {
+const reset = args.includes('--reset');
+pullContent({ targetId, targetSlug, reset }).catch((error) => {
     console.error('Error running LeadCMS pull content:', error.message);
     process.exit(1);
 });

package/dist/cli/bin/pull-content.js.map

@@ -1 +1 @@
-{"version":3,"file":"pull-content.js","sourceRoot":"","sources":["../../../src/cli/bin/pull-content.ts"],"names":[],"mappings":";AACA;;GAEG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAE5D,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAEnC,0BAA0B;AAC1B,IAAI,QAA4B,CAAC;AACjC,IAAI,UAA8B,CAAC;AAEnC,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,MAAM,CAAC,CAAC;AACtD,IAAI,OAAO,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,EAAE,CAAC;IACxC,QAAQ,GAAG,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC;AAC/B,CAAC;AAED,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,QAAQ,CAAC,CAAC;AAC1D,IAAI,SAAS,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,EAAE,CAAC;IAC5C,UAAU,GAAG,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC;AACnC,CAAC;AAED,WAAW,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,KAAU,EAAE,EAAE;IACzD,OAAO,CAAC,KAAK,CAAC,qCAAqC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IACpE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"}
+{"version":3,"file":"pull-content.js","sourceRoot":"","sources":["../../../src/cli/bin/pull-content.ts"],"names":[],"mappings":";AACA;;GAEG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAE5D,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAEnC,0BAA0B;AAC1B,IAAI,QAA4B,CAAC;AACjC,IAAI,UAA8B,CAAC;AAEnC,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,MAAM,CAAC,CAAC;AACtD,IAAI,OAAO,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,EAAE,CAAC;IACxC,QAAQ,GAAG,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC;AAC/B,CAAC;AAED,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,QAAQ,CAAC,CAAC;AAC1D,IAAI,SAAS,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,EAAE,CAAC;IAC5C,UAAU,GAAG,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC;AACnC,CAAC;AAED,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;AAEvC,WAAW,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,KAAU,EAAE,EAAE;IAChE,OAAO,CAAC,KAAK,CAAC,qCAAqC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IACpE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"}

package/dist/cli/bin/pull-media.js

@@ -3,7 +3,9 @@
  * LeadCMS Pull Media CLI Entry Point
  */
 import { pullMedia } from '../../scripts/pull-media.js';
-pullMedia().catch((error) => {
+const args = process.argv.slice(2);
+const reset = args.includes('--reset');
+pullMedia({ reset }).catch((error) => {
     console.error('Error running LeadCMS pull media:', error.message);
     process.exit(1);
 });

package/dist/cli/bin/pull-media.js.map

@@ -1 +1 @@
-{"version":3,"file":"pull-media.js","sourceRoot":"","sources":["../../../src/cli/bin/pull-media.ts"],"names":[],"mappings":";AACA;;GAEG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAExD,SAAS,EAAE,CAAC,KAAK,CAAC,CAAC,KAAU,EAAE,EAAE;IAC/B,OAAO,CAAC,KAAK,CAAC,mCAAmC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IAClE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"}
+{"version":3,"file":"pull-media.js","sourceRoot":"","sources":["../../../src/cli/bin/pull-media.ts"],"names":[],"mappings":";AACA;;GAEG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAExD,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AACnC,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;AAEvC,SAAS,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,KAAU,EAAE,EAAE;IACxC,OAAO,CAAC,KAAK,CAAC,mCAAmC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IAClE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"}

package/dist/cli/index.js

@@ -69,10 +69,10 @@ switch (command) {
         runScript('pull-content.js', commandArgs);
         break;
     case 'pull-media':
-        runScript('pull-media.js');
+        runScript('pull-media.js', commandArgs);
         break;
     case 'pull-comments':
-        runScript('pull-comments.js');
+        runScript('pull-comments.js', commandArgs);
         break;
     case 'push':
         runScript('push-all.js', commandArgs);
@@ -127,8 +127,11 @@ Usage:
   leadcms pull-content [options] - Pull only content from LeadCMS
     --id <content-id>    - Pull specific content by ID
     --slug <slug>        - Pull specific content by slug
-  leadcms pull-media     - Pull only media files from LeadCMS
-  leadcms pull-comments  - Pull only comments from LeadCMS
+    --reset              - Delete local content files and sync token, then pull fresh
+  leadcms pull-media [options] - Pull only media files from LeadCMS
+    --reset              - Delete local media files and sync token, then pull fresh
+  leadcms pull-comments [options] - Pull only comments from LeadCMS
+    --reset              - Delete local comment files and sync token, then pull fresh
   leadcms fetch          - Alias for 'pull' (backward compatibility)
 
   Push commands:

package/dist/cli/index.js.map

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

package/dist/index.d.ts

@@ -3,5 +3,7 @@ export * from './lib/config.js';
 export * from './lib/locale-utils.js';
 export * from './lib/comment-types.js';
 export * from './lib/cms-config-types.js';
+export { threeWayMerge, threeWayMergeJson, isLocallyModified } from './lib/content-merge.js';
+export type { MergeResult } from './lib/content-merge.js';
 export type { CommentTreeNode, CommentTreeOptions, CommentStatistics, CommentSortOrder } from './lib/comment-utils.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC;AAG1C,YAAY,EAAE,eAAe,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC;AAG1C,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC7F,YAAY,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAG1D,YAAY,EAAE,eAAe,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC"}

package/dist/index.js

@@ -4,6 +4,8 @@ export * from './lib/config.js';
 export * from './lib/locale-utils.js';
 export * from './lib/comment-types.js';
 export * from './lib/cms-config-types.js';
+// Content merge utilities for three-way merge support
+export { threeWayMerge, threeWayMergeJson, isLocallyModified } from './lib/content-merge.js';
 // LeadCMS SDK - Framework-agnostic content management
 //
 // Core functions for accessing LeadCMS content:

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,eAAe;AACf,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC;AAK1C,sDAAsD;AACtD,EAAE;AACF,gDAAgD;AAChD,yDAAyD;AACzD,0DAA0D;AAC1D,wEAAwE;AACxE,iEAAiE;AACjE,sDAAsD;AACtD,EAAE;AACF,gBAAgB;AAChB,4DAA4D;AAC5D,uEAAuE;AACvE,kEAAkE;AAClE,wFAAwF;AACxF,iGAAiG;AACjG,sFAAsF;AACtF,EAAE;AACF,6FAA6F;AAC7F,4FAA4F;AAC5F,2DAA2D;AAC3D,EAAE;AACF,oBAAoB;AACpB,0DAA0D;AAC1D,EAAE;AACF,yBAAyB;AACzB,4CAA4C;AAC5C,sCAAsC;AACtC,kDAAkD;AAClD,EAAE;AACF,iBAAiB;AACjB,qFAAqF;AACrF,oFAAoF;AACpF,mEAAmE;AACnE,gEAAgE;AAChE,oEAAoE;AACpE,wDAAwD;AACxD,yDAAyD;AACzD,EAAE;AACF,mFAAmF;AACnF,qFAAqF"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,eAAe;AACf,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC;AAE1C,sDAAsD;AACtD,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAM7F,sDAAsD;AACtD,EAAE;AACF,gDAAgD;AAChD,yDAAyD;AACzD,0DAA0D;AAC1D,wEAAwE;AACxE,iEAAiE;AACjE,sDAAsD;AACtD,EAAE;AACF,gBAAgB;AAChB,4DAA4D;AAC5D,uEAAuE;AACvE,kEAAkE;AAClE,wFAAwF;AACxF,iGAAiG;AACjG,sFAAsF;AACtF,EAAE;AACF,6FAA6F;AAC7F,4FAA4F;AAC5F,2DAA2D;AAC3D,EAAE;AACF,oBAAoB;AACpB,0DAA0D;AAC1D,EAAE;AACF,yBAAyB;AACzB,4CAA4C;AAC5C,sCAAsC;AACtC,kDAAkD;AAClD,EAAE;AACF,iBAAiB;AACjB,qFAAqF;AACrF,oFAAoF;AACpF,mEAAmE;AACnE,gEAAgE;AAChE,oEAAoE;AACpE,wDAAwD;AACxD,yDAAyD;AACzD,EAAE;AACF,mFAAmF;AACnF,qFAAqF"}

package/dist/lib/content-merge.d.ts

@@ -0,0 +1,80 @@
+/**
+ * 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.
+ */
+/**
+ * Result of a three-way content merge
+ */
+export interface MergeResult {
+    /** Whether the merge completed without conflicts */
+    success: boolean;
+    /** The merged content (may contain conflict markers if success is false) */
+    merged: string;
+    /** Whether there were conflicts that require manual resolution */
+    hasConflicts: boolean;
+    /** Number of conflict regions found */
+    conflictCount: number;
+}
+/**
+ * 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 declare function threeWayMerge(base: string, local: string, remote: string): MergeResult;
+/**
+ * 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 declare function threeWayMergeJson(base: string, local: string, remote: string): MergeResult;
+/**
+ * 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 declare function isLocallyModified(base: string, local: string): boolean;
+//# sourceMappingURL=content-merge.d.ts.map

package/dist/lib/content-merge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"content-merge.d.ts","sourceRoot":"","sources":["../../src/lib/content-merge.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAIH;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,oDAAoD;IACpD,OAAO,EAAE,OAAO,CAAC;IACjB,4EAA4E;IAC5E,MAAM,EAAE,MAAM,CAAC;IACf,kEAAkE;IAClE,YAAY,EAAE,OAAO,CAAC;IACtB,uCAAuC;IACvC,aAAa,EAAE,MAAM,CAAC;CACvB;AAsBD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,CA4CtF;AAsED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,CAwB1F;AAiJD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAEtE"}

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