mirror of
https://github.com/binaricat/Netcatty.git
synced 2026-11-21 07:32:54 +00:00
Implements automatic three-way merge for cloud sync, replacing the binary USE_REMOTE/USE_LOCAL conflict resolution. Same principle as Git's merge algorithm. After every successful sync, a "base snapshot" is saved (encrypted with AES-256-GCM using the derived master key). When a conflict is detected, the system performs per-entity merge by ID: - Items added on one side → included - Items deleted on one side (unchanged on other) → removed - Items modified on one side only → take that version - Both sides modified same item → prefer local - One side deleted + other modified → keep modification Additional improvements: - Per-provider sync base to prevent cross-provider contamination - Deep merge for nested settings (terminalSettings, customKeyBindings) - Entity merge for array-valued settings (customTerminalThemes) - KnownHost deduplication by (hostname, port, keyType) - Chunked base encoding to avoid stack overflow on large vaults - Base cleared on provider disconnect/reconnect - Correct version numbering after multi-provider merge Closes #378 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>