bump

- Conflict resolving dialogue now properly displays the changeset name instead of A or B (#691).

manifest.json

@@ -1,7 +1,7 @@
 {
     "id": "obsidian-livesync",
     "name": "Self-hosted LiveSync",
-    "version": "0.25.11",
+    "version": "0.25.13",
     "minAppVersion": "0.9.12",
     "description": "Community implementation of self-hosted livesync. Reflect your vault changes to some other devices immediately. Please make sure to disable other synchronize solutions to avoid content corruption or duplication.",
     "author": "vorotamoroz",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "obsidian-livesync",
-    "version": "0.25.11",
+    "version": "0.25.13",
     "description": "Reflect your vault changes to some other devices immediately. Please make sure to disable other synchronize solutions to avoid content corruption or duplication.",
     "main": "main.js",
     "type": "module",
@@ -92,10 +92,10 @@
         "fflate": "^0.8.2",
         "idb": "^8.0.3",
         "minimatch": "^10.0.1",
-        "octagonal-wheels": "^0.1.37",
+        "octagonal-wheels": "^0.1.38",
         "qrcode-generator": "^1.4.4",
         "svelte-check": "^4.1.7",
-        "trystero": "^0.21.5",
+        "trystero": "^0.21.7",
         "xxhash-wasm-102": "npm:xxhash-wasm@^1.0.2"
     }
 }

src/main.ts

@@ -582,6 +582,11 @@ export default class ObsidianLiveSyncPlugin
     $everyBeforeReplicate(showMessage: boolean): Promise<boolean> {
         return InterceptiveEvery;
     }
+
+    $$canReplicate(showMessage: boolean = false): Promise<boolean> {
+        throwShouldBeOverridden();
+    }
+
     $$replicate(showMessage: boolean = false): Promise<boolean | void> {
         throwShouldBeOverridden();
     }

src/modules/core/ModuleReplicator.ts

@@ -173,17 +173,23 @@ Even if you choose to clean up, you will see this option again if you exit Obsid
             }
         });
     }
-    async $$_replicate(showMessage: boolean = false): Promise<boolean | void> {
-        //--?
-        if (!this.core.$$isReady()) return;
+
+    async $$canReplicate(showMessage: boolean = false): Promise<boolean> {
+        if (!this.core.$$isReady()) {
+            Logger(`Not ready`);
+            return false;
+        }
+
         if (isLockAcquired("cleanup")) {
             Logger($msg("Replicator.Message.Cleaned"), LOG_LEVEL_NOTICE);
-            return;
+            return false;
         }
+
         if (this.settings.versionUpFlash != "") {
             Logger($msg("Replicator.Message.VersionUpFlash"), LOG_LEVEL_NOTICE);
-            return;
+            return false;
         }
+
         if (!(await this.core.$everyCommitPendingFileEvent())) {
             Logger($msg("Replicator.Message.Pending"), LOG_LEVEL_NOTICE);
             return false;
@@ -197,6 +203,12 @@ Even if you choose to clean up, you will see this option again if you exit Obsid
             Logger($msg("Replicator.Message.SomeModuleFailed"), LOG_LEVEL_NOTICE);
             return false;
         }
+        return true;
+    }
+
+    async $$_replicate(showMessage: boolean = false): Promise<boolean | void> {
+        const checkBeforeReplicate = await this.$$canReplicate(showMessage);
+        if (!checkBeforeReplicate) return false;
 
         //<-- Here could be an module.
         const ret = await this.core.replicator.openReplication(this.settings, false, showMessage, false);

src/modules/core/ModuleReplicatorCouchDB.ts

@@ -15,15 +15,22 @@ export class ModuleReplicatorCouchDB extends AbstractModule implements ICoreModu
         return Promise.resolve(new LiveSyncCouchDBReplicator(this.core));
     }
     $everyAfterResumeProcess(): Promise<boolean> {
+        if (!this.core.$$isSuspended) return Promise.resolve(true);
+        if (!this.core.$$isReady) return Promise.resolve(true);
         if (this.settings.remoteType != REMOTE_MINIO && this.settings.remoteType != REMOTE_P2P) {
-            // If LiveSync enabled, open replication
-            if (this.settings.liveSync) {
-                fireAndForget(() => this.core.$$replicate(false));
-            }
-            // If sync on start enabled, open replication
-            if (!this.settings.liveSync && this.settings.syncOnStart) {
-                // Possibly ok as if only share the result
-                fireAndForget(() => this.core.$$replicate(false));
+            const LiveSyncEnabled = this.settings.liveSync;
+            const continuous = LiveSyncEnabled;
+            const eventualOnStart = !LiveSyncEnabled && this.settings.syncOnStart;
+
+            // If enabled LiveSync or on start, open replication
+            if (LiveSyncEnabled || eventualOnStart) {
+                // And note that we do not open the conflict detection dialogue directly during this process.
+                // This should be raised explicitly if needed.
+                fireAndForget(async () => {
+                    const canReplicate = await this.core.$$canReplicate(false);
+                    if (!canReplicate) return;
+                    void this.core.replicator.openReplication(this.settings, continuous, false, false);
+                });
             }
         }
 

src/modules/features/InteractiveConflictResolving/ConflictResolveModal.ts

@@ -25,8 +25,8 @@ export class ConflictResolveModal extends Modal {
     title: string = "Conflicting changes";
 
     pluginPickMode: boolean = false;
-    localName: string = "Use Base";
-    remoteName: string = "Use Conflicted";
+    localName: string = "Base";
+    remoteName: string = "Conflicted";
     offEvent?: ReturnType<typeof eventHub.onEvent>;
 
     constructor(app: App, filename: string, diff: diff_result, pluginPickMode?: boolean, remoteName?: string) {
@@ -36,8 +36,8 @@ export class ConflictResolveModal extends Modal {
         this.pluginPickMode = pluginPickMode || false;
         if (this.pluginPickMode) {
             this.title = "Pick a version";
-            this.remoteName = `Use ${remoteName || "Remote"}`;
-            this.localName = "Use Local";
+            this.remoteName = `${remoteName || "Remote"}`;
+            this.localName = "Local";
         }
         // Send cancel signal for the previous merge dialogue
         // if not there, simply be ignored.
@@ -93,12 +93,13 @@ export class ConflictResolveModal extends Modal {
         const date2 =
             new Date(this.result.right.mtime).toLocaleString() + (this.result.right.deleted ? " (Deleted)" : "");
         div2.innerHTML = `
-<span class='deleted'>A:${date1}</span><br /><span class='added'>B:${date2}</span><br> 
+<span class='deleted'><span class='conflict-dev-name'>${this.localName}</span>: ${date1}</span><br>
+<span class='added'><span class='conflict-dev-name'>${this.remoteName}</span>: ${date2}</span><br>
         `;
-        contentEl.createEl("button", { text: this.localName }, (e) =>
+        contentEl.createEl("button", { text: `Use ${this.localName}` }, (e) =>
             e.addEventListener("click", () => this.sendResponse(this.result.right.rev))
         ).style.marginRight = "4px";
-        contentEl.createEl("button", { text: this.remoteName }, (e) =>
+        contentEl.createEl("button", { text: `Use ${this.remoteName}` }, (e) =>
             e.addEventListener("click", () => this.sendResponse(this.result.left.rev))
         ).style.marginRight = "4px";
         if (!this.pluginPickMode) {

styles.css

@@ -12,6 +12,11 @@
     background-color: var(--text-muted);
 }
 
+.conflict-dev-name {
+    display: inline-block;
+    min-width: 5em;
+}
+
 .op-scrollable {
     overflow-y: scroll;
     /* min-height: 280px; */

updates.md

@@ -1,3 +1,18 @@
+## 0.25.13
+
+1st September, 2025
+
+### Fixed
+- Conflict resolving dialogue now properly displays the changeset name instead of A or B (#691).
+
+## 0.25.12
+
+29th August, 2025
+
+### Fixed
+
+- Fixed an issue with automatic synchronisation starting (#702).
+
 ## 0.25.11
 
 28th August, 2025
@@ -59,43 +74,6 @@
 
 - Type errors have been corrected.
 
-## 0.25.7
-
-15th August, 2025
-
-**Since the release of 0.25.6, there are two large problem. Please update immediately.**
-
-- We may have corrupted some documents during the migration process. **Please check your documents on the wizard.**
-- Due to a chunk ID assignment issue, some data has not been encrypted. **Please rebuild the database using Rebuild Everything** if you have enabled E2EE.
-
-**_So, If you have enabled E2EE, please perform `Rebuild everything`. If not, please check your documents on the wizard._**
-
-In next version, insecure chunk detection will be implemented.
-
-### Fixed
-
-- Off-loaded chunking have been fixed to ensure proper functionality (#693).
-- Chunk document ID assignment has been fixed.
-- Replication prevention message during version up detection has been improved (#686).
-- `Keep A` and `Keep B` on Conflict resolving dialogue has been renamed to `Use Base` and `Use Conflicted` (#691).
-
-### Improved
-
-- Metadata and content-size unmatched documents are now detected and reported, prevented to be applied to the storage.
-    - This behaviour can be configured in `Patch` -> `Edge case addressing (Behaviour)` -> `Process files even if seems to be corrupted`
-    - Note: this toggle is for the direct-database-manipulation users.
-
-### New Features
-
-- `Scan for Broken files` has been implemented on `Hatch` -> `TroubleShooting`.
-
-### Refactored
-
-- Off-loaded processes have been refactored for the better maintainability.
-    - Files prefixed `bg.worker` are now work on the worker threads.
-    - Files prefixed `bgWorker.` are now also controls these worker threads. (I know what you want to say... I will rename them).
-- Removed unused code.
-
 ## 0.25.0
 
 19th July, 2025 (beta1 in 0.25.0-beta1, 13th July, 2025)

updates_old.md

@@ -11,6 +11,45 @@ As a result, this is the first time in a while that forward compatibility has be
 
 ---
 
+
+## 0.25.7
+
+15th August, 2025
+
+**Since the release of 0.25.6, there are two large problem. Please update immediately.**
+
+- We may have corrupted some documents during the migration process. **Please check your documents on the wizard.**
+- Due to a chunk ID assignment issue, some data has not been encrypted. **Please rebuild the database using Rebuild Everything** if you have enabled E2EE.
+
+**_So, If you have enabled E2EE, please perform `Rebuild everything`. If not, please check your documents on the wizard._**
+
+In next version, insecure chunk detection will be implemented.
+
+### Fixed
+
+- Off-loaded chunking have been fixed to ensure proper functionality (#693).
+- Chunk document ID assignment has been fixed.
+- Replication prevention message during version up detection has been improved (#686).
+- `Keep A` and `Keep B` on Conflict resolving dialogue has been renamed to `Use Base` and `Use Conflicted` (#691).
+
+### Improved
+
+- Metadata and content-size unmatched documents are now detected and reported, prevented to be applied to the storage.
+    - This behaviour can be configured in `Patch` -> `Edge case addressing (Behaviour)` -> `Process files even if seems to be corrupted`
+    - Note: this toggle is for the direct-database-manipulation users.
+
+### New Features
+
+- `Scan for Broken files` has been implemented on `Hatch` -> `TroubleShooting`.
+
+### Refactored
+
+- Off-loaded processes have been refactored for the better maintainability.
+    - Files prefixed `bg.worker` are now work on the worker threads.
+    - Files prefixed `bgWorker.` are now also controls these worker threads. (I know what you want to say... I will rename them).
+- Removed unused code.
+
+
 ## ~~0.25.5~~ 0.25.6
 
 (0.25.5 has been withdrawn due to a bug in the `Fetch chunks on demand` feature).