Fix updates.md

docs/p2p_sync_updates_2026.md

@@ -6,14 +6,14 @@ Peer-to-Peer (P2P) synchronisation has evolved significantly. This guide covers
 P2P synchronisation allows your devices to talk directly to each other using WebRTC. A central server is not required for data storage, ensuring maximum privacy and "freedom."
 
 ## 2. Setting Up via P2P Status Pane
-You no longer need to navigate through complex menus. Simply open the **P2P Server Status** (via the ribbon icon or command palette) and click the **⚙ (Cog)** icon.
+You no longer need to navigate through complex menus. Simply open the **P2P Status** (via the ribbon icon or command palette) and click the **⚙ (Cog)** icon.
 
 This opens the **P2P Setup** dialogue where you can configure the essentials:
 - **Room ID:** A unique identifier for your synchronisation group.
-- **Password:** Your encryption key. Ensure all your devices use the exact same password. 
+- **Passphrase:** Your encryption key. Ensure all your devices use the exact same passphrase. 
 - **Device Name:** A recognisable name for the current device (e.g., `iphone-16`).
 
-Once you have saved the settings, return to the **P2P Status Pane** and click the **Connect** button to join the network. 
+Once you have saved the settings, return to the **P2P Status Pane** and click the **Connect** button to join the network.
 
 *Tip: You can also toggle **Auto Connect** in the setup dialogue to automatically join the network whenever Obsidian starts.*
 
@@ -23,19 +23,30 @@ The status pane in the right sidebar provides granular control over your synchro
 - **Signalling Status:** Shows if you are connected to the relay (🟢 Online).
 - **Live-push (Broadcast):** Toggle "Broadcast changes" to notify other peers whenever you make an edit.
 - **Watch:** Enable "Watch" on specific peers to automatically pull changes when they broadcast. This creates a "LiveSync-like" experience.
+- **Sync (🔄/🔁):** Mark specific peers as **sync targets**. Peers marked here will be included when you run the **"P2P: Sync with targets"** command (see section 5). Click the button next to a peer to toggle it on (🔄, highlighted) or off (🔁). This setting is persisted in your configuration.
 
-## 4. Enhanced Replication Dialogue (Bidirectional Sync)
-If you want to synchronise manually, click the **🔄 (Replicate)** button next to a peer in the device list. This opens the **Replication Dialogue**.
+## 4. Replication Dialogue
+If you want to synchronise with a specific peer manually, use the **Replication** command or button. This opens the **Replication Dialogue** listing available devices.
 
-Inside the dialogue, you can still see the **Server Status** at the top, so you will know if you are still connected while performing manual synchronisations.
+Inside the dialogue, the **Server Status** card at the top confirms you are still connected while performing the sync.
 
-When you trigger a synchronisation this way, the system now performs a **Bidirectional Synchronisation**:
-1. **Pull:** It first fetches changes from the peer.
-2. **Push:** If the pull is successful, it immediately pushes your local changes to that peer.
+Two actions are available per peer:
 
-This "one-click" approach ensures both devices are perfectly in synchronisation without manual back-and-forth.
+- **Sync** — Starts a bidirectional synchronisation (Pull then Push) and keeps the dialogue open so you can monitor progress or sync with additional peers.
+- **Start Sync & Close** — Starts the same bidirectional sync in the background and **immediately closes the dialogue**, so you can continue working without waiting.
 
-## 5. Technical Improvements in 2026
+## 5. Syncing with Registered Targets via Command Palette
+
+You can now trigger a synchronisation with all your pre-registered target peers in one step, without opening any UI.
+
+1. Open the **Command Palette** (`Ctrl/Cmd + P`).
+2. Run **"P2P: Sync with targets"**.
+
+This command synchronises with every peer whose **SYNC** toggle is enabled in the **Detected Peers** list. If no targets are registered, or if the P2P server is not running, the command will notify you accordingly.
+
+*Tip: Pair this command with a hotkey for a quick, keyboard-driven sync workflow.*
+
+## 6. Technical Improvements in 2026
 - **Decoupled Architecture:** The UI is now strictly separated from the core logic, making the plugin more stable across different platforms (Mobile, Desktop, and Web).
 - **Svelte 5 UI:** The interface has been rebuilt for better responsiveness and clearer status indicators.
 - **Security:** All data remains end-to-end encrypted. Even the signalling relay never sees your actual notes.

manifest.json

@@ -1,10 +1,10 @@
 {
-    "id": "obsidian-livesync",
-    "name": "Self-hosted LiveSync",
-    "version": "0.25.62",
-    "minAppVersion": "1.7.2",
-    "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",
-    "authorUrl": "https://github.com/vrtmrz",
-    "isDesktopOnly": false
-}
+	"id": "obsidian-livesync",
+	"name": "Self-hosted LiveSync",
+	"version": "0.25.63",
+	"minAppVersion": "1.7.2",
+	"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",
+	"authorUrl": "https://github.com/vrtmrz",
+	"isDesktopOnly": false
+}

package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "obsidian-livesync",
-    "version": "0.25.62",
+    "version": "0.25.63",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "obsidian-livesync",
-            "version": "0.25.62",
+            "version": "0.25.63",
             "license": "MIT",
             "dependencies": {
                 "@aws-sdk/client-s3": "^3.808.0",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "obsidian-livesync",
-    "version": "0.25.62",
+    "version": "0.25.63",
     "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",

src/apps/cli/commands/p2p.ts

@@ -32,10 +32,15 @@ function validateP2PSettings(core: LiveSyncBaseCore<ServiceContext, any>) {
     settings.P2P_IsHeadless = true;
 }
 
-function createReplicator(core: LiveSyncBaseCore<ServiceContext, any>): LiveSyncTrysteroReplicator {
+async function createReplicator(core: LiveSyncBaseCore<ServiceContext, any>): Promise<LiveSyncTrysteroReplicator> {
     validateP2PSettings(core);
-    const replicator = new LiveSyncTrysteroReplicator({ services: core.services });
-    addP2PEventHandlers(replicator);
+    const replicator = await core.services.replicator.getNewReplicator();
+    if (!replicator) {
+        throw new Error("Failed to create replicator instance. Ensure P2P is enabled in settings.");
+    }
+    if (!(replicator instanceof LiveSyncTrysteroReplicator)) {
+        throw new Error("Unexpected replicator type. Expected LiveSyncTrysteroReplicator.");
+    }
     return replicator;
 }
 
@@ -49,7 +54,7 @@ export async function collectPeers(
     core: LiveSyncBaseCore<ServiceContext, any>,
     timeoutSec: number
 ): Promise<CLIP2PPeer[]> {
-    const replicator = createReplicator(core);
+    const replicator = await createReplicator(core);
     await replicator.open();
     try {
         await delay(timeoutSec * 1000);
@@ -79,7 +84,7 @@ export async function syncWithPeer(
     peerToken: string,
     timeoutSec: number
 ): Promise<CLIP2PPeer> {
-    const replicator = createReplicator(core);
+    const replicator = await createReplicator(core);
     await replicator.open();
     try {
         const timeoutMs = timeoutSec * 1000;
@@ -115,7 +120,7 @@ export async function syncWithPeer(
 }
 
 export async function openP2PHost(core: LiveSyncBaseCore<ServiceContext, any>): Promise<LiveSyncTrysteroReplicator> {
-    const replicator = createReplicator(core);
+    const replicator = await createReplicator(core);
     await replicator.open();
     return replicator;
 }

src/apps/cli/main.ts

@@ -8,7 +8,6 @@ import * as path from "path";
 import { NodeServiceContext, NodeServiceHub } from "./services/NodeServiceHub";
 import { configureNodeLocalStorage, ensureGlobalNodeLocalStorage } from "./services/NodeLocalStorage";
 import { LiveSyncBaseCore } from "../../LiveSyncBaseCore";
-import { ModuleReplicatorP2P } from "../../modules/core/ModuleReplicatorP2P";
 import { initialiseServiceModulesCLI } from "./serviceModules/CLIServiceModules";
 import { DEFAULT_SETTINGS, LOG_LEVEL_VERBOSE, type LOG_LEVEL, type ObsidianLiveSyncSettings } from "@lib/common/types";
 import type { InjectableServiceHub } from "@lib/services/implements/injectable/InjectableServiceHub";
@@ -27,6 +26,7 @@ import type { CLICommand, CLIOptions } from "./commands/types";
 import { getPathFromUXFileInfo } from "@lib/common/typeUtils";
 import { stripAllPrefixes } from "@lib/string_and_binary/path";
 import { IgnoreRules } from "./serviceModules/IgnoreRules";
+import { useP2PReplicatorFeature } from "@/lib/src/replication/trystero/useP2PReplicatorFeature";
 
 const SETTINGS_FILE = ".livesync/settings.json";
 ensureGlobalNodeLocalStorage();
@@ -368,12 +368,11 @@ export async function main() {
         (core: LiveSyncBaseCore<NodeServiceContext, any>, serviceHub: InjectableServiceHub<NodeServiceContext>) => {
             return initialiseServiceModulesCLI(vaultPath, core, serviceHub, ignoreRules, watchEnabled);
         },
-        (core) => [
-            // No modules need to be registered for P2P replication in CLI. Directly using Replicators in p2p.ts
-            // new ModuleReplicatorP2P(core),
-        ],
+        (core) => [],
         () => [], // No add-ons
         (core) => {
+            // Register P2P replicator feature.
+            const _replicator = useP2PReplicatorFeature(core);
             // Add target filter to prevent internal files are handled
             core.services.vault.isTargetFile.addHandler(async (target) => {
                 const targetPath = stripAllPrefixes(getPathFromUXFileInfo(target));
@@ -424,7 +423,7 @@ export async function main() {
     // Save the settings file before any lifecycle events can mutate and persist them.
     // suspendAllSync and other lifecycle hooks clobber sync settings in memory, and
     // various code paths persist the clobbered state to disk. We restore on shutdown.
-    const settingsBackup = await fs.readFile(settingsPath, "utf-8").catch(() => null);
+    const settingsBackup = await fs.readFile(settingsPath, "utf-8").catch(() => null!);
 
     // Restore settings file on any exit to undo lifecycle mutations.
     // Write to a temp path first so a crash mid-write doesn't leave a truncated file.

src/features/P2PSync/P2PReplicator/P2POpenReplicationModal.ts

@@ -13,17 +13,26 @@ export class P2POpenReplicationModal extends Modal {
     callback?: P2POpenReplicationModalCallback;
     component?: ReturnType<typeof mount>;
     showResult: boolean;
+    title: string;
+    onClosed?: () => void;
+    rebuildMode: boolean;
 
     constructor(
         app: App,
         liveSyncReplicator: LiveSyncTrysteroReplicator,
         callback?: P2POpenReplicationModalCallback,
-        showResult: boolean = false
+        showResult: boolean = false,
+        title: string = "P2P Replication",
+        onClosed?: () => void,
+        rebuildMode: boolean = false
     ) {
         super(app);
         this.liveSyncReplicator = liveSyncReplicator;
         this.callback = callback;
         this.showResult = showResult;
+        this.title = title;
+        this.onClosed = onClosed;
+        this.rebuildMode = rebuildMode;
     }
 
     async onSync(peerId: string) {
@@ -41,7 +50,7 @@ export class P2POpenReplicationModal extends Modal {
 
     override onOpen() {
         const { contentEl } = this;
-        this.titleEl.setText("P2P Replication");
+        this.titleEl.setText(this.title);
         contentEl.empty();
 
         if (this.component === undefined) {
@@ -53,6 +62,7 @@ export class P2POpenReplicationModal extends Modal {
                     onSyncAndClose: (peerId: string) => this.onSyncAndClose(peerId),
                     onClose: () => this.close(),
                     showResult: this.showResult,
+                    rebuildMode: this.rebuildMode,
                 },
             });
         }
@@ -65,5 +75,6 @@ export class P2POpenReplicationModal extends Modal {
             void unmount(this.component);
             this.component = undefined;
         }
+        this.onClosed?.();
     }
 }

src/features/P2PSync/P2PReplicator/P2POpenReplicationPane.svelte

@@ -19,9 +19,10 @@
         onSyncAndClose: (_peerId: string) => Promise<void>;
         onClose: () => void;
         showResult: boolean;
+        rebuildMode?: boolean;
     }
 
-    let { onSync, onSyncAndClose, onClose, showResult, liveSyncReplicator }: Props = $props();
+    let { onSync, onSyncAndClose, onClose, showResult, liveSyncReplicator, rebuildMode = false }: Props = $props();
 
     let serverInfo = $state<P2PServerInfo | undefined>(undefined);
     let syncingPeerId = $state<string | null>(null);
@@ -36,10 +37,10 @@
         const unsubscribe = eventHub.onEvent(EVENT_SERVER_STATUS, (status) => {
             serverInfo = status;
         });
-        fireAndForget(async ()=>{
+        fireAndForget(async () => {
             await delay(100);
             await requestServerStatus();
-        })
+        });
         return unsubscribe;
     });
 
@@ -55,20 +56,32 @@
             syncingPeerId = null;
         }
     }
-
-    async function handleSyncAndClose(peerId: string) {
+    async function handleSyncThenClose(peerId: string) {
         try {
             syncingPeerId = peerId;
-            Logger(`Starting sync and close with ${peerId}`, logLevel);
+            Logger(`Starting sync with ${peerId}`, logLevel);
             await onSyncAndClose(peerId);
-            Logger(`Sync and close completed with ${peerId}`, logLevel);
+            Logger(`Sync completed with ${peerId}`, logLevel);
         } catch (e) {
-            Logger(`Error during sync and close: ${e instanceof Error ? e.message : String(e)}`, logLevel);
+            Logger(`Error during sync: ${e instanceof Error ? e.message : String(e)}`, logLevel);
         } finally {
             syncingPeerId = null;
         }
     }
-    async function disconnect(){
+
+    async function handleSyncAndClose(peerId: string) {
+        fireAndForget(async () => {
+            try {
+                Logger(`Starting sync with ${peerId}`, logLevel);
+                await onSync(peerId);
+                Logger(`Sync completed with ${peerId}`, logLevel);
+            } catch (e) {
+                Logger(`Error during sync: ${e instanceof Error ? e.message : String(e)}`, logLevel);
+            }
+        });
+        onClose();
+    }
+    async function disconnect() {
         try {
             await liveSyncReplicator.close();
             Logger("Signalling connection closed.", logLevel);
@@ -76,7 +89,7 @@
             Logger(`Failed to close signalling connection: ${e instanceof Error ? e.message : String(e)}`, logLevel);
         }
     }
-    async function onCloseAndDisconnect(){
+    async function onCloseAndDisconnect() {
         await disconnect();
         onClose();
     }
@@ -97,13 +110,10 @@
 </script>
 
 <div class="p2p-container">
-    <P2PServerStatusCard
-        {liveSyncReplicator}
-        showBroadcastToggle={false}
-    />
+    <P2PServerStatusCard {liveSyncReplicator} showBroadcastToggle={false} />
 
     <div class="peers-section">
-        <h3>Available Devices</h3>
+        <h3>Available Peers</h3>
         {#if serverInfo && serverInfo.knownAdvertisements.length > 0}
             <div class="peers-list">
                 {#each serverInfo.knownAdvertisements as peer (peer.peerId)}
@@ -121,20 +131,30 @@
                             </div>
                         </div>
                         <div class="peer-actions">
-                            <button
-                                class="btn btn-primary"
-                                disabled={syncingPeerId !== null}
-                                onclick={() => handleSync(peer.peerId)}
-                            >
-                                {syncingPeerId === peer.peerId ? "Syncing..." : "Sync"}
-                            </button>
-                            <button
-                                class="btn btn-secondary"
-                                disabled={syncingPeerId !== null}
-                                onclick={() => handleSyncAndClose(peer.peerId)}
-                            >
-                                {syncingPeerId === peer.peerId ? "Syncing..." : "Sync & Close"}
-                            </button>
+                            {#if !rebuildMode}
+                                <button
+                                    class="btn btn-primary"
+                                    disabled={syncingPeerId !== null}
+                                    onclick={() => handleSync(peer.peerId)}
+                                >
+                                    {syncingPeerId === peer.peerId ? "Syncing..." : "Sync"}
+                                </button>
+                                <button
+                                    class="btn {rebuildMode ? 'btn-primary' : 'btn-secondary'}"
+                                    disabled={syncingPeerId !== null}
+                                    onclick={() => handleSyncAndClose(peer.peerId)}
+                                >
+                                    {syncingPeerId === peer.peerId ? "Syncing..." : "Start Sync & Close"}
+                                </button>
+                            {:else}
+                                <button
+                                    class="btn {rebuildMode ? 'btn-primary' : 'btn-secondary'}"
+                                    disabled={syncingPeerId !== null}
+                                    onclick={() => handleSyncThenClose(peer.peerId)}
+                                >
+                                    {syncingPeerId === peer.peerId ? "Syncing..." : "Sync"}
+                                </button>
+                            {/if}
                         </div>
                     </div>
                 {/each}
@@ -145,8 +165,12 @@
     </div>
 
     <div class="footer">
-        <button class="btn btn-cancel" onclick={onClose}>Close</button>
-        <button class="btn btn-cancel" onclick={onCloseAndDisconnect}>Close & Disconnect</button>
+        {#if rebuildMode}
+            <button class="btn btn-cancel" onclick={onClose} disabled={syncingPeerId !== null}>Skip and close</button>
+        {:else}
+            <button class="btn btn-cancel" onclick={onClose}>Close</button>
+            <button class="btn btn-cancel" onclick={onCloseAndDisconnect}>Close & Disconnect</button>
+        {/if}
     </div>
 </div>
 
@@ -181,6 +205,7 @@
     .peer-item {
         display: flex;
         justify-content: space-between;
+        flex-wrap: wrap;
         align-items: center;
         padding: 0.75rem;
         background-color: var(--background-secondary);
@@ -234,9 +259,9 @@
     }
 
     .peer-actions {
+        flex-wrap: wrap;
         display: flex;
         gap: 0.5rem;
-        flex-shrink: 0;
     }
 
     .btn {

src/features/P2PSync/P2PReplicator/P2PReplicationUI.ts

@@ -1,7 +1,7 @@
 import { App } from "@/deps.ts";
 import { Logger } from "@lib/common/logger";
 import { LOG_LEVEL_NOTICE, LOG_LEVEL_INFO } from "@lib/common/types";
-import type { LiveSyncTrysteroReplicator } from "@/lib/src/replication/trystero/LiveSyncTrysteroReplicator";
+import type { LiveSyncTrysteroReplicator } from "@lib/replication/trystero/LiveSyncTrysteroReplicator";
 import { P2POpenReplicationModal } from "./P2POpenReplicationModal";
 
 /**
@@ -71,3 +71,61 @@ export function createOpenReplicationUI(
             });
         };
 }
+
+/**
+ * Creates an openRebuildUI factory for Obsidian environments.
+ * Opens the P2P Replication modal in "rebuild" mode — one-way pull only,
+ * with setOnSetup / clearOnSetup bracketing the replicateFrom call.
+ *
+ * Usage:
+ *   const factory = createOpenRebuildUI(app);
+ *   useP2PReplicatorFeature(core, createOpenReplicationUI(app), factory);
+ */
+export function createOpenRebuildUI(
+    app: App
+): (replicator: LiveSyncTrysteroReplicator) => (showResult: boolean) => Promise<boolean | void> {
+    return (replicator: LiveSyncTrysteroReplicator) =>
+        (showResult: boolean): Promise<boolean | void> => {
+            const logLevel = showResult ? LOG_LEVEL_NOTICE : LOG_LEVEL_INFO;
+            return new Promise<boolean | void>((resolve) => {
+                let resolved = false;
+                const safeResolve = (val: boolean) => {
+                    if (!resolved) {
+                        resolved = true;
+                        resolve(val);
+                    }
+                };
+
+                const doRebuild = async (peerId: string) => {
+                    replicator.setOnSetup();
+                    try {
+                        Logger(`Rebuilding from peer ${peerId}`, logLevel);
+                        const result = await replicator.replicateFrom(peerId, showResult);
+                        safeResolve(result?.ok ?? false);
+                    } catch (e) {
+                        Logger(
+                            `Error in rebuild from ${peerId}: ${e instanceof Error ? e.message : String(e)}`,
+                            logLevel
+                        );
+                        safeResolve(false);
+                    } finally {
+                        replicator.clearOnSetup();
+                    }
+                };
+
+                const modal = new P2POpenReplicationModal(
+                    app,
+                    replicator,
+                    {
+                        onSync: doRebuild,
+                        onSyncAndClose: doRebuild,
+                    },
+                    showResult,
+                    "P2P Rebuild",
+                    () => safeResolve(false),
+                    true
+                );
+                modal.open();
+            });
+        };
+}

src/features/P2PSync/P2PReplicator/P2PServerStatusCard.svelte

@@ -21,7 +21,7 @@
     let replicatorStatus = $state<P2PReplicatorStatus | undefined>(undefined);
 
     async function requestServerStatus() {
-        await liveSyncReplicator.requestStatus();
+        await Promise.resolve(liveSyncReplicator.requestStatus());
         eventHub.emitEvent(EVENT_REQUEST_STATUS);
     }
 

src/features/P2PSync/P2PReplicator/P2PServerStatusPane.svelte

@@ -12,17 +12,32 @@
     import type { P2PReplicatorStatus, P2PReplicationReport } from "@/lib/src/replication/trystero/TrysteroReplicator";
     import { delay, fireAndForget } from "octagonal-wheels/promises";
     import P2PServerStatusCard from "./P2PServerStatusCard.svelte";
+    import { EVENT_SETTING_SAVED } from "@lib/events/coreEvents";
+    import type { LiveSyncBaseCore } from "@/LiveSyncBaseCore";
 
     interface Props {
         liveSyncReplicator: LiveSyncTrysteroReplicator;
+        core: LiveSyncBaseCore;
     }
 
-    let { liveSyncReplicator }: Props = $props();
+    let { liveSyncReplicator, core }: Props = $props();
     let serverInfo = $state<P2PServerInfo | undefined>(undefined);
     let replicatorInfo = $state<P2PReplicatorStatus | undefined>(undefined);
     let decidingPeerId = $state<string | null>(null);
     let communicatingUntil = $state<Record<string, number>>({});
     const COMMUNICATION_HOLD_MS = 2500;
+    let syncOnReplicationSetting = $state(
+        core.services.setting.currentSettings()?.P2P_SyncOnReplication ?? ""
+    );
+
+    function addToList(item: string, list: string): string {
+        const items = list.split(",").map((e) => e.trim()).filter((e) => e);
+        if (!items.includes(item)) items.push(item);
+        return items.join(",");
+    }
+    function removeFromList(item: string, list: string): string {
+        return list.split(",").map((e) => e.trim()).filter((e) => e && e !== item).join(",");
+    }
 
     function markCommunicating(peerId: string) {
         const expiry = Date.now() + COMMUNICATION_HOLD_MS;
@@ -60,6 +75,10 @@
             }
         });
 
+        const unsubscribeSettings = eventHub.onEvent(EVENT_SETTING_SAVED, (settings) => {
+            syncOnReplicationSetting = settings?.P2P_SyncOnReplication ?? "";
+        });
+
         fireAndForget(async () => {
             await delay(100);
             await requestServerStatus();
@@ -69,6 +88,7 @@
             unsubscribe();
             unsubscribeReplicatorStatus();
             unsubscribeReplicatorProgress();
+            unsubscribeSettings();
         };
     });
 
@@ -145,11 +165,27 @@
         const isHeldCommunicating = (communicatingUntil[peerId] ?? 0) > Date.now();
         return isLiveCommunicating || isHeldCommunicating;
     }
+
+    function isSyncTarget(peerName: string) {
+        return syncOnReplicationSetting
+            .split(",")
+            .map((e) => e.trim())
+            .filter((e) => e)
+            .includes(peerName);
+    }
+
+    async function toggleSyncTarget(peer: P2PServerInfo["knownAdvertisements"][number]) {
+        const currentValue = core.services.setting.currentSettings()?.P2P_SyncOnReplication ?? "";
+        const newValue = isSyncTarget(peer.name)
+            ? removeFromList(peer.name, currentValue)
+            : addToList(peer.name, currentValue);
+        await core.services.setting.applyPartial({ P2P_SyncOnReplication: newValue }, true);
+    }
 </script>
 
 <div class="p2p-container">
     <div class="pane-header">
-        <h2>P2P Host</h2>
+        <h2>P2P Status</h2>
         <button
             class="icon-button"
             onclick={openConnectionSettings}
@@ -164,7 +200,7 @@
 
     <div class="peers-section">
         <div class="peers-header">
-            <h3>Known Devices</h3>
+            <h3>Detected Peers</h3>
             <button class="refresh" onclick={requestServerStatus}>Refresh</button>
         </div>
 
@@ -207,8 +243,17 @@
                                     >
                                         {isWatching(peer.peerId) ? '👁' : '👁‍🗨'}
                                     </button>
-                                </div>
-                            {:else}
+                                </div>                                <div class="decision-row watch-row">
+                                    <span class="decision-label">SYNC</span>
+                                    <button
+                                        class="emoji-button {isSyncTarget(peer.name) ? 'is-watching' : ''}"
+                                        title={isSyncTarget(peer.name) ? 'Sync target \u2014 click to remove' : 'Set as sync target'}
+                                        aria-label={isSyncTarget(peer.name) ? 'Remove sync target' : 'Set sync target'}
+                                        onclick={() => toggleSyncTarget(peer)}
+                                    >
+                                        {isSyncTarget(peer.name) ? '🔄' : '🔁'}
+                                    </button>
+                                </div>                            {:else}
                                 <div class="decision-status">
                                     <span class="badge status-chip {getAcceptanceStatusClass(peer)}">
                                         {getAcceptanceStatus(peer)}

src/features/P2PSync/P2PReplicator/P2PServerStatusPaneView.ts

@@ -28,7 +28,7 @@ export class P2PServerStatusPaneView extends SvelteItemView {
     }
 
     getDisplayText() {
-        return "P2P Server Status";
+        return "P2P Status";
     }
 
     instantiateComponent(target: HTMLElement) {
@@ -36,6 +36,7 @@ export class P2PServerStatusPaneView extends SvelteItemView {
             target,
             props: {
                 liveSyncReplicator: this._p2pResult.replicator,
+                core: this.core,
             },
         });
     }

src/main.ts

@@ -44,7 +44,7 @@ import { useSetupManagerHandlersFeature } from "./serviceFeatures/setupObsidian/
 import { useP2PReplicatorFeature } from "@lib/replication/trystero/useP2PReplicatorFeature.ts";
 import { useP2PReplicatorCommands } from "@lib/replication/trystero/useP2PReplicatorCommands.ts";
 import { useP2PReplicatorUI } from "./serviceFeatures/useP2PReplicatorUI.ts";
-import { createOpenReplicationUI } from "./features/P2PSync/P2PReplicator/P2PReplicationUI.ts";
+import { createOpenReplicationUI, createOpenRebuildUI } from "./features/P2PSync/P2PReplicator/P2PReplicationUI.ts";
 export type LiveSyncCore = LiveSyncBaseCore<ObsidianServiceContext, LiveSyncCommands>;
 export default class ObsidianLiveSyncPlugin extends Plugin {
     core: LiveSyncCore;
@@ -177,7 +177,11 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
                 const curriedFeature = () => featuresInitialiser(core);
                 core.services.appLifecycle.onLayoutReady.addHandler(curriedFeature);
                 const setupManager = core.getModule(SetupManager);
-                const replicator = useP2PReplicatorFeature(core, createOpenReplicationUI(this.app));
+                const replicator = useP2PReplicatorFeature(
+                    core,
+                    createOpenReplicationUI(this.app),
+                    createOpenRebuildUI(this.app)
+                );
                 useP2PReplicatorCommands(core, replicator);
                 useP2PReplicatorUI(core, core, replicator);
                 useRemoteConfiguration(core);

src/modules/coreFeatures/ModuleResolveMismatchedTweaks.ts

@@ -14,6 +14,7 @@ import { AbstractModule } from "../AbstractModule.ts";
 import { $msg } from "../../lib/src/common/i18n.ts";
 import type { InjectableServiceHub } from "../../lib/src/services/InjectableServices.ts";
 import type { LiveSyncCore } from "../../main.ts";
+import { REMOTE_P2P } from "@lib/common/models/setting.const.ts";
 
 export class ModuleResolvingMismatchedTweaks extends AbstractModule {
     async _anyAfterConnectCheckFailed(): Promise<boolean | "CHECKAGAIN" | undefined> {
@@ -186,6 +187,9 @@ export class ModuleResolvingMismatchedTweaks extends AbstractModule {
     async _checkAndAskUseRemoteConfiguration(
         trialSetting: RemoteDBSettings
     ): Promise<{ result: false | TweakValues; requireFetch: boolean }> {
+        if (trialSetting.remoteType === REMOTE_P2P) {
+            return { result: false, requireFetch: false };
+        }
         const preferred = await this.services.tweakValue.fetchRemotePreferred(trialSetting);
         if (preferred) {
             return await this.services.tweakValue.askUseRemoteConfiguration(trialSetting, preferred);

src/modules/features/SetupWizard/dialogs/SelectMethodNewUser.svelte

@@ -48,6 +48,8 @@
             bind:value={userType}
         >
             This is an advanced option for users who do not have a URI or who wish to configure detailed settings.
+            You can also select this option if you intend to use <strong>P2P (Peer-to-Peer) synchronisation</strong>
+            instead of a CouchDB/S3 server — P2P requires no server setup at all.
         </Option>
     </Options>
 </Instruction>

src/modules/services/ObsidianAPIService.ts

@@ -39,6 +39,11 @@ export class ObsidianAPIService extends InjectableAPIService<ObsidianServiceCont
     }
 
     override async showWindowOnRight(viewType: string): Promise<void> {
+        const existing = this.app.workspace.getLeavesOfType(viewType);
+        if (existing.length > 0) {
+            await this.app.workspace.revealLeaf(existing[0]);
+            return;
+        }
         const rightLeaf = this.app.workspace.getRightLeaf(false);
         if (rightLeaf) {
             await rightLeaf.setViewState({

src/serviceFeatures/redFlag.ts

@@ -5,7 +5,7 @@ import { FlagFilesHumanReadable, FlagFilesOriginal } from "@lib/common/models/re
 import FetchEverything from "../modules/features/SetupWizard/dialogs/FetchEverything.svelte";
 import RebuildEverything from "../modules/features/SetupWizard/dialogs/RebuildEverything.svelte";
 import { extractObject } from "octagonal-wheels/object";
-import { REMOTE_MINIO } from "@lib/common/models/setting.const";
+import { REMOTE_MINIO, REMOTE_P2P } from "@lib/common/models/setting.const";
 import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
 import { TweakValuesShouldMatchedTemplate } from "@lib/common/models/tweak.definition";
 
@@ -200,6 +200,13 @@ export async function adjustSettingToRemoteIfNeeded(
         return;
     }
 
+    // P2P has no centralised remote configuration; skip to avoid a spurious
+    // "Failed to connect to the remote server" error dialog.
+    if (config.remoteType === REMOTE_P2P) {
+        log("Remote configuration fetch skipped (P2P mode).", LOG_LEVEL_INFO);
+        return;
+    }
+
     // Remote configuration fetched and applied.
     if (await adjustSettingToRemote(host, log, config)) {
         config = host.services.setting.currentSettings();

src/serviceFeatures/useP2PReplicatorUI.ts

@@ -10,6 +10,7 @@ import {
 } from "@/features/P2PSync/P2PReplicator/P2PServerStatusPaneView";
 import type { LiveSyncCore } from "@/main";
 import type { WorkspaceLeaf } from "@/deps";
+import { REMOTE_P2P } from "@lib/common/models/setting.const";
 
 /**
  * ServiceFeature: P2P Replicator lifecycle management.
@@ -100,17 +101,52 @@ export function useP2PReplicatorUI(
 
         api.addCommand({
             id: "open-p2p-server-status",
-            name: "P2P Sync : Open P2P Server Status",
+            name: "P2P Sync : Open P2P Status",
             callback: () => {
                 void openStatusPane();
             },
         });
+        host.services.API.addCommand({
+            id: "replicate-now-by-p2p-default-peer",
+            name: "Replicate P2P to default peer",
+            checkCallback: (isChecking: boolean) => {
+                const settings = host.services.setting.currentSettings();
+                if (isChecking) {
+                    if (settings.remoteType == REMOTE_P2P) return false;
+                    return replicator.replicator?.server?.isServing ?? false;
+                }
+                void replicator.replicator?.openReplication(settings, false, true, false);
+            },
+        });
+        host.services.API.addCommand({
+            id: "replicate-now-by-p2p",
+            name: "Replicate now by P2P",
+            checkCallback: (isChecking: boolean) => {
+                const settings = host.services.setting.currentSettings();
+                if (isChecking) {
+                    if (settings.remoteType == REMOTE_P2P) return false;
+                    return replicator.replicator?.server?.isServing ?? false;
+                }
+                void replicator.replicator?.openReplication(settings, false, true, false);
+            },
+        });
+
+        host.services.API.addCommand({
+            id: "p2p-sync-targets",
+            name: "P2P: Sync with targets",
+            checkCallback: (isChecking: boolean) => {
+                if (isChecking) {
+                    return replicator.replicator?.server?.isServing ?? false;
+                }
+                void replicator.replicator?.replicateFromCommand(true);
+            },
+        });
 
         // api.addRibbonIcon("waypoints", "P2P Replicator", () => {
         //     void openPane();
         // })?.addClass?.("livesync-ribbon-replicate-p2p");
 
-        api.addRibbonIcon("waypoints", "P2P Server Status", () => {
+        api.addRibbonIcon("waypoints", "P2P Status", () => {
             void openStatusPane();
         })?.addClass?.("livesync-ribbon-p2p-server-status");
 

updates.md

@@ -3,17 +3,19 @@ Since 19th July, 2025 (beta1 in 0.25.0-beta1, 13th July, 2025)
 
 The head note of 0.25 is now in [updates_old.md](https://github.com/vrtmrz/obsidian-livesync/blob/main/updates_old.md). Because 0.25 got a lot of updates, thankfully, compatibility is kept and we do not need breaking changes! In other words, when get enough stabled. The next version will be v1.0.0. Even though it my hope.
 
-## Unreleased
-
-15th May, 2026
+## 0.25.63
 
+17th May, 2026
 
 ### Fixed
 - The issue which cannot synchronise in Only-P2P mode has been fixed.
+- Fixed an issue where "Failed to connect to the remote server" was shown during the redFlag rebuild flow when P2P was the primary remote type. Remote configuration fetch is now skipped for P2P.
 
 ### P2P Replication UI Improvements
 - Brand-new P2P Server Status pane has been added to provide real-time visibility into your connection status and peer network.
+  - For detailed instructions on using the new P2P features, please refer to the updated [User Guide: Peer-to-Peer Synchronisation (2026 Edition)](./docs/p2p_sync_updates_2026.md).
 - Now `Replicate` button or ribbon icon opens a redesigned interactive replication dialogue that performs smart bidirectional sync with a single click.
+- The vault rebuild flow (`replicateAllFromServer`) now opens the redesigned P2P Replication modal instead of a plain text selection dialogue, providing a consistent UI experience.
 
 ## 0.25.62