Document settings registration lifecycle

Record published 1.0.19 pre-release metadata

README.md

@@ -68,6 +68,13 @@ Each workflow establishes ordinary note synchronisation on the first device, gen
 > CouchDB can also be run on a Raspberry Pi (please be mindful of your server's security).
 
 
+### Third-party managed CouchDB hosting
+
+> [!NOTE]
+> The following is a third-party hosting option proposed by Zenith Hosting. It is not an official Self-hosted LiveSync service, and it is neither endorsed nor recommended by this project.
+
+If you would rather not set up and maintain a server yourself, Zenith Hosting offers a managed CouchDB server which this plug-in can be configured to connect to: [Zenith Hosting](https://zenith.hosting/host/obsidian-livesync). As with any hosted service, your data will reside on a server operated by a third party, so please consider whether that is acceptable for your vault before using it.
+
 ## Information in the Status Bar
 
 Synchronisation status is shown in the status bar with the following icons.

devs.md

@@ -27,6 +27,21 @@ npm ci
 npm run build
 ```
 
+#### Community Review dependency installation
+
+Community Review installs dependencies independently before applying type-aware source rules. A successful installation with the npm version bundled with the repository's current Node.js CI does not prove that the lockfile is accepted by the scanner's npm version.
+
+After changing `package.json`, a workspace manifest, or `package-lock.json`, verify both installation paths:
+
+```bash
+npm ci --ignore-scripts
+npx --yes npm@10.9.2 ci --ignore-scripts
+```
+
+The npm 10.9.2 command is the current project-side compatibility check for the Community Review installation path. Update this check when the scanner runtime changes.
+
+If Community Review reports widespread TypeScript `error` types across unrelated external packages, confirm that dependency installation completed successfully before changing source imports, declarations, or lint rules. An installation failure can make every unresolved external type appear as downstream unsafe-type findings.
+
 ### Commands
 
 ```bash
@@ -230,6 +245,12 @@ export class ModuleExample extends AbstractObsidianModule {
 
 - Settings are defined by Commonlib (`ObsidianLiveSyncSettings`)
 - Configuration metadata is supplied by the Commonlib settings exports
+- Obsidian may request declarative definitions immediately from
+  `Plugin.addSettingTab()`. Register a settings tab which reads persisted values
+  from the sequential `onSettingLoaded` lifecycle, seed its editing snapshot
+  before registration, and keep definition construction independent of local
+  database and replicator readiness. See
+  [the declarative settings adapter ADR](docs/adr/2026_08_declarative_settings_adapter.md).
 - Use `this.services.setting.saveSettingData()` instead of using plugin methods directly
 
 ### Database Operations
@@ -261,6 +282,7 @@ export class ModuleExample extends AbstractObsidianModule {
 - Avoid listing purely internal refactors, maintenance chores, generated-file changes, and dependency updates unless they affect users; group and label them when they are included.
 - When preparing a release, replace `## Unreleased` with the target version heading (for example, `## 0.25.81`) and add a fresh empty `## Unreleased` section above it for the next cycle.
 - Review and polish the released section in the release PR before tagging, because the content is embedded into the plug-in and may be reused as the GitHub Release notes.
+- Keep approximately the five most recent published plug-in versions in the embedded `updates.md`. Move older published sections unchanged into the appropriate release-line archive under `docs/releases/`, and update the history references when rotating them.
 
 ## Release Workflow
 

docker/README.md

@@ -3,6 +3,8 @@
 A fully self-hosted CouchDB stack for the [obsidian-livesync](https://github.com/vrtmrz/obsidian-livesync) plugin.  
 **No fly.io. No IBM Cloudant. No cloud accounts required for basic use.**
 
+The optional [Coturn Compose starter](coturn/README.md) is a separate Linux-only service for P2P connectivity. It is not part of the CouchDB stack below.
+
 > ✅ **Tested on Docker Desktop for Windows (Docker 29.2, Compose v5, WSL2 backend)** — full init, CORS, auth, and idempotent restart verified.
 
 ---

docker/coturn/.env.example

@@ -0,0 +1,11 @@
+# Public DNS name used as the TURN authentication realm.
+TURN_REALM=
+
+# Public IPv4 address advertised by Coturn. If Coturn is behind NAT, forward
+# port 3478 (TCP and UDP) and the UDP relay range to this host.
+TURN_EXTERNAL_IP=
+
+# Static long-term credential used by the LiveSync P2P profile. Use a simple
+# username without a colon and a high-entropy password, such as hexadecimal.
+TURN_USERNAME=
+TURN_PASSWORD=

docker/coturn/.gitignore

@@ -0,0 +1 @@
+/.env

docker/coturn/README.md

@@ -0,0 +1,81 @@
+# Coturn starter for LiveSync P2P
+
+This optional Compose project runs a small, static-credential TURN service for LiveSync P2P. It uses the upstream `coturn/coturn` image directly; the repository does not maintain a separate Coturn Dockerfile.
+
+The starter is deliberately limited to a Linux server with a public IPv4 address, TURN over UDP and TCP on port 3478, and UDP relay ports 49160–49200. It does not configure TLS, automatic certificate renewal, monitoring, quotas, or a managed credential endpoint.
+
+## Before starting
+
+Prepare:
+
+- a Linux host with Docker Engine and the Compose plug-in;
+- a public IPv4 address, either on the host or forwarded to it;
+- a DNS name such as `turn.example.com`;
+- firewall and NAT rules for TCP and UDP port 3478, and UDP ports 49160–49200; and
+- enough bandwidth for every relayed P2P transfer.
+
+Docker host networking is intentional. Coturn's upstream image recommends it because forwarding a large relay port range through Docker performs poorly. This starter therefore does not support Docker Desktop.
+
+## Configure and start
+
+From this directory:
+
+```sh
+cp .env.example .env
+chmod 600 .env
+```
+
+Set every value in `.env`. Generate a high-entropy password, for example:
+
+```sh
+openssl rand -hex 32
+```
+
+Use a simple username without a colon. The static username and password are passed to Coturn as process arguments. They are visible to a local Docker administrator, who already controls the host. The `.env` file is excluded from Git and should remain private. The resolved output of `docker compose config` also contains the credential, so do not publish it.
+
+Validate the resolved configuration, then start it:
+
+```sh
+docker compose config
+docker compose up -d
+docker compose logs -f coturn
+```
+
+The pinned image version is deliberate. Review the upstream Coturn release notes and update the pin explicitly rather than following `latest` automatically.
+
+## Configure LiveSync
+
+Enter both client paths in the P2P profile's TURN server list:
+
+```text
+turn:turn.example.com:3478?transport=udp,turn:turn.example.com:3478?transport=tcp
+```
+
+Use `TURN_USERNAME` and `TURN_PASSWORD` as the TURN username and credential. Keep the normal `Automatic` ICE policy unless a future LiveSync release offers `TURN relay only` and the direct path needs to be excluded deliberately.
+
+Both synchronising devices must be able to reach the server. Prove an explicit two-way `Replicate now` round trip on the intended networks before relying on the configuration.
+
+The repository check can validate Compose expansion and local TURN allocations. It cannot prove the public firewall, NAT, carrier, or client path for a particular deployment. Validate both UDP and TCP from outside the server network.
+
+## TLS and port 443 are advanced extensions
+
+This starter does not recommend putting Coturn on port 443. Coturn cannot bind to the same IP address and TCP port as Caddy or another HTTPS entry point. In particular, it conflicts with the bundled CouchDB Caddy profile when both use the same host address.
+
+If a restrictive network requires TURN over TLS on port 443, prefer a separate TURN host or a separate public IP address. An outbound tunnel used for CouchDB may also leave the host's public port 443 available for Coturn, provided that TURN uses a separate DNS record which resolves directly to that host. The tunnel itself does not carry TURN traffic.
+
+A single public IP can technically be shared when one layer-4 TLS router owns port 443 and routes separate CouchDB and TURN hostnames by Server Name Indication (SNI). This adds another certificate and connection-routing boundary, depends on every intended TURN client supplying usable SNI, and is outside this starter. The standard Caddy image used by the bundled CouchDB profile does not provide that layer-4 routing.
+
+TURN over TLS is not HTTP. An ordinary HTTP reverse proxy or Cloudflare Tunnel route is not a substitute for a TURN listener. Follow Coturn's upstream configuration guidance for `tls-listening-port`, `cert`, and `pkey`, arrange renewal and restart behaviour, and test the resulting `turns:` URL from outside the server network.
+
+This starter disables Coturn's TLS listener and does not add a TURN-over-DTLS path, so it cannot appear to provide a secure TURN port without those operator-owned prerequisites. This does not disable the end-to-end DTLS encryption used by the WebRTC peer connection carried through TURN.
+
+## Security and operations
+
+- Rotate the static credential if the Setup URI, `.env` file, or credential is exposed.
+- Treat TURN as an internet-facing bandwidth service and monitor traffic and logs.
+- Add appropriate allocation and bandwidth quotas for a shared or public deployment.
+- Keep the private-address restrictions unless the TURN server is intentionally permitted to relay to those networks.
+- Keep independent Vault backups. TURN improves connection reachability; it does not store a backup of Vault data.
+- A TURN operator can observe endpoint addresses, timing, and traffic volume even though LiveSync content remains end-to-end encrypted.
+
+The authoritative image and configuration references are the [Coturn Docker image guide](https://github.com/coturn/coturn/blob/master/docker/coturn/README.md) and [Coturn server documentation](https://github.com/coturn/coturn/blob/master/README.turnserver).

docker/coturn/compose.yml

@@ -0,0 +1,33 @@
+name: livesync-coturn
+
+services:
+    coturn:
+        image: coturn/coturn:4.17.2
+        restart: unless-stopped
+        network_mode: host
+        # Compose has already interpolated the environment values. Invoke Coturn
+        # directly so that the image's shell entrypoint does not expand them again.
+        entrypoint:
+            - turnserver
+        command:
+            - "-n"
+            - "--log-file=stdout"
+            - "--pidfile=/tmp/turnserver.pid"
+            - "--listening-ip=0.0.0.0"
+            - "--listening-port=3478"
+            - "--min-port=49160"
+            - "--max-port=49200"
+            - "--external-ip=${TURN_EXTERNAL_IP:?Set TURN_EXTERNAL_IP in docker/coturn/.env}"
+            - "--realm=${TURN_REALM:?Set TURN_REALM in docker/coturn/.env}"
+            - "--user=${TURN_USERNAME:?Set TURN_USERNAME in docker/coturn/.env}:${TURN_PASSWORD:?Set TURN_PASSWORD in docker/coturn/.env}"
+            - "--fingerprint"
+            - "--lt-cred-mech"
+            - "--stale-nonce=600"
+            - "--unauthorized-ratelimit"
+            - "--no-multicast-peers"
+            - "--denied-peer-ip=10.0.0.0-10.255.255.255"
+            - "--denied-peer-ip=100.64.0.0-100.127.255.255"
+            - "--denied-peer-ip=169.254.0.0-169.254.255.255"
+            - "--denied-peer-ip=172.16.0.0-172.31.255.255"
+            - "--denied-peer-ip=192.168.0.0-192.168.255.255"
+            - "--no-tls"

docs/adr/2026_07_common_library_package_boundary.md

@@ -267,7 +267,7 @@ The Community directory scanner preview completes with no source-code errors. Th
 
 The remaining source warnings belong to application code. Browser dialogue visibility now uses DOM state instead of inline static styling, so the earlier styling warning is absent. Direct diagnostic output was resolved at its existing ownership boundaries: Webapp components use an injected log function backed by `BrowserAPIService`, WebPeer retains output in its Svelte log store, Obsidian modules use the established Logger path, and duplicate console emission was removed from `ModuleLog`. The later Webapp and WebPeer recomposition around maintained Context and serviceFeature APIs should preserve these explicit output paths.
 
-The final Community lint inventory for this boundary has no errors and 126 warnings: 67 sentence-case findings, 58 deprecated-API findings, and one declarative setting-definition suggestion. The sentence-case strings and deprecated interfaces are retained deliberately to avoid an unrelated localisation and host-lifecycle change. Declarative definitions would migrate the complete Obsidian setting tab into the 1.13 settings-search model; that is a separate visible UI project after LiveSync 1.0, not a hidden package-boundary release gate. Revisit each category through focused UI and compatibility work rather than suppressing the rules or treating the warning count as zero.
+The final Community lint inventory for this boundary has no errors and 126 warnings: 67 sentence-case findings, 58 deprecated-API findings, and one declarative setting-definition suggestion. The sentence-case strings and deprecated interfaces are retained deliberately to avoid an unrelated localisation and host-lifecycle change. Declarative definitions would migrate the complete Obsidian setting tab into the 1.13 settings-search model; that is a separate visible UI project after LiveSync 1.0, not a hidden package-boundary release gate. Revisit each category through focused UI and compatibility work rather than suppressing the rules or treating the warning count as zero. The declarative-settings suggestion was subsequently addressed by [Adapt Standard Settings to Obsidian's Declarative API](2026_08_declarative_settings_adapter.md); the figures above remain the historical package-boundary inventory.
 
 WebPeer's production build still reports that Vite externalises the guarded Node `crypto` fallback reached through a compatibility path. Browser execution selects `globalThis.crypto`, and the focused root, `context`, and `browser` bundle checks do not include the Node fallback, so this is not a leak in the reviewed public browser entries. Removing the compatibility-build warning requires a focused crypto-capability contract or a platform-specific implementation split and remains part of compatibility-surface narrowing.
 
@@ -275,7 +275,7 @@ The dependency preview also reports `uuid`, but the installed and locked graph r
 
 The 1.0 dependency review found newly disclosed parser and denial-of-service advisories with compatible fixes. All locked `brace-expansion` generations now use their patched releases, including the production generation reached by Commonlib path matching and the CLI's user-configured ignore patterns. The development-only ESLint and Istanbul `js-yaml` generations likewise use patched releases. The production Markdown parser uses the patched `linkify-it` release to avoid quadratic processing of maliciously structured `mailto:` links, while the development-only JSON Schema toolchain uses the patched `fast-uri` release for unambiguous hostname parsing. A clean install and both complete and production-only `npm audit` checks no longer report these packages.
 
-The remaining audit report is the existing `werift` and `werift-ice` dependency on `ip`, for which npm offers no patched version. The advisory concerns `ip.isPublic()` misclassifying unusual loopback representations. The locked werift implementation uses `ip` for address encoding, decoding, format detection, and loopback filtering, but does not call `isPublic()` or `isPrivate()`. LiveSync reaches werift only through the Node CLI's injected `RTCPeerConnection`; the Obsidian plug-in and browser applications use their platform WebRTC implementation, and the plug-in artefact does not contain werift. The package-level finding is therefore accepted for the 1.0 integration preview as a non-reachable advisory in the reviewed call path, not as a general waiver. Revisit it when werift or `ip` publishes a replacement, or before any change which delegates address trust, routing, or URL access decisions to that dependency.
+The initial 1.0 dependency review also found `werift` and `werift-ice` pulling in `ip`, for which npm offers no patched version. The advisory concerns `ip.isPublic()` misclassifying unusual loopback representations. LiveSync reached werift only through the Node CLI's injected `RTCPeerConnection`, and the reviewed call path did not use `isPublic()` or `isPrivate()`. This temporary acceptance ended when werift removed the dependency: the CLI now uses `werift` 0.24.4 or later, the installed production graph contains no `ip` package, and `npm audit --omit=dev` reports no vulnerabilities.
 
 The local real-Obsidian suite verifies the actual loaded `ObsidianServiceContext`, all 18 services, Vault reflection, CouchDB and Object Storage transfer, remote-activity accounting, CLI-to-Obsidian encrypted synchronisation, startup scanning, two-Vault create, update, delete, ordinary rename, case-only rename, target mismatch, Hidden File Sync, Customisation Sync, setting Markdown export, and two-device CouchDB, Object Storage, and P2P Setup URI workflows. These checks establish observable results and host composition rather than relying on declaration compatibility alone.
 

docs/adr/2026_07_feature_maturity_for_1_0.md

@@ -34,7 +34,7 @@ Version 1.0 needs to distinguish supported opt-in features from previews and fro
 - `xxhash64` is the current hash contract. Other hash algorithms remain available for existing databases and edge-case recovery, not as experimental alternatives for new Vaults.
 - Eden chunks remain accepted at runtime and in transported settings, but are not offered in the settings interface.
 - `doNotUseFixedRevisionForChunks` remains an inert compatibility input. Chunk revisions are always content-derived.
-- The deprecated cleaned-database reconciliation callback remains internal while an old IndexedDB client may still encounter that remote state. It is not a user-selectable maintenance action and is omitted from the settings reference.
+- The cleaned-database compatibility path remains internal while an old IndexedDB client may still encounter that remote state. It is not a user-selectable maintenance action and is omitted from the settings reference.
 
 ### Already removed
 

docs/adr/2026_08_couchdb_remote_connection_ownership.md

@@ -0,0 +1,329 @@
+# Architectural Decision Record: CouchDB Remote Connection Ownership
+
+## Status
+
+Accepted. The first implementation is deliberately limited to the
+abort-capable CouchDB connectivity preflight used by one-shot replication.
+
+## Context
+
+Commonlib opens a remote CouchDB database through `RemoteService.connect()`.
+Before this decision, a successful call returned only a PouchDB handle and an
+information snapshot:
+
+```typescript
+{
+    db: PouchDB.Database<EntryDoc>;
+    info: PouchDB.Core.DatabaseInfo;
+}
+```
+
+The value did not state who must close the handle or how requests which outlive
+the current operation are cancelled. Callers consequently accumulated their
+own `try`/`finally` blocks and closing helpers. Commonlib PR 112 made finite
+handle clean-up substantially safer, but closing a raw PouchDB handle still did
+not define ownership of its outstanding HTTP work.
+
+A remote PouchDB HTTP handle is not a dedicated socket. `db.close()` emits
+PouchDB's normal `closed` event and closes the logical handle, but the HTTP
+adapter does not establish that a pending browser fetch or response-body read
+has stopped. `RemoteService.performFetch()` also records a physical request as
+complete once response headers have arrived, while PouchDB may still be reading
+and parsing the body. Neither the request counters nor raw `db.close()` can
+therefore prove that the transport work has settled.
+
+One-shot CouchDB replication performs the following work before it creates the
+replication controller:
+
+1. prepare the encryption security seed;
+2. construct the remote PouchDB handle and read database information;
+3. check and, where required, migrate the remote database version;
+4. read and update compatibility Metadata, including the milestone document;
+   and
+5. create the PouchDB replication operation.
+
+The controller owned by `processSync()` begins only at step 5. A request which
+never settles during steps 2 to 4 is outside that cancellation scope. The
+shared one-shot result remains pending as well, so later triggers join the same
+pending operation rather than beginning a fresh attempt.
+
+Self-hosted LiveSync issue 1116 provides evidence of this failure shape. On one
+Linux and Electron combination, a one-shot attempt remained pending while
+writing the remote milestone document. Bypassing that write allowed the
+attempt to reach later replication requests. A local real-Obsidian exercise
+reproduced the preceding Fast Fetch state but not the indefinite write. The
+evidence does not establish a milestone-specific defect, a CouchDB defect, a
+browser connection-pool defect, or a lock cycle. It does establish that the
+connectivity preflight lacks an owner which can terminate its abort-capable
+transport work.
+
+No code-level circular wait has been identified. `shareRunningResult()` shares
+a logical promise, the remote-activity counters observe work, and the global
+replication concurrency controller is entered only after the preflight. Adding
+a semaphore or another connection lock would let a stalled request retain the
+permit; it would not make that request settle.
+
+## Decision
+
+### Extend the existing connection result
+
+Commonlib will define the owned connection as the existing flat result with one
+additional operation:
+
+```typescript
+interface RemoteConnectionOpenOptions {
+    readonly signal?: AbortSignal;
+    readonly allowNativeFallback?: boolean;
+}
+
+interface OwnedCouchDBConnection<T extends object> {
+    readonly db: PouchDB.Database<T>;
+    readonly info: PouchDB.Core.DatabaseInfo;
+    close(): Promise<void>;
+}
+
+interface CouchDBReplicationConnection extends OwnedCouchDBConnection<EntryDoc> {
+    readonly syncOptionBase: PouchDB.Replication.SyncOptions;
+    readonly syncOption: PouchDB.Replication.SyncOptions;
+}
+```
+
+`RemoteService.connect()` remains the entry point. It returns
+`OwnedCouchDBConnection` directly; there is no nested resource wrapper, separate
+lease API, public connection signal, or public `abort()` operation. The
+connection and checked replication types are owned and documented by
+Commonlib. Compatibility checks enrich the same connection with replication
+options instead of creating another lifetime object.
+
+The following properties are part of the contract:
+
+- `close()` is idempotent;
+- `close()` first cancels abort-capable requests scoped to the connection, then
+  calls PouchDB's ordinary `db.close()`;
+- PouchDB retains its normal `closed` event behaviour;
+- the optional input signal cancels the same internal request scope;
+- skipping the information request retains the established placeholder in
+  `info` for source and behaviour compatibility;
+- a close failure is reported diagnostically but does not replace the primary
+  replication result; and
+- ownership of the connection does not imply ownership of a dedicated physical
+  HTTP socket.
+
+The public connection does not expose its internal signal because no caller
+needs to make a second shutdown decision. Owners either cancel through the
+input signal or finish through `close()`. This leaves one operation responsible
+for final clean-up.
+
+Replacing the existing error-string union with a typed connection-failure
+result remains desirable, but it is outside this change. Mixing that migration
+into the first implementation would enlarge the consumer and user-message
+surface without improving cancellation.
+
+### Bind cancellation at the custom fetch boundary
+
+`RemoteService.connect()` creates its internal request scope before PouchDB is
+constructed, so the initial `db.info()` request is covered. The custom PouchDB
+fetch implementation combines, without replacing, both applicable signals:
+
+- the signal supplied by PouchDB for the individual request; and
+- the signal for the owned connection, which follows its optional owner signal.
+
+The combined signal remains applicable while the response body is consumed.
+Receiving response headers is not the end of cancellation ownership.
+
+Cancellation is not a CORS failure. If the connection scope has been aborted,
+the request must not enter the diagnostic fallback from the web-compatible
+fetch path to the native request API. A bounded owner can also disable that
+fallback explicitly.
+
+The web-compatible fetch path honours `AbortSignal`. Obsidian's current native
+`requestUrl` adapter does not expose physical cancellation through
+`RequestInit.signal`. The implementation must not use `Promise.race()` to
+declare a native remote write cancelled while it may still complete. A bounded
+guarantee therefore applies only where the selected request path remains
+abort-capable.
+
+### Transfer the same connection between owners
+
+At every point, exactly one operation is responsible for calling `close()`:
+
+1. `RemoteService.connect()` owns the connection until it returns successfully;
+2. the connectivity preflight owns it while checking version and compatibility;
+3. a successful preflight transfers the same connection to the one-shot or
+   continuous replication operation; and
+4. the final replication owner closes it after replication settles or is
+   terminated.
+
+A failed factory or preflight closes the connection in its own failure path. A
+successful transfer clears the former owner's deadline before replication
+continues. Borrowing `connection.db` does not transfer close responsibility.
+
+`shareRunningResult()` owns no connection. It may share the result of an
+operation which owns one, but that operation must settle and close the
+connection before the shared entry can be released for a later attempt.
+
+## Limited Introduction
+
+The first bounded consumer is the CouchDB connectivity preflight reached from
+one-shot replication. Its boundary includes:
+
+- PouchDB construction and the initial `db.info()` request;
+- the database-version check and migration negotiation; and
+- compatibility and milestone reads and writes before replication starts.
+
+The preflight receives an internal 60-second wall-clock deadline. This is a
+last-resort safety fuse for an owner which would otherwise remain pending
+indefinitely. It is not the expected completion time, a service-level target, a
+per-request inactivity timeout, a user setting, a limit on replication
+duration, or the `useTimeouts` changes-feed setting. Tests inject a shorter
+deadline.
+
+When that deadline expires on the web-compatible path:
+
+1. the owner signal aborts the connection's request scope;
+2. the preflight closes the connection;
+3. no PouchDB replication operation is created;
+4. the shared one-shot result settles as failed; and
+5. a later trigger may create a fresh connection and attempt.
+
+On success, the deadline is cleared before the connection is transferred to
+replication, so an old timer cannot interrupt a healthy long-running transfer.
+
+The explicitly selected native Request API retains its previous unbounded
+behaviour because its host adapter cannot honour transport cancellation. The
+security-seed preparation which precedes the shared one-shot operation is also
+outside this first boundary. Fast Fetch, setup probes, maintenance commands,
+status inspection, and other direct CouchDB consumers retain their existing
+deadline and retry policies. They receive the additive `close()` contract but
+are not silently given this one-shot deadline.
+
+The first implementation does not add automatic retry. Retrying before the old
+request is known to be cancelled could duplicate remote writes or consume more
+connections without changing the failing condition.
+
+## Ownership
+
+The legacy `_ensureConnection()` method retains its raw PouchDB return type for
+source compatibility. New Commonlib paths use an internal owned-connection
+helper and do not discard the lifecycle object.
+
+Commonlib owns:
+
+- `OwnedCouchDBConnection`, `RemoteConnectionOpenOptions`, and
+  `CouchDBReplicationConnection`;
+- composition of PouchDB request and connection cancellation signals;
+- the PouchDB custom-fetch integration;
+- idempotent connection close behaviour;
+- ownership transfer within the CouchDB replicator; and
+- timeout classification at the connectivity-preflight boundary.
+
+Self-hosted LiveSync owns:
+
+- the concrete Obsidian fetch adapters and their declared capabilities;
+- user-facing logs or notices for a timed-out attempt;
+- integration of an immutable Commonlib release; and
+- real-Obsidian validation of the affected consumer path.
+
+No host may claim physical cancellation unless its injected fetch
+implementation honours the supplied signal.
+
+## Non-Goals
+
+This decision does not:
+
+- identify the exact environmental cause reported in issue 1116;
+- guarantee that a one-shot attempt succeeds;
+- special-case the milestone document or its URL;
+- impose a global connection limit or connection semaphore;
+- add an automatic retry, fallback, or remote reconciliation policy;
+- apply a deadline to ordinary replication, continuous changes feeds, Fast
+  Fetch, rebuilds, or bulk transfers;
+- change CouchDB documents, checkpoints, encryption, the security seed, or
+  compatibility Metadata;
+- make `close()` equivalent to closing a browser socket;
+- detach a potentially mutating native request and report it as cancelled; or
+- migrate every direct PouchDB borrower to the one-shot deadline policy.
+
+## Alternatives Rejected
+
+### Time out only the milestone write
+
+The observed write is where one report stopped, not an established ownership
+boundary. Another environment could stop at `db.info()`, version Metadata,
+response-body parsing, or an adjacent compatibility request.
+
+### Race the preflight without cancelling its transport
+
+This would release `shareRunningResult()` while the old request remained able
+to complete. It is especially unsafe for a remote `PUT`, because a later
+attempt could begin after the first had been reported as failed.
+
+### Add a global semaphore or lower the connection count
+
+No connection-limit failure has been demonstrated. A stalled owner would
+retain its permit indefinitely and turn an unexplained request into an explicit
+queue deadlock.
+
+### Add a separate lease wrapper
+
+A nested `{ connection: { db, close }, info }` result would make ownership
+visible, but it would duplicate the existing connection shape, force callers
+through another projection, and expose lifetime operations which have no
+consumer. Adding `close()` to the existing value preserves source compatibility
+and keeps the PouchDB handle, information snapshot, and lifetime together.
+
+### Share one global remote PouchDB handle
+
+A singleton would couple setup, maintenance, one-shot, and continuous
+lifecycles, make credential and setting changes harder to isolate, and turn one
+stalled request into a process-wide resource.
+
+## Verification
+
+The regression tests were changed before the implementation. Against the old
+flat result they demonstrated that:
+
+- an owner signal left an in-flight request pending;
+- the result had no `close()` operation capable of interrupting a body read;
+- a bounded web-compatible request could enter the native fallback; and
+- the one-shot path still depended on the discarded nested connection API.
+
+After the change, focused Commonlib tests verify that:
+
+- an owner signal settles a pending request;
+- `close()` interrupts a response body read before closing PouchDB;
+- repeated `close()` calls close the handle once;
+- an aborted or bounded request does not enter the non-abortable native adapter;
+- deadline expiry closes the same flat connection and releases the shared
+  one-shot attempt;
+- a later invocation begins after that release;
+- a successful preflight clears its deadline and transfers ownership; and
+- close failures are logged without replacing timeout or replication results.
+
+Type checking and package-boundary checks verify the Commonlib-owned
+declarations and compatibility export. Self-hosted LiveSync must then validate
+the exact packed Commonlib artefact with its focused consumer tests and an
+ordinary real-Obsidian and CouchDB smoke test. The reporter's environment
+remains the validation boundary for the original platform-specific symptom.
+
+## Consequences
+
+- A successful remote connection has one explicit close operation without a
+  parallel lease abstraction.
+- Existing `{ db, info }` consumers remain source-compatible and may adopt
+  `close()` without changing their projections.
+- One-shot connectivity can become a bounded failure on an abort-capable
+  transport instead of retaining the shared operation indefinitely.
+- Native `requestUrl` cancellation remains an acknowledged gap rather than a
+  falsely satisfied contract.
+- Other finite consumers can adopt owner signals and explicit `close()` one at
+  a time, with tests for their own side effects and retry policies.
+
+## References
+
+- [Bounded Remote Activity](2026_07_bounded_remote_activity.md)
+- [Fast Fetch Persistence and Completion Semantics](2026_08_fast_fetch_persistence_and_completion.md)
+- Commonlib PR 112, which closes finite remote PouchDB handles after their
+  logical owners settle
+- Self-hosted LiveSync issue 1116, which reports a one-shot compatibility write
+  remaining pending on one Linux and Electron environment

docs/adr/2026_08_declarative_settings_adapter.md

@@ -0,0 +1,731 @@
+---
+date: 2026-08-25
+commonlib-version: "0.1.19"
+self-hosted-livesync-version: "1.0.20"
+status: accepted
+---
+
+# Architectural Decision Record: Adapt Standard Settings to Obsidian's Declarative API
+
+## Status
+
+Accepted and implemented through Stage C1 and two bounded Stage C2
+landing-page improvements. The shared specification remains deliberately
+limited to one-key, immediately persisted controls. Complex pages retain their
+existing renderers instead of being forced through a general abstraction.
+Settings pending application which require database initialisation now delegate
+their decision, scheduling, and restart boundary to `SetupManager` and
+`Rebuilder`. Setting-tab registration and definition construction also follow
+the persisted-settings lifecycle rather than transient runtime readiness.
+
+## Context
+
+Obsidian 1.13 introduced declarative plug-in settings through
+`PluginSettingTab.getSettingDefinitions()`. Declarative definitions are used for
+native rendering, validation, navigation, and global settings search. When the
+method returns a non-empty array, Obsidian does not call the existing
+`display()` implementation.
+
+Obsidian may call `getSettingDefinitions()` as soon as a tab is passed to
+`Plugin.addSettingTab()`. Registering the tab during initialisation therefore
+allowed definition construction to observe constructor defaults before
+persisted settings had loaded. The former landing-page predicate also inspected
+the active replicator, although the local database and replicator are created
+only after the settings-loaded lifecycle. On start-up this ordering could emit
+a spurious missing-replicator warning and produce a landing-page order from
+transient state.
+
+Self-hosted LiveSync still supports Obsidian versions before 1.13 through its
+`minAppVersion` of 1.7.2. It must therefore retain an imperative `display()`
+fallback unless the minimum supported Obsidian version is raised separately.
+Maintaining an unrelated declarative definition and imperative implementation
+for each setting would allow the two interfaces to drift.
+
+The current `LiveSyncSetting` AutoWire implementation combines several
+responsibilities:
+
+- Commonlib setting metadata supplies setting names, descriptions, maturity, and
+  configuration level;
+- pane functions decide page and group membership, control type, options, and
+  conditional visibility;
+- `LiveSyncSetting` creates and updates Obsidian DOM components;
+- `ObsidianLiveSyncSettingTab` owns an editing buffer, dirty state, local and
+  persisted settings, and save operations; and
+- selected controls add staged Apply behaviour, derived values, or effects
+  which run after a successful save.
+
+These responsibilities are not all declarative setting data. In particular,
+Remote Configuration, Hatch, Maintenance, Help, and Selector contain dynamic
+lists, Svelte components, diagnostic results, multi-step actions, and
+destructive confirmations. Encoding those interactions in a general settings
+DSL would increase the abstraction before a second renderer had proved which
+parts are genuinely shared.
+
+Commonlib's `SettingInformation` setting metadata contains more entries than
+the current settings interface exposes. Generating definitions from all of it
+would therefore make compatibility or internal settings searchable merely
+because they have labels. Page membership must remain an explicit LiveSync
+decision.
+
+The existing legacy settings wizard also changes DOM classes and selects panes
+through `enableMinimalSetup()`. The maintained onboarding path now uses
+`SetupManager`. The current call graph has no caller for
+`askAgainForSetupURI()`: it is the only emitter of
+`EVENT_REQUEST_OPEN_SETTING_WIZARD`, and that event's only handler calls
+`enableMinimalSetup()`. The old route is therefore obsolete rather than a
+second onboarding interface which the declarative renderer must preserve.
+Historically, it was the second prompt after a user reported having no Setup
+URI. It offered the in-settings wizard, P2P setup, manual settings, or a reminder
+at the next launch, then stopped initialisation while the selected interface
+took over. `SetupManager` now owns that decision and continuation.
+
+## Decision
+
+### Retire the obsolete in-settings wizard first
+
+The old in-settings wizard will be removed as a focused prerequisite. This is
+cleanup of an unreachable interface, not part of the declarative settings
+model. The cleanup will remove:
+
+- `askAgainForSetupURI()`, `EVENT_REQUEST_OPEN_SETTING_WIZARD`, its handler, and
+  `enableMinimalSetup()`;
+- the `inWizard` completion branch in Sync Settings;
+- the `isWizard`, `wizardHidden`, and `wizardOnly` styling contract;
+- the General-page `Next` control and the already commented Remote
+  Configuration `Next` control;
+- the now-unnecessary `wizardHidden` argument on the old pane builder; and
+- message keys whose final production consumer is the removed route, followed
+  by the normal catalogue regeneration.
+
+This cleanup does not affect `SetupManager`, Setup URI onboarding, QR-code
+navigation, document-history navigation, or any other control which happens to
+use the word 'Next'. The existing onboarding and ordinary settings E2E paths
+must pass before the declarative work begins.
+
+The English quick-setup documentation already describes the maintained
+onboarding. Older localised quick-setup pages which still describe the removed
+interface are documentation maintenance rather than a prerequisite for this
+runtime cleanup.
+
+### Use one explicit page catalogue
+
+LiveSync will define one ordered page catalogue. It will be the sole source for
+page identity, name, configuration level, visibility, and content ownership.
+Each entry keeps the existing pane renderer for the legacy path and selects one
+of two native content forms:
+
+```typescript
+type SettingsPageEntry = {
+    id: string;
+    name: () => string;
+    icon: string;
+    order: number;
+    level?: ConfigLevel;
+    content: "native" | "custom";
+    legacy: PaneRenderer;
+};
+```
+
+In Stage C1, `native` identifies the Advanced proof page, whose definitions are
+supplied by the adapter, and `custom` selects the shared lazy custom-page
+factory. The catalogue will gain a per-page native factory only when a second
+native page requires one; Stage C1 does not introduce that abstraction in
+advance.
+
+A native `items` page may mix groups of `SettingSpec` controls with Obsidian's
+direct action, render, list, and nested-page definitions. A native custom
+`SettingPage` is the final escape hatch when the page cannot yet be divided
+safely. The imperative and declarative interfaces consume the same catalogue:
+
+| Catalogue content                     | Obsidian before 1.13             | Obsidian 1.13 and later                    |
+| ------------------------------------- | -------------------------------- | ------------------------------------------ |
+| Standard `SettingSpec`                | Render through `LiveSyncSetting` | Convert to a control definition            |
+| Native group, action, or rendered row | Use the existing pane renderer   | Use `SettingDefinitionPage.items`          |
+| Full custom page                      | Use the existing pane renderer   | Open a lazily created custom `SettingPage` |
+
+This makes page names and visibility consistent without requiring every page
+to migrate at once. Page names must be unique because Obsidian uses them for
+nested navigation.
+
+`SettingDefinitionPage` does not expose a separate icon field. The declarative
+renderer therefore prefixes each native page name with the emoji already held
+by the catalogue, while the imperative renderer continues to pass the same
+emoji to its existing menu button. This preserves the established visual
+identity without adding host-DOM manipulation.
+
+`SettingDefinitionGroup` likewise exposes only a string heading. Root groups
+therefore have semantic identifiers whose catalogue entries keep their emoji
+and late-translated names separate. The adapter combines those fields only
+when constructing the Obsidian definition, so callers select a group by its
+identifier instead of repeating presentation strings.
+
+### Compose the native landing page around common tasks
+
+The declarative root is a composition of native groups and catalogue pages,
+not a second flat copy of the legacy tab menu. General Settings contains the
+native Appearance, Logging, and Extra menus child pages. Their standard
+`SettingSpec` controls remain searchable without crowding the root. The small
+Quick Setup actions are native action rows on the root. The old Setup child
+page is not retained: its feature-level controls move to Extra menus, its full
+reset moves to Maintenance, and its online guidance becomes Help and
+troubleshooting. The pane-based interface exposes Quick Setup as a pane and
+renders the same controls within General Settings.
+
+Remote Configuration and Sync Settings remain catalogue pages. Obsidian's
+native group contract permits navigable pages as group items, so both pages are
+placed inside an explicit Synchronisation group. This keeps them near the top
+for narrow mobile displays while preventing the unheaded page entries from
+appearing to continue the preceding Quick Setup group. The root order reflects
+the current task:
+
+| Configuration state | First root sections                                                                                       |
+| ------------------- | --------------------------------------------------------------------------------------------------------- |
+| Unconfigured        | Quick Setup, Synchronisation (Remote Configuration and Sync Settings), then General                       |
+| Configured          | Synchronisation (Remote Configuration and Sync Settings), General, Set up other devices, then Quick Setup |
+
+Set up other devices is hidden until the plug-in is configured. The remaining
+destinations are grouped explicitly:
+
+| Group                    | Pages                                    |
+| ------------------------ | ---------------------------------------- |
+| Maintenance and recovery | Maintenance and Hatch                    |
+| Extra features           | Selector and Customisation sync          |
+| Advanced settings        | Advanced, Power users, and Patches       |
+| Help and information     | Help and troubleshooting, and Change Log |
+
+This prevents Obsidian from presenting them as one undifferentiated 'Detailed
+settings' continuation. Changing a setting which can move or reveal a page
+requests a catalogue refresh after persistence. External setting reloads use
+the same boundary. Constructing the definitions still performs no persistence,
+service, file, database, or network operation.
+
+The imperative renderer uses the same stable distinction for its default-page
+selection: Quick Setup for an unconfigured installation and General for a
+configured installation. The landing composition is therefore a native 1.13
+improvement rather than a separate interpretation of synchronisation state on
+earlier supported Obsidian versions.
+
+The custom `SettingPage` adapter class will be constructed lazily from the
+1.13-or-later path. `SettingPage` may remain a normal runtime import because the
+bundle reads Obsidian exports through its namespace object, but the import must
+not be subclassed or instantiated while the module is loading. The factory
+will first use `requireApiVersion("1.13.0")`, then verify that `SettingPage` is
+available. Older supported Obsidian versions therefore continue to call the
+imperative `display()` fallback without requiring a dynamic import or a
+polyfill for host behaviour which does not exist in those versions.
+
+The adapter sets `title` from the catalogue and renders pane content into the
+host-provided `containerEl`. Its `hide()` boundary will unload the page-owned
+`Component`, unmount Svelte and markdown content, and remove page-owned update
+handlers. The parent tab's `hide()` remains a final cleanup boundary because
+Obsidian does not guarantee a page-level `hide()` call when the host window is
+destroyed.
+
+Custom pages receive only the current page's `containerEl` and the existing
+`addPanel` helper. They do not recreate the old top-level tab menu inside each
+native page.
+
+### Prefer native groups and searchable rows to full custom pages
+
+An existing `addPanel` section maps naturally to a
+`SettingDefinitionGroup`. Within that group:
+
+- ordinary value controls use `SettingSpec`;
+- a simple button operation may use `SettingDefinitionAction` directly;
+- a Svelte control or a specialised Obsidian row uses
+  `SettingDefinitionRender` and returns its cleanup callback; and
+- a truly dynamic collection may use `SettingDefinitionList` when its existing
+  behaviour already matches the list contract.
+
+These Obsidian-specific definitions are written directly in the page adapter.
+They are not added to the shared `SettingSpec` vocabulary. This keeps the shared
+model small while allowing page, panel, and row names, descriptions, and aliases
+to participate in settings search.
+
+Search indexes the metadata on a definition; it does not infer searchable
+entries from arbitrary DOM created inside a `render` callback. A whole panel
+wrapped in one rendered row therefore provides panel-level search only.
+Individual controls or actions require individual standard, action, or render
+definitions when control-level search is worthwhile.
+
+A full custom `SettingPage` remains acceptable for a workflow which cannot yet
+be split without nesting several existing setting rows inside one synthetic
+row. It is a compatibility escape hatch, not the default representation for
+every complex pane.
+
+### Keep `SettingSpec` intentionally small
+
+`SettingSpec` describes only controls which have all of the following
+properties:
+
+- one explicit persisted setting key, excluding keys from `OnDialogSettings`;
+- one standard toggle, number, or dropdown control in the first proof page;
+- a value which is read from the current editing buffer;
+- a change which can be persisted immediately through the existing
+  `saveSettings([key])` path; and
+- no additional operation which must run after saving.
+
+A representative, key-safe shape is:
+
+```typescript
+type PersistedBooleanSettingKey = Exclude<AllBooleanItemKey, keyof OnDialogSettings>;
+type PersistedStringSettingKey = Exclude<AllStringItemKey, keyof OnDialogSettings>;
+type PersistedNumericSettingKey = Exclude<AllNumericItemKey, keyof OnDialogSettings>;
+type PersistedSettingKey = PersistedBooleanSettingKey | PersistedStringSettingKey | PersistedNumericSettingKey;
+
+type SettingSpecBase<K extends PersistedSettingKey, C> = {
+    key: K;
+    control: C;
+    visible?: () => boolean;
+    disabled?: () => boolean;
+    aliases?: string[];
+};
+
+type SettingSpec =
+    | SettingSpecBase<PersistedBooleanSettingKey, { type: "toggle"; defaultValue?: boolean }>
+    | SettingSpecBase<
+          PersistedNumericSettingKey,
+          {
+              type: "number";
+              min?: number;
+              max?: number;
+              allowZero?: boolean;
+          }
+      >
+    | SettingSpecBase<
+          PersistedStringSettingKey,
+          {
+              type: "dropdown";
+              options: () => Record<string, string>;
+          }
+      >;
+```
+
+The initial union contains only the three control types used by the Advanced
+proof page. Text and textarea controls will be added when a migrated page
+provides a concrete use for them. Number validation is derived from `min`,
+`max`, and `allowZero`, so the native and imperative renderers enforce the same
+constraints without introducing an arbitrary validation language.
+
+Names, descriptions, maturity labels, and placeholders come from the translated
+Commonlib setting metadata by default. The native renderer appends the existing
+maturity marker to `name`, and maps the description and supported placeholder
+directly. Configuration level remains a page and renderer concern: the legacy
+renderer retains its existing DOM classes, while the native page catalogue owns
+page-level visibility. A mixed-level native group must provide an explicit
+visibility predicate at that boundary rather than inferring one in the pure
+control converter. The specification may override a label only where the
+current interface already uses a deliberate product-specific label. Options
+remain LiveSync owned because they can depend on the active remote, platform,
+or language. A control which needs the current obsolete-row styling remains
+custom because the native definition does not provide an equivalent per-row
+class contract.
+
+The catalogue explicitly lists each exposed key. It does not enumerate
+`SettingInformation` automatically.
+
+The following behaviours are outside the standard specification and remain a
+custom row or custom page:
+
+- `holdValue` and Apply buttons;
+- `invert` bindings;
+- password inputs;
+- a control which maps one displayed value to several stored keys, such as
+  `syncMode`;
+- a control whose save effect cannot remain an explicit tab-owned handler;
+- button clusters, dynamic lists, Svelte components, rich diagnostic output,
+  or destructive actions; and
+- styling which exists only to support the old wizard or tab menu.
+
+This is a migration boundary, not a permanent prohibition. A second concrete
+use may justify a focused extension, but the first implementation will not add
+a generic action language, transaction language, or lifecycle hook system.
+
+### Retain the existing editing and persistence owner
+
+`ObsidianLiveSyncSettingTab` remains the owner of editing values and saves. The
+first implementation will expose a small adapter over its existing methods
+rather than move settings persistence into a new service.
+
+For declarative controls:
+
+- `getControlValue(key)` reads `editingSettings[key]`;
+- `setControlValue(key, value)` resolves an explicitly registered standard
+  specification, updates the editing value, and calls `saveSettings([key])`;
+- successful saves continue to pass through `saveLocalSetting()` or
+  `services.setting.saveSettingData()` as appropriate; and
+- the tab calls `refreshDomState()` after a value changes when another
+  definition's `visible` or `disabled` predicate can depend on it.
+
+An unknown key is an implementation error. The adapter must not fall through
+to `plugin.settings`, because LiveSync does not use that conventional storage
+shape.
+
+Specification construction and `getSettingDefinitions()` must remain cheap
+and side-effect free. Obsidian calls the method during search indexing and
+again on updates; it must perform no file, database, network, or settings
+write.
+
+### Register the setting tab after persisted settings load
+
+The settings module registers its `PluginSettingTab` from the sequential
+`onSettingLoaded` lifecycle, not from `onInitialise`. Immediately before
+registration, it seeds the tab's editing and initial snapshots through
+`reloadAllSettings(true)`. Skipping the update request is intentional because
+the tab is not yet owned by Obsidian; `addSettingTab()` may request definitions
+immediately after this seeding step.
+
+This lifecycle still precedes local database opening and replicator activation.
+Definition construction must therefore depend only on the seeded setting
+snapshot, static catalogue data, and translations. In particular, root-page
+ordering is based on the persisted `isConfigured` value. It must not inspect
+automatic synchronisation triggers, the active replicator, replication status,
+database readiness, files, or the network. Runtime operations remain explicit
+actions which run after the user selects them.
+
+### Give imperative pages an explicit lifetime and refresh boundary
+
+The present `display()` renders every pane together, so arrays of
+`settingComponents`, controlled DOM updates, and `onSavedHandlers` can be
+cleared and rebuilt as one unit. Native page navigation mounts one custom page
+at a time. Reusing those arrays without a page boundary would leak updates from
+a hidden page or remove effects which a staged edit still needs.
+
+Each imperative render will therefore receive a small page scope containing:
+
+- its `Component` lifetime;
+- its `LiveSyncSetting` instances;
+- its controlled DOM update functions; and
+- its explicit cleanup callbacks for Svelte, markdown, and other mounted
+  content.
+
+The legacy `display()` fallback uses one scope for the complete old tab. A
+custom declarative page creates one scope when opened and disposes it when
+hidden. This scope is renderer state and is not part of `SettingSpec`.
+Pane-construction callbacks which are queued by the existing helpers run only
+whilst the scope which requested them remains current. Closing or replacing a
+page therefore cannot attach delayed controls or cleanup callbacks to its
+successor.
+
+Saved-setting effects remain owned by the tab session, not by a DOM page. The
+existing handlers are unique by setting key, so `addOnSaved()` will replace the
+handler for that key instead of appending duplicate closures when a page is
+reopened. A later migration may declare those effects in a separate catalogue,
+but they will not be added to the standard control specification merely to
+support page navigation.
+
+Direct calls to `this.display()` from pane code and the tab's own reload path
+will be replaced by an explicit refresh request with one of two scopes:
+
+- `page` re-renders the active custom page, or the legacy tab; and
+- `catalogue` calls the declarative tab's `update()` so translated page names,
+  page visibility, and search definitions are rebuilt, or re-renders the
+  legacy tab.
+
+Changing the display language or the Advanced, Power User, or Edge Case mode
+uses a catalogue refresh. Dynamic Selector rows, Maintenance status, and
+Hidden File Sync status use a page refresh. This keeps the renderer choice out
+of pane actions and prevents a direct `display()` call from replacing native
+declarative navigation.
+
+### Preserve imperative rendering as a renderer
+
+The existing AutoWire calls are not the shared model. Instead,
+`LiveSyncSetting` becomes the legacy renderer for `SettingSpec` where a pane
+has migrated. It continues to own DOM classes, dirty-value decoration, and
+component updates for older Obsidian versions.
+
+Unmigrated pane functions continue to call `LiveSyncSetting` directly inside a
+custom page. This allows incremental migration without first rewriting their
+behaviour.
+
+The initial implementation must not modify Commonlib's setting metadata.
+Commonlib owns setting identity and shared labels; LiveSync owns page placement,
+Obsidian controls, persistence routing, and side effects.
+
+### Use Advanced as the first proof page
+
+The Advanced page is the first page whose groups contain only standard
+`SettingSpec` controls. It provides a useful proof without introducing
+unrelated workflows:
+
+- number, dropdown, and toggle controls;
+- translated Commonlib labels;
+- minimum-value validation and a default value;
+- CouchDB-dependent visibility; and
+- configuration-level page visibility.
+
+It has no current `onSaved` handler, Svelte component, staged Apply group, or
+destructive action. General was not the first proof because changing the
+display language re-renders the interface and other controls emit status events
+after saving. After the standard binding was proven, these effects remained
+explicit, tab-owned saved handlers while their one-key controls adopted
+`SettingSpec`.
+
+The first native activation does not also divide other pages into searchable
+rows. It exposes their established pane renderers as custom pages, limited to
+page-level search. A later, optional migration can replace an individual custom
+page with standard, action, or rendered rows without changing the page
+catalogue.
+
+## Implementation Stages and Checkpoint
+
+### Stage A: remove the old wizard
+
+Complete the focused prerequisite described above. This removes a DOM contract
+which would otherwise distort both renderers.
+
+### Stage B: prove the shared standard-control model
+
+The first declarative-settings change remains deliberately small. It will:
+
+1. add the minimal `SettingSpec` type and pure conversion functions;
+2. describe only the Advanced controls as specifications;
+3. render those specifications through the existing `LiveSyncSetting` path;
+4. prove conversion to Obsidian setting definitions with focused tests; and
+5. retain the current `display()` behaviour, page menu, persistence owner, and
+   `minAppVersion`, without returning non-empty setting definitions.
+
+Stage B does not enable the native declarative renderer. It proves that the
+shared model can express a real page without first taking ownership of every
+page's lifetime. Returning an empty definition array merely to silence review
+output is not an outcome of this stage.
+
+### Stage C1: activate the native catalogue
+
+Activation is a separate checkpoint because it is the first cross-cutting
+change. It will add the page catalogue, custom `SettingPage` adapter, scoped
+imperative lifetime, renderer-neutral refresh operation, declarative control
+read and write overrides, and non-empty definitions on Obsidian 1.13 or later.
+
+The non-empty definition array replaces `display()` completely. Partial
+activation is therefore not safe: all 12 existing pages must enter the native
+catalogue together. Advanced is the only page represented by native groups in
+this stage. The other 11 pages use their existing pane renderers inside lazy
+custom pages. Obsidian versions before 1.13 retain the complete imperative
+renderer and its menu.
+
+The existing rebuild-required action remains available while navigating native
+pages. Custom pages render the established action at their page boundary, and
+the Advanced definition includes an equivalent action item whose visibility is
+derived from the same dirty-state predicate. Both forms call the existing
+`confirmRebuild()` owner rather than introducing another apply workflow.
+
+This stage necessarily touches direct `display()` callers, saved-handler
+ownership, and cleanup for Svelte and markdown content. It does not expand
+`SettingSpec` to absorb those concerns merely to make activation appear
+smaller.
+
+### Stage C2: improve search coverage selectively
+
+After activation, an individual custom page may be replaced with native groups,
+actions, and rendered rows where the existing panel boundary maps cleanly to
+Obsidian's definitions. The bounded improvement converts the General and
+Logging controls and the simple Quick Setup actions, then organises Appearance,
+Logging, and Extra menus as child pages of General Settings. It also removes
+the now-misleading Setup child page and assigns its remaining responsibilities
+to their existing owners: Extra menus, Maintenance, and Help and
+troubleshooting. Further conversions remain optional follow-up work rather than
+a condition of Stage C1. Complex workflows may remain custom pages indefinitely.
+
+Stage C2 must not introduce a general action or lifecycle language. Each page
+conversion should be justified by useful settings-search coverage and retain
+the catalogue, persistence owner, and refresh boundaries established by Stage
+C1.
+
+### Centralise initialisation for settings pending application
+
+Settings which cannot take effect safely through immediate persistence remain
+in the settings tab's editing buffer. Their Apply action delegates to a focused
+`SetupManager` dialogue which asks whether the next start should use existing
+synchronisation data or the files in the current Vault. `SetupManager` reports
+user cancellation and validation or reservation failure distinctly instead of
+collapsing them into a boolean setup outcome. A settings-persistence exception
+still propagates after `Rebuilder` removes the reserved flag.
+
+`Rebuilder.scheduleFetch()` and `Rebuilder.scheduleRebuild()` are the only
+owners of the corresponding flag files. They reserve the next-start operation
+before the callback persists the edited settings, remove the flag if that
+callback fails, and request the restart only after preparation succeeds. The
+settings tab must not write those flag files or request the restart directly.
+
+A user cancellation returns to a separate confirmation which offers either to
+keep editing or to apply the settings without initialisation. This preserves
+the former advanced fallback without presenting it as an equal data-source
+choice. A validation or flag-reservation failure is not a cancellation and
+must not offer that bypass. The pending action is present on the native root
+settings page as well as within custom and native child pages.
+
+## Verification
+
+Stage A runs the maintained onboarding E2E scenario and an ordinary settings
+navigation scenario. A source check confirms that no old wizard event, state,
+class, or message consumer remains.
+
+Stage B focused unit tests verify:
+
+- only explicitly listed Advanced controls become specifications;
+- synthetic `OnDialogSettings` keys cannot be standard specifications;
+- control type, options, defaults, validation, metadata, and visibility map
+  consistently to the legacy and native representations; and
+- rendering the Advanced specifications through `LiveSyncSetting` preserves
+  the current save behaviour.
+
+Stage C1 and the landing-page focused unit tests verify:
+
+- the page catalogue contains all 13 pane-based destinations with stable, unique
+  identifiers and names;
+- Appearance, Logging, Extra menus, and Advanced are native-items child pages,
+  and ten child pages retain custom factories;
+- configured and unconfigured installations use their specified landing-page
+  order regardless of transient replication status;
+- definition construction does not request the active replicator before the
+  database is ready;
+- the settings tab is registered only after persisted settings load, and its
+  editing snapshot is seeded before registration without requesting a render;
+- Remote Configuration and Sync Settings remain native navigable pages inside
+  the separate Synchronisation group;
+- maintenance, extra features, advanced settings, and help have explicit page
+  groups, and the old Setup child page is absent;
+- all eight General and Logging controls are registered once, with their
+  existing conditional visibility;
+- the three Extra menus controls are registered once and refresh page
+  visibility after persistence;
+- every standard setting key is registered once;
+- a setting pending application exposes its Apply action on the native root
+  page;
+- cancelling the initialisation choice preserves the editing buffer, while the
+  separately confirmed settings-only path persists it;
+- Fetch and Rebuild reserve their flag through `Rebuilder` before pending
+  settings are persisted, and a reservation failure leaves them unapplied;
+- reads use the editing buffer;
+- writes use `saveSettings([key])` and never `plugin.settings`;
+- custom pages dispose their page-owned resources and do not duplicate saved
+  handlers when reopened; and
+- importing and opening the imperative fallback does not evaluate or require
+  `SettingPage` on Obsidian before 1.13.
+
+Real-Obsidian verification on 1.13 or later confirms:
+
+- the common landing controls and actions render before native page navigation;
+- the Quick Setup action opens the maintained onboarding dialogue;
+- Remote Configuration remains visible without initial scrolling in mobile
+  test mode;
+- native page navigation opens every remaining child page;
+- Advanced controls appear in global settings search;
+- Advanced values persist and are restored after reopening settings;
+- CouchDB-dependent controls and Advanced-mode visibility update correctly;
+- a representative custom page, including its cleanup, still works;
+- page and catalogue refreshes preserve native navigation and the
+  rebuild-required action; and
+- no duplicate save, update handler, or saved-setting effect occurs after
+  leaving and reopening a page.
+
+The maintained real-Obsidian settings scenario also changes a setting which
+remains pending until initialisation, captures the source-choice and
+settings-only fallback dialogues, and confirms that keeping the setting
+pending does not persist it. It mounts the P2P variant directly to confirm that
+it offers a source device and local Vault preparation without presenting a
+central-server overwrite operation.
+
+Because the manifest continues to support earlier Obsidian versions, a
+pre-1.13 real-runtime smoke test must confirm that the imperative fallback
+still opens, navigates, saves one Advanced value, and opens one custom page. If
+the maintained E2E runner cannot install that runtime, the exact manual version
+and procedure must be recorded before the implementation is merged.
+
+The current real-Obsidian runner defaults to Obsidian 1.12.7, so it owns the
+fallback smoke path. The declarative path uses a separately installed
+1.13-or-later AppImage selected through `OBSIDIAN_BINARY` and `OBSIDIAN_CLI`.
+`E2E_OBSIDIAN_SETTINGS_ONLY=true` limits that run to the settings contract so
+the same scenario can validate a second Obsidian runtime without repeating its
+unrelated compatibility-review and mobile-layout coverage.
+
+Existing E2E scenarios must use one shared settings-page navigation helper.
+That helper uses the current `.sls-setting-menu-btn` contract on the legacy
+runtime and accessible native page names on 1.13 or later. Individual scenarios
+must not duplicate version checks or retain selectors for a menu which the
+declarative renderer does not create.
+
+The initial Stage C1 implementation was exercised against the official Obsidian
+1.13.4 arm64 AppImage with SHA-256
+`20d0b13c6d40bb3d7e73d9b4be6d2e21dfcc145b2106a747d0c1b81e651dabfe`.
+That run opened all 12 pages from the native page catalogue, found the Advanced
+control through global settings search, persisted a numeric value on Enter,
+and restored it after the settings dialogue was closed and reopened. The
+complete default scenario also passed on Obsidian 1.12.7, including
+compatibility review, mobile layout, imperative page navigation, and immediate
+persistence of the same Advanced value. The shared E2E navigator owns both the
+separate settings renderer used by Obsidian 1.13 and the legacy
+`.sls-setting-menu-btn` interface.
+
+Before the start-up lifecycle correction, the Stage C2 landing composition was
+exercised on Obsidian 1.13.4 with a configured installation whose automatic
+synchronisation triggers were disabled. Under the former predicate, the real
+interface rendered Quick Setup, a separate Synchronisation group containing
+Remote Configuration and Sync Settings, and a General Settings group containing
+Appearance, Logging, and Extra menus in that order. It opened all 14 nested
+settings pages, found the Advanced control through global settings search, and
+restored its saved value after reopening settings. In mobile test mode, Remote
+Configuration remained inside the initial viewport below the two Quick Setup
+actions and the Synchronisation heading. The complete scenario also passed with
+the same bundle on Obsidian 1.12.7, confirming that the imperative fallback
+retained its navigation and save behaviour.
+
+The start-up lifecycle correction was subsequently exercised with the same
+official Obsidian 1.13.4 build. The settings scenario captured and verified the
+exact configured and unconfigured root-group orders, including Set up other
+devices before Quick Setup for a configured installation. The same bundle
+opened General Settings by default through the imperative fallback on Obsidian
+1.12.7. Focused unit tests own the earlier lifecycle boundary: persisted
+settings are copied before registration, and definition construction does not
+request an active replicator.
+
+## Expansion Checkpoints
+
+Review the scope with the maintainer before any implementation adds one of the
+following:
+
+- a generic representation of actions, confirmations, rebuilds, or service
+  lifecycles;
+- staged multi-setting transactions in `SettingSpec`;
+- a replacement for the current onboarding workflow;
+- a Commonlib setting metadata contract change;
+- a minimum Obsidian version increase; or
+- further conversion of Remote Configuration, Hatch, Maintenance, Help, or the
+  Svelte-based Selector controls.
+
+These may become worthwhile after the first proof, but none is required to
+establish a shared standard-control model and native settings search.
+
+## Alternatives Rejected
+
+### Return an empty definition array
+
+This can satisfy a syntactic lint check while retaining `display()`, but it
+does not add native settings search or prove a migration path.
+
+### Generate every setting from Commonlib setting metadata
+
+Metadata does not define current page membership, control type, options,
+visibility, save policy, or whether a compatibility key should be exposed.
+Automatic generation would expose settings which the current interface omits.
+
+### Teach `LiveSyncSetting` to run against a simulated DOM
+
+The existing class is a renderer with direct component and element access.
+Making it emulate declarative output would preserve its mixed responsibilities
+and make the new API depend on implementation details of the old one.
+
+### Model every pane before adopting the API
+
+This would require a general action and lifecycle language for approximately
+50 buttons, several dynamic lists, five Svelte-based regular-expression
+controls, and multiple recovery workflows. The resulting framework would be
+larger than the standard-control problem it is intended to solve.
+
+## References
+
+- [Migrate to declarative settings](https://docs.obsidian.md/plugins/guides/migrate-declarative-settings)
+- Obsidian `PluginSettingTab`, `SettingDefinitionItem`, and `SettingPage` type
+  declarations from the dependency version locked by this repository

docs/adr/2026_08_p2p_transport_compatibility.md

@@ -0,0 +1,179 @@
+# Architectural Decision Record: P2P Transport Compatibility Controls
+
+## Status
+
+Accepted — the user-facing controls will be introduced in stages. This record defines their boundaries before Commonlib settings and LiveSync interfaces are changed.
+
+## Context
+
+WebRTC connectivity depends on both devices, their browsers or embedded WebViews, NAT behaviour, carrier networks, VPNs, firewalls, and the path between them. A configuration which works on desktop Wi-Fi may fail on a mobile carrier, and moving the same devices through a mesh VPN may change the result without changing LiveSync.
+
+The current P2P transport has several relevant properties:
+
+- Trystero supplies the Nostr signalling strategy and the browser-owned WebRTC connection.
+- Commonlib limits one RPC wire payload to 15,360 bytes so it remains below Trystero's own action-chunk boundary.
+- Trystero supplies ordinary STUN servers and accepts an optional TURN server list with one username and credential.
+- ICE chooses a direct, server-reflexive, or TURN-relayed path automatically.
+- Commonlib can collect raw WebRTC statistics, but LiveSync does not yet present the selected candidate route in a concise diagnostic result.
+
+Issue reports suggest that reducing the application payload may improve some mobile and constrained-network paths. A VPN such as Tailscale may also turn an unreliable route into a reliable one. These observations are consistent with NAT, path-MTU, fragmentation, or intermediary behaviour, but they do not prove one universal cause. Browser WebRTC implementations retain responsibility for SCTP, DTLS, ICE, packetisation, congestion control, and retransmission.
+
+One low-level number cannot represent all of these concerns. Users need a small set of meaningful compatibility choices, while transport-internal controls which cannot be selected safely should remain implementation details.
+
+## Decision
+
+### Message-size presets
+
+LiveSync will expose a `P2P message size` choice with four presets:
+
+| Label                   | Maximum RPC wire payload | Intended use                                                                    |
+| ----------------------- | -----------------------: | ------------------------------------------------------------------------------- |
+| `Standard`              |             15,360 bytes | Existing default and best throughput.                                           |
+| `Reduced`               |              2,048 bytes | First compatibility step for an unreliable path.                                |
+| `Conservative`          |              1,024 bytes | Stronger compatibility at greater framing and processing cost.                  |
+| `Maximum compatibility` |                800 bytes | Most conservative offered value for paths suspected of dropping larger packets. |
+
+This value limits Commonlib RPC wire payloads before Trystero applies its own framing. It is not a LiveSync file Chunk size, an IP MTU, an SCTP fragment size, or a guarantee that lower layers will avoid fragmentation. The smaller presets reduce the amount presented to the transport at once and trade throughput for compatibility.
+
+The bound applies to outgoing messages. A device which only lowers its own value still receives messages produced under the sender's value. The selected preset therefore belongs to the P2P profile and is included in an encrypted Setup URI for additional devices. A device which was configured earlier must be changed separately; the interface and troubleshooting guidance must state that the same conservative preset should be selected on every participating device. An absent key preserves the current 15,360-byte default.
+
+Automatic negotiation or fallback between presets is deferred. A failed ordered data channel may require connection replacement before a smaller retry can prove anything, and changing transport parameters during a replication session would broaden the lifecycle contract considerably. The first implementation remains explicit, stable for one room lifetime, and inspectable.
+
+### Connection path
+
+LiveSync will expose a separate `Connection path` choice:
+
+- `Automatic` retains normal ICE selection and is the default.
+- `TURN relay only` supplies `iceTransportPolicy: 'relay'` and prevents direct or server-reflexive candidates from being selected.
+
+`TURN relay only` is enabled only when at least one syntactically valid `turn:` or `turns:` URL is configured. If the last valid TURN URL is removed while relay-only mode is selected, the dialogue restores `Automatic` and displays a concise explanation.
+
+The route policy is an ordinary P2P profile property. It is retained in P2P connection strings and encrypted Setup URIs so that an imported compatibility profile has reproducible transport behaviour.
+
+Multiple P2P profiles may intentionally use the same Group ID, passphrase, and relay list while selecting different compatibility settings. For example, one profile may use `Standard` and `Automatic`, while another uses `Maximum compatibility` and `TURN relay only`. Only the selected P2P profile joins the group, so each device can select the profile appropriate to its current network without a separate device-local override system.
+
+No `Direct only` choice will be added. `Automatic` already prefers viable non-relayed candidates, and preventing TURN fallback would mainly create another failure mode.
+
+### TURN server presentation
+
+The first settings revision retains the existing storage and dialogue contract of one comma-separated TURN URL list, one username, and one credential. The connection-path choice is presented separately under `Connection compatibility`, while the TURN values remain under `Advanced Settings`.
+
+A future interface may present the existing comma-separated value as ordered `turn:` and `turns:` URL rows without changing its serialised representation. A structured list of multiple credential profiles is deferred until a provider or self-hosted use case requires different credentials in the same P2P profile.
+
+Static long-term credentials are the supported first stage. Managed providers may return short-lived credentials, but LiveSync must not store a provider API token or a Coturn shared authentication secret. A future managed-credential design needs a separately trusted HTTPS endpoint, expiry handling, refresh behaviour, failure reporting, and a clear Setup URI policy. It is not represented as another static password field.
+
+### TURN allocation check and route diagnostics
+
+A future `Test TURN server` action should create a disposable WebRTC check with `iceTransportPolicy: 'relay'`, request candidate gathering, and require at least one relay candidate. It must not read a Vault, join a LiveSync P2P room, or claim that document synchronisation has succeeded.
+
+Where the browser exposes the evidence, the result should report:
+
+- whether a relay candidate was gathered;
+- the TURN URL used for that candidate;
+- UDP, TCP, or TLS transport; and
+- a bounded failure or inconclusive result.
+
+Ordinary P2P diagnostics should later summarise the selected candidate pair as direct, server-reflexive, or relayed, with its transport. Raw `getStats()` output remains supporting evidence rather than the primary interface.
+
+### Placement and defaults
+
+These controls belong inside `P2P Configuration` under a `Connection compatibility` section. They do not require the repository-wide Advanced, Power User, or Edge Case modes. P2P itself remains a supported opt-in feature.
+
+Existing profiles retain the following defaults:
+
+- `P2P message size`: `Standard`;
+- `Connection path`: `Automatic`; and
+- TURN credentials and URLs: unchanged.
+
+Settings which replace a room continue to use the established P2P room and transport lifecycle. No new reconnect interval, handshake timeout, keepalive interval, trickle-ICE, candidate-pool, data-channel reliability, or backpressure setting is exposed.
+
+## Self-hosted TURN example
+
+The repository supplies an optional Coturn Compose example under `docker/coturn/`. It uses a versioned upstream `coturn/coturn` image rather than maintaining another LiveSync Dockerfile.
+
+The example deliberately covers one small static-credential deployment:
+
+- Linux host networking, which avoids Docker's large port-range forwarding cost;
+- TURN over UDP and TCP on port 3478;
+- a bounded UDP relay port range;
+- explicit long-term credentials;
+- an explicit public IPv4 address;
+- no TLS or DTLS in the starter configuration; and
+- restrictions which prevent relaying to common private IPv4 ranges.
+
+The starter does not recommend `turns:` on port 443. It conflicts with an HTTPS entry point which already owns the same IP address and TCP port, including the bundled CouchDB Caddy profile. When a restrictive network requires this path, the preferred deployment uses a separate TURN host or public IP address.
+
+An outbound tunnel used for CouchDB may leave the host's public port 443 available when TURN uses a separate DNS record which resolves directly to that host, but the tunnel itself cannot carry TURN traffic. A layer-4 TLS router can also own the shared port and select separate CouchDB and TURN backends by SNI. That alternative adds certificate and routing responsibilities, depends on the intended TURN clients supplying usable SNI, and is outside the supplied Compose example. The standard Caddy image used by the CouchDB profile does not provide that layer-4 routing.
+
+TURN over TLS is not HTTP and must reach Coturn directly or through a compatible layer-4 proxy. Supporting it also adds private-key, renewal, privileged-port, and real-network verification responsibilities.
+
+The Compose example is not a hosted service supplied by the project, an availability guarantee, or a substitute for firewall and abuse controls. Operators remain responsible for DNS, certificates when enabled, port forwarding, bandwidth, quotas, monitoring, software updates, credential rotation, and legal or provider constraints.
+
+## Security and privacy
+
+TURN relays the already encrypted WebRTC connection. A TURN operator cannot read LiveSync's end-to-end encrypted Vault contents, but can observe endpoint addresses, timing, traffic volume, and service credentials.
+
+Static credentials allow use of the operator's bandwidth until they are changed. They should be unique, high entropy, and limited to the intended deployment. Setup URIs are encrypted but still contain the P2P connection profile; they and their separate passphrases must be protected.
+
+The Coturn Docker example uses environment interpolation for its static credential. A local Docker administrator can inspect the resulting container arguments and already has equivalent control of that host. The `.env` file remains untracked and should be readable only by the operator.
+
+## Alternatives rejected
+
+### Expose a free-form byte field
+
+Most users cannot infer a safe application payload from a network MTU, and an arbitrary value makes reports difficult to compare. Four named presets provide a bounded troubleshooting ladder.
+
+### Apply the smaller payload only on the affected mobile device
+
+The bound controls outgoing messages. This would leave larger messages from another sender unchanged and could fail during the direction which matters most for an initial fetch.
+
+### Force TURN whenever a TURN server is configured
+
+TURN is normally a fallback. Forcing it by default adds latency and bandwidth cost, and exposes more connection metadata even when a direct path works.
+
+### Store the connection path in a device-local overlay
+
+A second layer of device-specific profile overrides would make imported profile behaviour less reproducible and add another identity, mapping, and lifecycle contract. Separate named P2P profiles already let each device select an explicit transport policy, including when those profiles share the same Group ID and credentials.
+
+### Automatically decrease the payload after a transfer failure
+
+A transfer failure does not identify message size as the cause. Reusing a possibly wedged ordered channel would also make the retry inconclusive, while rebuilding the connection expands the lifecycle and user-notification design.
+
+### Add browser-specific defaults
+
+Safari, mobile Safari, Chrome, and Chrome on Android use different platform WebRTC implementations and lifecycle policies, but the failing route also depends on both networks and the remote peer. There is not enough stable evidence for a browser-name heuristic. Explicit cross-platform presets are more predictable.
+
+### Build and maintain a LiveSync Coturn image
+
+The upstream project already publishes a multi-platform image and documents its configuration contract. A local Dockerfile would duplicate security updates and release work without adding a LiveSync-specific server component.
+
+### Bundle a shared port-443 router
+
+A layer-4 TLS router could share one public address between distinct CouchDB and TURN hostnames by inspecting SNI. Bundling that topology would replace the current Caddy ownership of port 443, add another certificate and routing lifecycle, and rely on the intended TURN clients presenting usable SNI. A separate TURN host or public IP address keeps those failure and ownership boundaries explicit.
+
+## Verification
+
+The first implementation stage must add focused tests before production changes:
+
+- settings-schema defaults for absent keys;
+- P2P connection-string and Setup URI round trips which retain both transport compatibility settings;
+- compatibility parsing and serialisation of the existing TURN URL string;
+- mapping each message-size preset to the exact Commonlib wire bound;
+- mapping relay-only mode to `iceTransportPolicy: 'relay'`;
+- rejection or automatic reset of relay-only mode without a valid TURN URL;
+- room replacement after either effective transport setting changes; and
+- the real Obsidian dialogue, profile, and connection-string round trip.
+
+The future TURN allocation action requires its own focused tests using injected WebRTC boundaries, followed by a real transport test only for the device- or network-owned behaviour which deterministic injection cannot prove.
+
+The Coturn example is checked independently with `docker compose config`. Runtime verification uses a real Coturn allocation from outside the server network and confirms both UDP and TCP client paths before it is presented as a known-working deployment.
+
+## Consequences
+
+- Users gain a small compatibility ladder without learning WebRTC internals.
+- A conservative message size affects throughput wherever it is selected or imported, and must be applied to every participating device to protect all transfer directions.
+- Profiles may intentionally share the same P2P group identity while offering different transport compatibility choices; the selected profile determines the active connection behaviour.
+- TURN can be forced for diagnosis or hostile networks without making relay use the global default.
+- Static and managed TURN credentials have separate, explicit responsibility boundaries.
+- Browser-specific heuristics, automatic payload fallback, and low-level transport knobs remain out of scope.
+- A reproducible self-hosted starter is available without making LiveSync responsible for a separate TURN image.

docs/datastructure.md

@@ -141,6 +141,10 @@ This field stores an array of Chunk Document IDs.
 
 \_id is generated based on the path of the Obsidian note.
 
+The validation and explicit repair contract for normal-file Metadata whose
+actual ID does not match the ID derived from its stored path is defined in
+[Normal-file Metadata Document ID Validation and Repair](design_docs/metadata_document_id_validation_and_repair.md).
+
 - If the path starts with `_`, it is converted to `/_` for convenience.
 - If Case Sensitive is disabled, it is converted to lowercase.
 

docs/design_docs/document_history_revision_restoration.md

@@ -0,0 +1,214 @@
+# Document History Revision Restoration
+
+## Status
+
+Accepted for a limited implementation.
+
+## Problem and scope
+
+This document uses the independent revision properties defined under
+[Revision](../terms.md#revision) and the general state model in
+[Conflict resolution and revision provenance](../specs_conflict_resolution.md).
+
+Document History can reconstruct an available historical revision from its
+Chunks and write that content to the Vault through **Back to this revision**.
+The current action writes directly through the storage adapter. It does not
+create a new Metadata revision, clear a logical deletion through a successor,
+or record which database revision produced the restored Vault file.
+
+This leaves a logically deleted Metadata document at `deleted: true` after the
+file has returned to the Vault. A later ordinary Vault save may create a
+non-deleted successor, but restoration must not depend on an unrelated later
+file event.
+
+The same action does not inspect or preserve revision-tree intent explicitly
+when conflicts exist. Document History currently displays the ancestry of the
+PouchDB winner. It does not display the complete revision tree or the ancestry
+of every conflict leaf.
+
+This design covers restoration of one readable historical revision of a normal
+Vault file. It creates a new non-deleted successor revision, reflects that exact
+revision to the Vault, and leaves every other conflict branch available for the
+existing conflict workflow.
+
+## Evidence
+
+A real-Obsidian exercise created a Markdown document, removed it through the
+Vault API, and waited for LiveSync to store a logical-deletion successor. The
+Metadata retained all referenced Chunks, and Document History could reconstruct
+the deleted content.
+
+Selecting **Back to this revision** restored the file and its exact bytes to the
+Vault. The local database nevertheless retained the same deleted current
+revision after file processing had settled. An additional ordinary Vault save
+then created a new non-deleted successor. This demonstrates that content
+reconstruction works and that the missing operation is the database-aware
+restoration step.
+
+## Revision-tree decision
+
+The selected historical revision is the content source. It is not necessarily
+a current leaf and is not used as the parent of the new write.
+
+At the time of the restoration operation, LiveSync reads the current PouchDB
+winner. The new revision is written as a child of that exact winner revision
+and contains the selected historical content with no logical-deletion marker.
+
+For an unconflicted logical deletion:
+
+```text
+A -- D (logically deleted winner) -- R (non-deleted restored successor)
+```
+
+For an existing conflict:
+
+```text
+A -- W (winner) -- R (restored successor)
+ \
+  C (existing conflict remains current)
+```
+
+Advancing the winner branch is the ordinary meaning of reverting its content.
+The previous winner remains in revision history, while every other conflict
+leaf remains available for conflict resolution. Restoration does not
+manufacture an additional independent branch merely to retain the previous
+winner as another current conflict.
+
+The existing **Inspect conflicts and file/database differences** workflow owns
+subsequent comparison and resolution of the restored revision and the remaining
+conflict leaves. Document History supplies content which may no longer be a
+current leaf; the Inspector operates on the current revision tree after that
+content has been restored. Neither interface replaces the other.
+
+## Persistence and reflection order
+
+Restoration performs these steps in order:
+
+1. read and reconstruct the exact selected historical revision;
+2. read the current winner and use its exact revision as the write base;
+3. create Chunks and conditionally write a new non-deleted Metadata revision
+   containing the selected content below that exact winner;
+4. obtain the exact created revision from the database write;
+5. reflect that exact revision to the Vault; and
+6. record the reflected revision as the device-local file provenance.
+
+The database write precedes Vault reflection. If the database write fails, the
+Vault remains unchanged. If the new revision is stored but Vault reflection
+fails, the restored revision remains in database history and the operation
+reports that persistence completed without successful reflection. It does not
+remove the new revision in an attempted rollback. Concurrent database activity
+may subsequently change whether that stored revision is a current leaf or the
+winner.
+
+The new Metadata keeps the current document's creation time, records the
+restoration as a new modification, and derives its size and type from the
+reconstructed bytes. Reusing the historical modification time would make an
+explicit present-day restoration appear older than concurrent changes and
+would interact poorly with modification-time policies.
+
+### Restoration state transition
+
+The selected historical revision `H` supplies content, the winner `W` supplies
+the conditional write base, and `R` is the non-deleted restored revision. These
+are operation roles; winner, Vault-matching, and displayed remain independent
+properties.
+
+| Stage                        | Content source | Winner                                       | Vault relationship                                                   |
+| ---------------------------- | -------------- | -------------------------------------------- | -------------------------------------------------------------------- |
+| Before restoration           | `H`            | current winner `W`                           | unchanged                                                            |
+| After the conditional write  | `H`            | `R` immediately after writing                | Vault state and displayed provenance remain unchanged                |
+| After exact Vault reflection | `H`            | normally `R`; concurrent activity may differ | `R` is Vault-matching and displayed                                  |
+| After a reflection failure   | `H`            | depends on subsequent database activity      | Vault state and displayed provenance remain unchanged; `R` is stored |
+
+## Conflicts and concurrent changes
+
+Existing conflict leaves are never deleted by restoration. When conflicts
+remain after the new revision is written, LiveSync keeps the ordinary conflict
+indicator and conflict-resolution workflow available. The interface explains
+that restoration advances the currently shown branch and does not resolve the
+other versions.
+
+Document History does not perform a separate comparison with the winner which
+was current when the dialogue opened. The conditional exact-base write uses an
+ordinary PouchDB new edit. If that base is no longer a writable current leaf,
+PouchDB rejects the write and the dialogue reports that the revision tree
+changed and the operation should be retried. If the base remains current while
+another conflict leaf appears, the write may succeed and both leaves remain
+available.
+
+Commonlib's existing `storeWithBaseRevision` operation cannot provide this
+condition. Its force-write behaviour intentionally uses `new_edits: false` so
+that conflict-preservation workflows can create a branch from a supplied
+ancestor. The restoration path therefore uses a separate
+`storeWithLiveBaseRevision` operation. That operation writes below the supplied
+current leaf with ordinary PouchDB revision checking and never falls back to
+the force path.
+
+The action must not silently fall back to an unbased write after an exact-base
+failure.
+
+## History presentation boundary
+
+The current slider continues to represent the available ancestry of the
+PouchDB winner. Building a complete branch-aware history viewer would require
+loading the ancestry of every current leaf, joining shared ancestors,
+representing missing or compacted revisions, and adding an explicit
+branch-selection interface. That work is not required to restore the history
+currently shown.
+
+When the document has conflicts, the dialogue may state that restoration will
+create a new revision on the winner branch which is current when the action
+runs, and leave the other versions unresolved. Detailed branch comparison
+remains in the Inspector.
+
+## Ownership
+
+LiveSync owns:
+
+- selection and reconstruction of the historical revision;
+- the Document History user interaction and result messages;
+- orchestration of the exact-base write and exact-revision reflection; and
+- presentation of any remaining conflict state.
+
+Commonlib owns:
+
+- Chunk creation and Metadata persistence;
+- `storeWithLiveBaseRevision`, which writes content as a normal child of an
+  exact current leaf and returns the created revision;
+- rejecting an unavailable or stale base revision;
+- reflecting an exact current leaf revision to storage; and
+- recording device-local file-reflection provenance.
+
+The implementation retains `storeWithBaseRevision` for the conflict workflows
+which deliberately create branches. The new conditional operation is narrower
+and is not a replacement for that existing behaviour.
+
+## Non-goals
+
+This change does not:
+
+- identify the origin of malformed or doubled Metadata paths;
+- turn Document History into a complete revision-tree viewer;
+- select, merge, or discard existing conflict leaves;
+- restore unavailable content whose Chunks cannot be reconstructed;
+- mutate an old revision or clear its deletion marker in place;
+- rebuild a local or remote database; or
+- change automatic conflict-resolution policy.
+
+## Verification
+
+Focused tests cover:
+
+- restoring readable content as a non-deleted child of a deleted winner;
+- returning and reflecting the exact created revision;
+- retaining every existing conflict leaf while advancing the winner branch;
+- refusing an exact-base write when the base is no longer a current leaf;
+- retaining the existing force-write behaviour for callers which deliberately
+  create a conflict branch;
+- leaving the Vault unchanged when database persistence fails; and
+- retaining the stored revision when subsequent Vault reflection fails.
+
+The real-Obsidian regression exercise removes the additional normal Vault save
+from the earlier reproduction. **Back to this revision** must itself produce a
+new non-deleted successor revision, restore the exact content to the Vault, and
+reopen Document History at that successor.

docs/design_docs/metadata_document_id_validation_and_repair.md

@@ -0,0 +1,187 @@
+# Normal-file Metadata Document ID Validation and Repair
+
+## Status
+
+Accepted
+
+## Problem and scope
+
+A normal-file Metadata document is addressed by an ID derived from its recorded
+Vault-relative path. Historical data can contain a readable Metadata document
+whose actual local database ID no longer matches that derivation. An ordinary
+path-based read then looks up a different ID. It may reach a separate,
+consistently addressed Metadata document, or it may find no document at all;
+it cannot reach the mismatched document which the Offline Scanner enumerated.
+
+The mismatch can repeatedly produce failed reflection, and an offline-deletion
+decision can be made before that failure. The scanner must therefore recognise
+the mismatch before any file reflection, database deletion, expired-history
+cleanup, or last-seen update.
+
+This design covers ordinary Vault files. Hidden File Sync, Customisation Sync,
+and the obsolete plug-in storage namespace retain their feature-specific
+processing. A disagreement between the document-ID namespace and recorded-path
+namespace is reported, but is not repaired by this workflow.
+
+## Evidence and cause boundary
+
+The reported data included readable paths which could be enumerated from
+Metadata but could not be fetched again through the path-derived lookup. The
+Vault also had a history of case changes in folder names. This is consistent
+with an ID/path mismatch, but it does not prove whether a historical rename,
+interrupted migration, or earlier path-setting change created it.
+
+The repair workflow must not infer that the current path is authoritative merely
+because it is readable. It is available only when the local evidence is
+unambiguous and current.
+
+## Identity invariant
+
+For normal-file Metadata:
+
+    actualDocumentId === path2id(declaredPath)
+
+The active path service owns the derivation. In particular,
+handleFilenameCaseSensitive, usePathObfuscation, and the path-obfuscation
+passphrase can change the expected ID. The E2EE Security Seed and Chunk settings
+do not directly participate in this ID.
+
+Inspection and repair use the current local path service. They do not query the
+remote or decide whether this device's settings should become authoritative.
+Commonlib recalculates the expected ID during its pre-mutation inspection, so a
+local ID-derivation setting change makes an earlier approval stale. An
+intentional whole-database change to ID-derivation settings requires the
+established rebuild workflow, not this one-entry repair.
+
+## Offline Scanner decision
+
+The Offline Scanner validates each decoded Metadata document while its actual ID
+is still available. It does this before target-file policy and path-keyed pair
+construction.
+
+- Consistent normal-file Metadata continues through the existing scan.
+- Consistent special-namespace Metadata remains owned by its feature.
+- An ID/path or namespace mismatch is left unchanged and does not enter pair
+  processing.
+- If consistently addressed Metadata is selected for the same case-normalised
+  path, that Metadata and its storage file continue through the established
+  path-based scan. A stale enumerated document must not suppress this flow.
+- If no consistently addressed Metadata is selected for that logical path, its
+  storage entry is also withheld. No storage write, database deletion, or
+  last-seen update is performed for that withheld path.
+- Expired logical deletion history with an inconsistent identity is left
+  unchanged.
+
+The ordinary scan still returns its established Boolean execution result. A
+recognised mismatch is left unchanged and omitted before file-pair processing.
+It therefore does not add a `FilePairProcessResult`, change the ordinary Boolean
+scan contract, or change Fast Setup or CLI completion policy. Detailed
+inspection remains separate.
+
+## Inspection decision
+
+`inspectMetadataDocumentIdentities` is read-only and enumerates the local
+database by actual document ID. This is necessary because inspection through a
+path-derived lookup cannot discover the mismatched source.
+
+The existing **Inspect conflicts and file/database differences** interface shows
+one card for each mismatch. It excludes that card's path from ordinary
+path-based repair only when no consistently addressed Metadata document can be
+resolved for the same logical path. A stale entry does not hide the normal
+inspection of a resolvable entry. Multiple affected files are presented
+separately; there is no batch repair.
+
+A one-entry repair is offered only when all of these checks pass:
+
+- the mismatch is within the normal-file namespace;
+- the source is the current winner and has no conflict leaves;
+- the recorded path is valid and selected by current synchronisation policy;
+- one case-normalised path maps to one source under the active filename setting;
+- only one mismatched source expects the target ID; and
+- the target ID is absent, or contains an exact structural copy left by an
+  earlier attempt.
+
+An exact structural copy has the same path, timestamps, size, type, Chunk
+references, Eden data, and logical-deletion state. Inspection does not fetch
+Chunk content or query the remote. Missing content remains the responsibility
+of the existing file and Chunk repair tools.
+
+## Repair decision
+
+The user explicitly confirms one actual ID, expected ID, and source revision.
+Commonlib then:
+
+1. acquires the existing ordered document locks for the source and target IDs;
+2. reruns the complete inspection and rejects stale or unsafe input;
+3. reads the exact approved source revision;
+4. removes the path from the Offline Scanner's durable last-seen map;
+5. writes the expected target ID when it is absent;
+6. reads the target back and verifies the exact structural copy;
+7. writes a deletion revision for the source against the approved source
+   revision; and
+8. returns control to LiveSync, which requests an ordinary Vault scan.
+
+The repair result and the follow-up scan result remain separate. If the scan is
+suspended, returns false, or raises an error after the source has been removed,
+LiveSync reports that the identity repair completed and directs the operator to
+run the ordinary scan separately. It does not describe the completed mutation
+as a failed or rolled-back repair.
+
+The target is always verified before the source is removed. If target creation
+fails, the source remains. If source removal fails, the exact target remains and
+the same one-entry action can finish the operation after a new inspection. This
+retry property is an implementation safety guarantee, not a separate public
+repair mode.
+
+The target receives new CouchDB revision ancestry because ancestry cannot move
+between document IDs. Users are told to back up the device, pause editing and
+synchronisation on other devices, allow the change to replicate, and inspect
+again.
+
+## Case handling
+
+The active handleFilenameCaseSensitive setting defines whether path claims are
+folded before ambiguity is assessed. When case-insensitive handling is active,
+a consistently addressed entry may continue through the existing path-based
+flow even if a stale case variant is also reported. The stale entry is not
+automatically selected or removed unless the one-entry repair preconditions
+hold. When case-sensitive handling is active, intentional variants remain
+distinct.
+
+This workflow does not rename Vault files or folders, infer a preferred folder
+name from one device, or coordinate a repair across devices. The repair changes
+one local database and relies on ordinary replication afterwards. Other devices
+must remain paused until that result has replicated and a new inspection is
+clean.
+
+For widespread cross-device naming differences, the operator must choose an
+authoritative Vault, stop every participating device, correct its storage names
+outside Obsidian, rebuild the central remote from that Vault, and reset the
+other devices from the verified remote. During Fast Setup on an empty Vault,
+there are no storage names to correct: the scanner reflects every consistently
+addressable Metadata entry and reports only the references which remain
+unresolved.
+
+## Non-goals
+
+This change does not:
+
+- repair several entries automatically or in a batch;
+- choose between competing case variants;
+- rename storage files or folders;
+- coordinate a distributed repair across devices;
+- migrate an entire database after path-obfuscation or case-setting changes;
+- repair special-namespace Metadata;
+- reconstruct unavailable Chunk content;
+- query or modify the remote directly; or
+- change Fast Setup, daemon, or CLI completion policy.
+
+## Verification
+
+Focused Commonlib tests cover unresolved-identity exclusion before pair
+construction, continued processing of a resolvable same-path entry, expired
+logical-deletion retention, namespace routing, read-only actual-ID inspection,
+repair preconditions, target-first ordering, stale approval, exact-target retry,
+source preservation on failure, and last-seen clearing. LiveSync tests cover
+selective presentation-path withholding, separate confirmation, cancellation,
+and the ordinary scan request after a completed repair.

docs/p2p.md

@@ -44,6 +44,17 @@ Both settings contain server addresses, but they are not interchangeable.
 
 A TURN provider cannot read LiveSync's encrypted Vault contents, but it can observe connection metadata and traffic volume. Use a provider you trust. The project does not operate an official TURN service.
 
+## Connection compatibility profiles
+
+`P2P Configuration` includes a separate `Connection compatibility` section. Its defaults preserve the existing transport behaviour:
+
+- **P2P message size** defaults to **Standard**. **Reduced**, **Conservative**, and **Maximum compatibility** progressively limit outgoing P2P messages when a network path appears to drop larger WebRTC messages. This is not a Vault Chunk size or an IP MTU. Smaller values add framing and processing overhead.
+- **Connection path** defaults to **Automatic**, which lets WebRTC select a viable direct or TURN-relayed path. **TURN relay only** forces the encrypted connection through TURN and is available only when the profile contains at least one valid `turn:` or `turns:` URL.
+
+The sending device controls its outgoing message size. Select the same conservative preset on every device which may send across the constrained path. Existing devices do not receive the choice retrospectively merely because another device changed it.
+
+Both compatibility choices belong to the saved P2P profile and are retained in P2P connection strings and encrypted Setup URIs. Separate profiles may use the same Group ID, passphrase, and relay list while selecting different compatibility choices. Only the selected P2P profile joins the group.
+
 ## P2P Status
 
 The **P2P Status** pane is the current Obsidian interface for P2P connections.

docs/recovery.md

@@ -36,7 +36,7 @@ The flag deliberately enables file logging, which may affect performance. Remove
 
 Use this workflow when one file, or a small number of known files, has conflicts, missing chunks, or a difference between the current Vault file and the local LiveSync database. The inspection is device-local: it does not query a remote database or prove that another device has the same chunks.
 
-The `Hatch` recovery controls are ordered by escalation. Running **Recreate chunks for current Vault files** again with unchanged chunk settings and file contents produces the same chunks, and does not alter the revision tree. **Inspect conflicts and file/database differences** then provides actions for exact revisions. **Resolve All conflicted files by the newer one** is last because it applies a modification-time policy in bulk and logically deletes every other live version.
+The `Hatch` recovery controls are ordered by escalation. Running **Recreate chunks for current Vault files** again with unchanged chunk settings and file contents produces the same chunks, and does not alter the revision tree. **Inspect conflicts and file/database differences** then provides actions for exact revisions. **Resolve All conflicted files by the newer one** is last because it applies a modification-time policy in bulk and logically deletes every other current version.
 
 1. Stop editing the affected file, pause replication on the participating devices, and keep a separate copy of every readable version.
 2. If another device or backup has the intended content, preserve that copy before changing any revision.
@@ -52,7 +52,26 @@ The `Hatch` recovery controls are ordered by escalation. Running **Recreate chun
    - **Apply logical deletion to Vault**, **Discard this branch**, and **Discard unreadable revision** are destructive decisions. Use them only after preserving every version which may still be needed.
 7. Synchronise the healthy source if chunks were restored, scan again, and confirm that the expected conflict or difference has disappeared before resuming ordinary editing.
 
-An absent Vault file and a logical-deletion winner already agree and do not require a repair card unless another live branch remains. If the scan reports many unrelated files, or the local database itself is incomplete or corrupt, stop the per-file workflow and use [Reset synchronisation on this device](#reset-synchronisation-on-this-device) from a trusted remote. If the central remote must instead be reconstructed from an authoritative Vault, use [Overwrite server data with this device's files](#overwrite-server-data-with-this-devices-files).
+An absent Vault file and a logical-deletion winner already agree and do not require a repair card unless another conflict branch remains. If the scan reports many unrelated files, or the local database itself is incomplete or corrupt, stop the per-file workflow and use [Reset synchronisation on this device](#reset-synchronisation-on-this-device) from a trusted remote. If the central remote must instead be reconstructed from an authoritative Vault, use [Overwrite server data with this device's files](#overwrite-server-data-with-this-devices-files).
+
+Metadata document-ID mismatches use a separate action in the same Inspector. Follow [Repair a Metadata document ID mismatch](#repair-a-metadata-document-id-mismatch) rather than applying a file revision by path.
+
+## Repair a Metadata document ID mismatch
+
+Use this workflow when **Inspect conflicts and file/database differences** reports `Metadata entry requires review and was left unchanged`. The Inspector found local Metadata whose stored document ID no longer represents its recorded path. It leaves the entry unchanged, while any consistently addressed Metadata for the same logical path remains available to ordinary inspection and Vault reflection. This inspection does not query the remote.
+
+1. Back up this device. If other devices share the database, stop editing and pause synchronisation on them.
+2. Confirm that the current file-name case and path obfuscation settings are intended for this database. If either setting was deliberately changed for the whole database, stop this workflow and use Rebuild instead.
+3. Open **Self-hosted LiveSync settings** → **Hatch** → **Inspect conflicts and file/database differences**, then select **Begin inspection**.
+4. Find the affected Metadata card and review its recorded path, stored document ID, expected document ID, and source revision.
+5. Continue only when the card says `Repair is available for this entry.` Open its wrench menu and select **Repair this Metadata document ID**. If the action is unavailable, do not force an ID: the entry is ambiguous, conflicted, deleted, outside the normal-file namespace, or otherwise unsafe for one-entry repair.
+6. Review the warning and select **Repair Metadata ID**. LiveSync rechecks the source revision and expected ID, writes and verifies the target, then removes the obsolete ID.
+7. Wait for the ordinary Vault scan to complete. If LiveSync reports that the repair completed but the scan did not run, keep synchronisation paused, resolve the reported scan condition, then run the **Scan storage and database again** command.
+8. Allow this device to upload the repair. Resume the other devices one at a time, then run the inspection again and confirm that the Metadata card no longer appears and the Vault file has the intended content.
+
+This action changes one local database entry. It does not rename Vault files or folders, repair several entries at once, coordinate other devices, or preserve CouchDB revision ancestry across the two document IDs.
+
+If many entries reflect folder-name differences across devices, stop every device, choose the authoritative Vault, close Obsidian, correct the actual storage names with operating-system tools, then rebuild the central remote from that Vault and reset the other devices. During Fast Setup on an empty Vault, there are no storage names to correct: allow consistently addressable Metadata to be reflected, then inspect any remaining unresolved references.
 
 ## Reset synchronisation on this device
 
@@ -93,7 +112,7 @@ Garbage Collection removes unreferenced chunks while preserving the current data
 - all relevant devices have synchronised; and
 - the remaining historical and deletion state is understood.
 
-Deleted documents, tombstones, live conflicts, and retained metadata are not free. Live conflict branches keep the chunks needed for review, while an ordinary superseded linear revision does not protect its former chunks. Garbage Collection can therefore make old content unreadable and cannot promise the smallest possible remote. Review the [Garbage Collection V3 specification](specs_garbage_collection.md) before using it.
+Deleted documents, tombstones, unresolved conflicts, and retained metadata are not free. Conflict branches keep the chunks needed for review, while an ordinary superseded linear revision does not protect its former chunks. Garbage Collection can therefore make old content unreadable and cannot promise the smallest possible remote. Review the [Garbage Collection V3 specification](specs_garbage_collection.md) before using it.
 
 Rebuild is a different operation. It reconstructs the database from a chosen authoritative state and is the more certain way to remove unwanted history or repair a damaged remote, but it is also more disruptive and can discard changes which exist only elsewhere.
 

docs/releases/1.0-previews.md

@@ -1,6 +1,6 @@
 # 1.0 preview release history
 
-This document records the opt-in beta and release-candidate builds published before 1.0.0. Most users upgrading from 0.25.83 only need the consolidated [1.0.0 release notes](../../updates.md).
+This document records the opt-in beta and release-candidate builds published before 1.0.0. Most users upgrading from 0.25.83 only need the consolidated [1.0.0 release notes](1.0.md#100).
 
 The prepared `1.0.0-rc.0` tag was not published as a plug-in release and is therefore omitted.
 

docs/releases/1.0.md

@@ -0,0 +1,317 @@
+# 1.0 release history
+
+This document contains earlier published releases from the 1.0 line of the [current Self-hosted LiveSync release history](../../updates.md). Beta and release-candidate builds published before 1.0.0 are recorded in the [1.0 preview history](1.0-previews.md). Earlier release lines continue in the [0.25 history](0.25.md) and the [legacy history](legacy.md).
+
+## 1.0.14
+
+14th August, 2026
+
+Thank you for your patience. At last, it looks as though we can clear some of the Community Review warnings.
+
+### Synchronisation and storage
+
+#### Fixed
+
+- CouchDB operations which run to completion now close their temporary remote database connections after use across both Commonlib and LiveSync, including Setup Wizard and settings probes, command-line milestone verification, database maintenance, Security Seed refreshes, status queries, and retry and error paths (Commonlib PR #112).
+    - This covers every temporary connection currently identified as a possible contributor to the long-running resource growth tracked in #1034. Validation over extended sessions is continuing.
+    - Thank you to @apple-ouyang for the contribution!
+
+## 1.0.13
+
+13th August, 2026
+
+### Conflict handling and recovery
+
+#### Improved
+
+- **Inspect conflicts and file/database differences** now reports local Metadata whose stored document ID does not match the ID derived from its recorded path. Ordinary scans leave unresolved entries and their corresponding Vault paths unchanged, while allowing consistently addressed Metadata for the same logical path to proceed normally.
+    - When the current winner has no conflict leaves and has an unambiguous target, its wrench menu can repair that one local Metadata document after separate confirmation. The target is written and verified before the mismatched source ID is removed; ambiguous or otherwise unsafe entries remain read-only.
+
+#### Fixed
+
+- Fast Fetch now writes deletion tombstones to the local database without attempting to decrypt them. A tombstone has no encrypted payload, and decryption previously aborted the whole fetch at the first deleted document. New devices could not complete their initial sync on vaults that contain old deletions (Commonlib PR #108).
+    - Thank you to @KennethLloyd for the contribution!
+
+## 1.0.12
+
+11th August, 2026
+
+### Synchronisation and storage
+
+#### Fixed
+
+- One-shot CouchDB replication now closes its temporary remote database after each run and before retrying, preventing inactive PouchDB instances from accumulating during long-running periodic synchronisation (Commonlib PR #75). Thank you to @apple-ouyang for the contribution!
+- Start-up and recovery scans now keep failed database-to-Vault writes retryable instead of recording them as successful and later mistaking the still-missing file for a local deletion (Commonlib PR #106).
+    - Files over the size limit or in conflict remain deliberately skipped, while actual write failures are reported to Fast Setup, CLI mirror, and daemon callers.
+
+## 1.0.11
+
+9th August, 2026
+
+### Setup and compatibility
+
+#### Fixed
+
+- Fast Setup now uses Standard Fetch when CouchDB's 'Use Internal API' setting is enabled, avoiding a streaming request path which Obsidian's buffered API cannot support (#1020).
+    - Custom headers alone continue to use Fast Fetch when browser CORS permits them; Standard Fetch clears any obsolete Fast Fetch checkpoint after resetting the local database.
+
+### Synchronisation and storage
+
+#### Fixed
+
+- Fractional file timestamps no longer cause affected mobile clients to crash after synchronisation (#1087, PR #1039). Thank you to @andrewleech for the contribution!
+    - Timestamps are now normalised in the command-line tool and before Obsidian's native file-system writes.
+
+## 1.0.10
+
+9th August, 2026
+
+### Setup and compatibility
+
+#### Fixed
+
+- Fast Setup now sends configured CouchDB custom headers with every changes-feed request, allowing reverse proxies such as Cloudflare Access to authenticate initial setup in the same way as ordinary synchronisation ([Commonlib PR #82](https://github.com/vrtmrz/livesync-commonlib/pull/82)). Thank you to @nimula for the contribution!
+
+## 1.0.9
+
+8th August, 2026
+
+For the first time in a while, I published a release that could not be promoted to a stable release. Sorry about that! I am glad that we caught it while it was still a pre-release.
+
+### Setup and compatibility
+
+#### Fixed
+
+- Multi-part settings QR codes now preserve special characters in passwords, passphrases, and other settings (PR #1083). Thank you to @calvinbui for the improvement!
+- Fast Setup now sizes each finite CouchDB changes page from a one-row status probe, counts the returned result together with `pending`, and resumes from the page's opaque `last_seq` without comparing token representations. Each page uses a one-second idle timeout instead of a heartbeat, allowing CouchDB 3.2 to return its terminator after the currently available rows have been persisted.
+
+## 1.0.8
+
+8th August, 2026
+
+This version was published for pre-release validation only and was not promoted to a stable release.
+
+### Setup and compatibility
+
+#### Fixed
+
+- Fast Setup now sizes each finite CouchDB changes page from a one-row status probe, counts the returned result together with `pending`, and resumes from the page's opaque `last_seq` without comparing token representations. Heartbeat-enabled feeds no longer wait for future writes after the currently available rows have been persisted (#1065).
+- Cancelling remote selection during a scheduled Fetch now removes the Fetch flag before restarting with file and database reflection paused, preventing the same selection dialogue from reopening on every start-up.
+
+## 1.0.7
+
+8th August, 2026
+
+### Setup and compatibility
+
+#### Fixed
+
+- Fast Setup now completes only after the captured CouchDB changes target has been persisted. Decryption, protocol, and local write failures stop the operation without finalising an incomplete database, while transient interruptions resume from the last durable checkpoint (#1065).
+
+## 1.0.6
+
+6th August, 2026
+
+I know that onboarding, and other parts which feel unclear or confusing, still need improvement. Please do report any such cases.
+
+### Setup and compatibility
+
+#### Fixed
+
+- Initial setup now distinguishes an empty remote with no saved synchronisation settings from a failed remote read. New remotes can use this device's settings without an unnecessary retry; Fetch pauses on unreadable settings, while Rebuild can explicitly continue with this device's settings. Cancelling preserves the selected automatic synchronisation mode and restarts with Vault and database reflection paused (#1064). Thank you to @mateus2k2 for the follow-up report!
+
+## 1.0.5
+
+5th August, 2026
+
+### Synchronisation and storage
+
+#### Improved
+
+- Added settings to control whether finite synchronisation operations keep the screen awake. Desktop devices now allow automatic sleep by default, while mobile devices retain screen-awake protection unless the general option is enabled (#1073).
+
+### Interface and translation
+
+#### Improved
+
+- Korean translations now cover the complete current catalogue across Setup, P2P, remote configuration, diagnostics, and maintenance (PR #1075). Thank you to @motolies for the improvement!
+
+#### Fixed
+
+- The in-editor LiveSync status on iOS now remains below the view-header controls instead of overlapping them (PR #1067). Thank you to @Hsiii for the improvement!
+
+## 1.0.4
+
+5th August, 2026
+
+### Synchronisation and storage
+
+#### Fixed
+
+- Testing or saving a fresh remote configuration no longer tries to access the local database while constructing a replicator, avoiding 'Local database is not ready yet' failures before local database initialisation (#1064).
+
+### Command-line tool
+
+#### Fixed
+
+- Successful setup and remote-configuration commands now retain their settings changes. Other commands leave the settings file unchanged unless `--write-settings` is supplied, and temporary CLI suspension values are never written (#1070).
+
+## 1.0.3
+
+3rd August, 2026
+
+### Synchronisation and storage
+
+#### Fixed
+
+- File consistency checks no longer read older revisions after the current Vault content matches known synchronised history, avoiding unnecessary 'Missing document content' warnings from obsolete unreadable revisions.
+- Remote chunk fetching now retains chunks which were returned successfully when another chunk in the same request is unavailable, so the available content can still be processed (#771).
+
+### Interface
+
+#### Fixed
+
+- The Remediation setting now displays its configured modification-time limit without raising a `HierarchyRequestError`.
+
+## 1.0.2
+
+31st July, 2026
+
+I am aware that some of the Community Directory review checks have become a little more sensitive again. I will watch them for a little longer, then consider the most appropriate way to adapt.
+
+### Synchronisation and storage
+
+#### Improved
+
+- Downloaded document batches retain best-effort screen-awake and lifecycle protection until every queued file has been applied to local storage, without extending the remote-activity indicator (#1031, PR #1032). Thank you to @apple-ouyang for the improvement!
+
+#### Fixed
+
+- Leading UTF-8 byte order marks are preserved during Vault ingestion, keeping stored content sizes consistent with file metadata and preventing persistent three-byte integrity mismatches (#1056, PR #1058).
+
+### Interface and translation
+
+#### Improved
+
+- Document History now provides previous and next revision controls, reports the current revision position, and disables navigation at the oldest and newest boundaries without changing search-result navigation (#990, PR #1009). Thank you to @SeleiXi for the improvement!
+- Remaining user-visible text in Setup, P2P, Customisation Sync, Global History, JSON conflict handling, and remote configuration now uses the translation catalogue (PR #1015). Thank you to @zeedif for the improvement!
+- Korean translations have broader coverage and corrections for placeholders, punctuation, and established terminology (PR #1055). Thank you to @motolies for the improvement!
+- Spanish translation coverage has been expanded across settings, Setup, P2P, maintenance, and newly catalogued interface text (PR #1059). Thank you to @zeedif for the improvement!
+
+### Command-line tool
+
+#### Fixed
+
+- Large-buffer base64 encoding under Node.js now uses the published `octagonal-wheels` fallback when `FileReader` is unavailable, including correctly handling sliced binary views (#1036, PR #1060; [Fancy Kit PR #44](https://github.com/vrtmrz/fancy-kit/pull/44)).
+
+## 1.0.1
+
+29th July, 2026
+
+I am taking this opportunity to update the experimental features as well.
+
+This maintenance release mainly improves the robustness and maintainability of the experimental WebApp, WebPeer, and shared dialogue composition. Most plug-in users can skip it. I have reviewed the changes through CI and a real Obsidian instance, and I will validate the exact published build before merging the release commit.
+
+### Interface
+
+#### Improved
+
+- Removed a custom positioning workaround from the onboarding Notice so that it follows Obsidian's standard placement and dismissal behaviour.
+- WebApp now points users to **Scan local files** when automatic file observation is unavailable, instead of relying on a fixed browser-version recommendation.
+
+## 1.0.0
+
+27th July, 2026
+
+The work towards 1.0 has become so substantial that I have written [an article about it](https://fancy-syncing.vrtmrz.net/blog/0036-livesync-1_0_0-en.html) (linked again here).
+
+### Setup and compatibility
+
+#### Improved
+
+- An unconfigured Vault now waits for the user to start setup. Onboarding is offered through a persistent Notice and remains available from **Self-hosted LiveSync settings** → **Setup**.
+- Setup now creates named CouchDB, Object Storage, and P2P connections. Setup URIs preserve their connection names and selections, and reserve Fetch or Rebuild before the ordinary start-up scan begins.
+- Manual CouchDB setup distinguishes creating the first database from connecting another device. Onboarding requires a successful connection, while Settings can explicitly save an unverified connection and offers each server-setting correction separately.
+- Compatible differences limited to the chunk hash algorithm, chunk size, or splitter version are aligned automatically by default. Existing chunks remain readable, an explicit opt-out remains available, and differences involving incompatible settings still require review.
+
+#### Fixed
+
+- Existing Vaults retain their effective legacy settings, including the case-insensitive file-name fallback used when an older release had no explicit case setting.
+
+#### Security
+
+- Fly.io setup generates CouchDB and Vault encryption secrets with cryptographically secure randomness.
+- Dependency updates address excessive CPU use from crafted path patterns and `mailto:` links.
+
+### Conflict handling and recovery
+
+#### Improved
+
+- **Not now** postpones repeated automatic merge dialogues while retaining the unresolved-conflict warning. Three or more live revisions are reviewed one reproducible pair at a time, completed pairs remain resolved across restart, and explicit commands can reopen a postponed conflict.
+- **Inspect conflicts and file/database differences** compares the Vault with the database winner and every live conflict revision. Compact indicators show missing chunks, `Δsize`, `Δtime`, whether the Vault matches the winner, and whether conflicts remain.
+- Each reported file and live revision has a compact wrench menu for comparison, applying an exact readable revision, recording an exact byte match, storing the Vault content as a child of a selected branch, retrying missing chunks without changing the tree, or explicitly discarding one selected live branch.
+
+#### Fixed
+
+- Automatic text and structured-data merge now uses the nearest revision actually shared by both branches. A resolution received from another device no longer recreates the same conflict merely because the Vault still contains the exact content of the removed branch.
+- Edits, logical deletions, and renames made while a file remains conflicted extend the revision displayed on that device. When the relationship cannot be proved, LiveSync preserves the branches for review.
+- Unreadable live revisions are preserved during automatic handling. An absent Vault file and a winning logical deletion are treated as agreement unless another live branch still requires attention.
+- Garbage Collection V3 is limited to CouchDB and now protects every live conflict branch, required shared ancestry, and shared chunks. It stops when device progress cannot be verified and reports compaction failure without a contradictory success message.
+
+### P2P and optional synchronisation features
+
+#### Improved
+
+- P2P and Hidden File Sync remain supported opt-in features. Customisation Sync remains a supported Advanced workflow, while Data Compression remains available but disabled by default.
+- P2P controls remain outside the ordinary CouchDB experience until P2P is configured. The current status pane distinguishes announcing changes, following a peer, and persistent per-device actions.
+- P2P setup and guidance now distinguish the required signalling relay from optional TURN and describe the replaceable public relay's privacy and availability limits.
+- Enabling Hidden File Sync opens one progress Notice before saving the setting and reuses it until the initial scan has finished instead of stacking phase, reload, and restart messages.
+
+#### Fixed
+
+- First-device P2P setup can complete its signalling test without another peer online. Fetch on an additional device still requires an available source peer and a completed P2P Rebuild.
+- P2P relay connections now close and are recreated reliably after settings changes and database resets.
+
+### Interface, translation, and operations
+
+#### Improved
+
+- Command-palette actions now use clearer names and appear only when their feature and current context make them usable. Renamed commands retain their identifiers so that existing hotkeys continue to work.
+- Setup and review dialogue text can be selected for copying or translation.
+- Remote-size warnings use persistent clickable Notices. Initial uploads and Rebuild no longer ask to send every chunk in advance; ordinary replication completes the transfer.
+- Obsolete controls for the plug-in trash setting and fixed chunk revisions were removed. The Change Log remains available but no longer opens automatically or tracks an unread count.
+- Self-hosted LiveSync now owns its translation catalogue. Commonlib supplies canonical English to other consumers, while translation contributions can be made in the main Self-hosted LiveSync repository.
+
+#### Fixed
+
+- Applying an available interface translation no longer holds start-up behind an unsolicited dialogue; a persistent Notice opens the existing details on demand.
+- Action buttons are arranged for narrow mobile screens, long dialogues keep their controls reachable, and persistent Notices no longer cover close controls.
+
+### Storage and file selection
+
+#### Fixed
+
+- The optional Custom HTTP Handler used by Object Storage sends the correct byte range from binary request bodies and reports unsupported body types instead of silently sending an empty request.
+- Broadening selectors, ignore rules, size or modification-time limits, or file-name case handling now rechecks previously received files without requiring another remote update.
+- Start-up and full-inspection scans omit built-in legacy LiveSync log files and recovery flag files before comparing Vault and local-database state. Existing ignored database records remain untouched, and user-configured ignore behaviour is unchanged.
+
+### Command-line tool
+
+#### Fixed
+
+- CLI Setup URI validation now uses the supported Commonlib ESM package interface.
+- The non-root Docker image no longer depends on permissions inherited from the source checkout.
+
+#### Security
+
+- The CLI rejects detected path traversal and symbolic-link components before Vault operations.
+
+### Validation
+
+#### Testing
+
+- Expanded automated Real Obsidian coverage for upgrades, two-device synchronisation, CouchDB, Object Storage, P2P, Hidden File Sync, mobile dialogues, conflict and revision recovery, failure diagnostics, and strict clean-up.
+- Real CouchDB integration coverage verifies logical deletion, shared and conflict chunk retention, compaction, downstream replication, and recreation of content-addressed chunks.
+- An encrypted Real Obsidian reconnect scenario replaces the remote Security Seed while one client retains the previous value, verifies that synchronisation adopts the replacement without restoring the old value, and proves a bidirectional encrypted round-trip.
+- The plug-in code in this release was installed through BRAT and validated on macOS, iOS, and Android, including upgrade from 0.25.83, bidirectional synchronisation, P2P setup, conflict handling, recovery controls, mobile layouts, and start-up with existing configurations.
+- Native and non-root Docker CLI scenarios cover setup, write, read, list, information, deletion, conflict resolution, and revision retrieval with the packaged Commonlib dependency.

docs/releases/legacy.md

@@ -1,6 +1,6 @@
 # Legacy release history
 
-This history covers releases before 0.25. Later releases are recorded in the [0.25 history](0.25.md) and the [current release history](../../updates.md).
+This history covers releases before 0.25. Later releases are recorded in the [0.25 history](0.25.md), the [earlier 1.0 history](1.0.md), and the [current release history](../../updates.md).
 
 ## 0.24
 

docs/settings.md

@@ -4,6 +4,19 @@ NOTE: This document not completed. I'll improve this doc in a while. but your co
 
 There are many settings in Self-hosted LiveSync. This document describes each setting in detail (not how-to). Configuration and settings are divided into several categories and indicated by icons. The icon is as follows:
 
+On Obsidian 1.13 or later, the root settings page is organised by task. On an unconfigured installation, **Quick Setup** appears first, followed by **Synchronisation** and **General Settings**. Once this plug-in has been configured, **Synchronisation** and **General Settings** appear first, followed by **Set up other devices** and **Quick Setup**. Earlier supported Obsidian versions retain a pane-based interface with the same controls; they open **Quick Setup** when unconfigured and **General Settings** when configured.
+
+| Icon | Root group               | Contents or availability                                      |
+| :--: | ------------------------ | ------------------------------------------------------------- |
+|  🧙‍♂️  | Quick Setup              | Setup URI, onboarding, and enable actions                     |
+|  🔄  | Synchronisation          | Remote Configuration and Sync Settings                        |
+|  ⚙️  | General Settings         | Appearance, Logging, and Extra menus                          |
+|  📲  | Set up other devices     | Copy a Setup URI or show its QR code after configuration      |
+|  🛠️  | Maintenance and recovery | Maintenance and Hatch                                         |
+|  🧩  | Extra features           | Selector and Customisation sync when advanced features appear |
+|  🔧  | Advanced settings        | Advanced, Power users, and Patches when their modes appear    |
+|  ℹ️  | Help and information     | Help and troubleshooting, and Change Log                      |
+
 ## Feature maturity for 1.0
 
 The following status applies to optional and compatibility features in the 1.0 line:
@@ -15,10 +28,32 @@ The following status applies to optional and compatibility features in the 1.0 l
 | Beta or experimental | JWT authentication, ignore files, automatic newer-file conflict resolution, and Garbage Collection V3 for CouchDB                                     | Retained for explicit testing and specialised use. They remain disabled by default and are not part of the minimum supported setup.                                             |
 | Compatibility only   | V1 dynamic iteration counts, the old IndexedDB adapter, non-current hash algorithms, Eden chunks, and the stored `doNotUseFixedRevisionForChunks` key | Existing settings and data remain readable. New Vaults use the current defaults, and compatibility controls are shown only where a migration or recovery path still needs them. |
 
+### Apply changes which require initialisation
+
+Some compatibility settings are not saved immediately. They remain pending
+until **Apply** is selected. The Apply action remains visible on the root
+settings page and on the relevant child page. The following dialogue asks which
+existing data should be used after restarting:
+
+- **Reset Synchronisation on This Device** reconstructs this device's local
+  database from the configured remote. For P2P, an online source device is
+  selected after restart.
+- **Overwrite Server Data with This Device's Files** reconstructs the local and
+  remote databases from this Vault. The P2P equivalent prepares only this
+  device from its current Vault files.
+- **Review another way to apply these settings** returns to a separate choice
+  between keeping the changes pending and applying them without initialisation.
+  Applying them alone is an advanced compatibility fallback and can make the
+  device incompatible with its existing synchronisation data.
+
+LiveSync reserves the selected next-start operation before saving the pending
+settings. If validation or that reservation fails, the settings remain
+unapplied and the settings-only fallback is not offered.
+
 | Icon | Description                                                        |
 | :--: | ------------------------------------------------------------------ |
 |  💬  | [0. Change Log](#0-change-log)                                     |
-|  🧙‍♂️  | [1. Setup](#1-setup)                                               |
+|  🧙‍♂️  | [1. Quick Setup and Extra menus](#1-quick-setup-and-extra-menus)   |
 |  ⚙️  | [2. General Settings](#2-general-settings)                         |
 |  🛰️  | [3. Remote Configuration](#3-remote-configuration)                 |
 |  🔄  | [4. Sync Settings](#4-sync-settings)                               |
@@ -34,17 +69,19 @@ The following status applies to optional and compatibility features in the 1.0 l
 
 This pane always shows the current release history. It does not track whether a particular plug-in version has been read and does not open automatically after an ordinary update.
 
-Internal database or settings compatibility reviews use a separate safety dialogue, not this pane. The dialogue explains why remote synchronisation has been paused and preserves the automatic synchronisation choices which were configured before the update. A configured Vault which was copied, restored, or opened in a new Obsidian profile can require this review because its device-local acknowledgement is not part of the Vault data. An empty local database is not accepted as evidence that it is safe to continue. An existing unconfigured Vault remains in onboarding without this synchronisation warning; its missing acknowledgement is not filled in automatically, so it is evaluated if the Vault is configured later. Closing the dialogue keeps synchronisation paused. When the detected state can be handled by the running version, the explicit resume action records the current internal database version and restores the configured behaviour. A persistent Notice and the `Review why synchronisation is paused` command reopen the review. An older installation cannot dismiss a pause caused by a newer database or settings version.
+Internal database or settings compatibility reviews use a separate safety dialogue, not this pane. After the Obsidian layout is ready, a pending review opens as **Synchronisation paused for compatibility review**. The dialogue explains why remote synchronisation has been paused and preserves the automatic synchronisation choices which were configured before the update. Closing it or selecting **Keep synchronisation paused** leaves synchronisation paused. Use the persistent Notice's **Review why** link, or run the `Review why synchronisation is paused` command, to reopen it. Opening **Change Log** does not acknowledge the review.
 
-## 1. Setup
+A configured Vault which was copied, restored, or opened in a new Obsidian profile can require this review because its device-local acknowledgement is not part of the Vault data. An empty local database is not accepted as evidence that it is safe to continue. An existing unconfigured Vault remains in onboarding without this synchronisation warning; its missing acknowledgement is not filled in automatically, so it is evaluated if the Vault is configured later. When the detected state can be handled by the running version, **Resume synchronisation** records the current internal database version and restores the configured behaviour. An older installation cannot dismiss a pause caused by a newer database or settings version.
 
-This pane is used for setting up Self-hosted LiveSync. There are several options to set up Self-hosted LiveSync.
+## 1. Quick Setup and Extra menus
 
-An unconfigured installation does not open the onboarding dialogue automatically or scan the Vault into the local database. A long-lived Notice offers the onboarding action. If the Notice is dismissed, open **Self-hosted LiveSync settings** → **Setup** → **Rerun Onboarding Wizard**.
+Quick Setup contains the actions used to configure Self-hosted LiveSync. On Obsidian 1.13 or later these actions appear on the root settings page. In the pane-based interface, they remain available together on the **Quick Setup** pane.
+
+An unconfigured installation does not open the onboarding dialogue automatically or scan the Vault into the local database. A long-lived Notice offers the onboarding action. If the Notice is dismissed, use **Rerun Onboarding Wizard** in the root **Quick Setup** group on Obsidian 1.13 or later. On earlier supported Obsidian versions, open **Self-hosted LiveSync settings** → **Quick Setup** → **Rerun Onboarding Wizard**.
 
 Choose the new-device path when this device owns the files which should initialise synchronisation. Choose the existing-device path when it should receive an established remote state. The wizard reserves Rebuild or Fetch respectively before enabling the settings and requesting a restart, so the selected initialisation runs before the ordinary start-up scan.
 
-### 1. Quick Setup
+### 1. Setup actions
 
 Most preferred method to setup Self-hosted LiveSync. You can setup Self-hosted LiveSync with a few clicks.
 
@@ -64,22 +101,15 @@ Completing manual CouchDB, Object Storage, or P2P setup creates the correspondin
 
 This button only appears when the setup was not completed. If you have completed the setup manually, you can enable LiveSync on this device by this button.
 
-### 2. To setup other devices
+### 2. Set up other devices
 
 #### Copy the current settings to a Setup URI
 
 You can copy the current settings as a new setup URI. And this URI can be used to setup the other devices as [Use the copied setup URI](#use-the-copied-setup-uri).
 
-### 3. Reset
+### 3. Extra menus
 
-#### Discard existing settings and databases
-
-Reset the Self-hosted LiveSync settings and databases.
-**Hazardous operation. Please be careful when using this.**
-
-### 4. Enable extra and advanced features
-
-To keep the set-up dialogue simple, some panes are hidden in default. You can enable them here.
+To keep the settings dialogue concise, some menus and features are hidden by default. On Obsidian 1.13 or later, enable them through **General Settings** → **Extra menus**. In the pane-based interface, the same controls appear in General Settings.
 
 #### Enable advanced features
 
@@ -465,6 +495,22 @@ Setting key: P2P_turnCredential
 
 The password or credential for authentication with the TURN server.
 
+#### P2P message size
+
+Setting key: P2P_maxWirePayloadBytes
+
+This profile setting limits each outgoing Commonlib RPC message before Trystero applies its own framing. It is not a Vault Chunk size, an IP MTU, or an SCTP fragment size. The available presets are **Standard** (15,360 bytes), **Reduced** (2,048 bytes), **Conservative** (1,024 bytes), and **Maximum compatibility** (800 bytes). Smaller values trade throughput for compatibility on paths which appear to drop larger WebRTC messages.
+
+The sender controls the size of its outgoing messages. Select the same conservative preset on every device which may send across the constrained path. Existing profiles without this key use **Standard**. P2P connection strings and encrypted Setup URIs retain the selected preset.
+
+#### Connection path
+
+Setting key: P2P_connectionPath
+
+**Automatic** lets WebRTC select a viable direct or TURN-relayed path and is the default. **TURN relay only** forces `iceTransportPolicy: 'relay'` and is available only when the profile contains at least one valid `turn:` or `turns:` URL. Removing the last valid TURN URL while relay-only mode is selected restores **Automatic** and displays a Notice.
+
+This choice belongs to the P2P profile and is retained in P2P connection strings and encrypted Setup URIs. Separate profiles may use the same Group ID and credentials with different compatibility choices; only the selected P2P profile is active.
+
 ## 4. Sync Settings
 
 ### 1. Synchronisation Preset
@@ -573,7 +619,7 @@ Should we keep folders that do not have any files inside?
 
 ### 5. Conflict resolution (Advanced)
 
-Conflict resolution preserves unknown local content and automatically merges only when the available revision history supplies a safe shared base. See [Conflict resolution and revision provenance](specs_conflict_resolution.md) for the revision-tree rules, stale and concurrent resolutions, binary-file limitation, and the device-local provenance used for operations while a conflict is live.
+Conflict resolution preserves unknown local content and automatically merges only when the available revision history supplies a safe shared base. See [Conflict resolution and revision provenance](specs_conflict_resolution.md) for the revision-tree rules, stale and concurrent resolutions, binary-file limitation, and the device-local provenance used while a conflict remains unresolved.
 
 #### (BETA) Always overwrite with a newer file
 
@@ -745,9 +791,11 @@ Recreate chunks from files currently present in the Vault. This can repair missi
 
 #### Inspect conflicts and file/database differences
 
-Compare each Vault file with every current live revision in the local database. Each winner and conflict revision is shown separately with its exact revision identifier, local chunk availability, and relationship to the current Vault file. Unavailable shared ancestors are reported separately because they prevent conservative three-way merging but are not live revisions which can be discarded.
+Compare each Vault file with every current leaf revision in the local database. Each winner and conflict revision is shown separately with its exact revision identifier, local chunk availability, and relationship to the current Vault file. Unavailable shared ancestors are reported separately because they prevent conservative three-way merging but are not current leaves which can be discarded.
 
-Select **Begin inspection** to run the inspection. Each reported file and live revision has a wrench menu for read-only comparison, applying an exact database revision to the Vault, recording an exact byte match, preserving the Vault file as a child of a selected branch, retrying chunk retrieval, or explicitly discarding a branch. Destructive actions require confirmation. Follow [Recover a conflicted or mismatched file](recovery.md#recover-a-conflicted-or-mismatched-file) before changing revision history.
+Select **Begin inspection** to run the inspection. Each reported file and current leaf revision has a wrench menu for read-only comparison, applying an exact database revision to the Vault, recording an exact byte match, preserving the Vault file as a child of a selected branch, retrying chunk retrieval, or explicitly discarding a branch. Destructive actions require confirmation. Follow [Recover a conflicted or mismatched file](recovery.md#recover-a-conflicted-or-mismatched-file) before changing revision history.
+
+The same inspection also reports local Metadata whose stored document ID does not agree with its recorded path. A stale entry does not suppress ordinary inspection when consistently addressed Metadata can still be resolved for that logical path; otherwise, the unresolved path is excluded from ordinary file-repair actions. When the current winner has no conflict leaves and has an unambiguous target, its wrench menu offers a separately confirmed, one-entry repair. The target is derived from the current local file-name case and path obfuscation settings, then written and verified before the obsolete ID is removed. Ambiguous, conflicted, deleted, excluded, or otherwise unsafe entries remain read-only. This action does not rename Vault files or folders. Follow [Repair a Metadata document ID mismatch](recovery.md#repair-a-metadata-document-id-mismatch) for the complete backup, repair, propagation, and verification procedure. For widespread naming differences across devices, use that guide to choose an authoritative Vault, correct its storage names while Obsidian is closed, rebuild the central remote, and reset the other devices.
 
 #### Resolve All conflicted files by the newer one
 
@@ -1061,10 +1109,14 @@ Delete all data on the remote server.
 
 ### 6. Garbage Collection V3 (CouchDB only)
 
-Garbage Collection V3 identifies chunk documents which are not reachable from any current file or live conflict branch, creates logical deletions for those chunks locally, propagates the deletions to CouchDB, and requests remote compaction.
+Garbage Collection V3 identifies Chunk documents which are not reachable from any current file or conflict branch, creates logical deletions for those Chunks locally, propagates the deletions to CouchDB, and requests remote compaction.
 
-Use it only when the Vault, local database, and remote are healthy, and every relevant device has synchronised. It can make an ordinary superseded file revision unreadable when no live state still needs its chunks. It does not repair corruption or replace a deliberate rebuild. See the [Garbage Collection V3 specification](specs_garbage_collection.md).
+Use it only when the Vault, local database, and remote are healthy, and every relevant device has synchronised. It can make an ordinary superseded file revision unreadable when no current state still needs its Chunks. It does not repair corruption or replace a deliberate rebuild. See the [Garbage Collection V3 specification](specs_garbage_collection.md).
 
 ### 7. Reset
 
+#### Discard existing settings and databases
+
+Reset the Self-hosted LiveSync settings and local database. This is a hazardous operation; make a backup before using it.
+
 #### Delete local database to reset or uninstall Self-hosted LiveSync

docs/setup_own_server.md

@@ -118,10 +118,12 @@ Please refer to the [official document](https://docs.couchdb.org/en/stable/insta
 
 Deno 2 is required. Export the CouchDB connection and database details, then run the provisioning wrapper:
 
+The `username` and `password` in this step are CouchDB administrator credentials. For Docker or Docker Compose, use the same values supplied as `COUCHDB_USER` and `COUCHDB_PASSWORD`. For a direct installation, use the administrator configured during CouchDB setup. The wrapper does not create a separate non-administrator synchronisation account.
+
 ```
 export hostname=http://localhost:5984
-export username=<INSERT USERNAME HERE>
-export password=<INSERT PASSWORD HERE>
+export username=<INSERT COUCHDB ADMINISTRATOR USERNAME HERE>
+export password=<INSERT COUCHDB ADMINISTRATOR PASSWORD HERE>
 export database=obsidiannotes
 curl -s https://raw.githubusercontent.com/vrtmrz/obsidian-livesync/main/utils/couchdb/couchdb-init.sh | bash
 ```
@@ -135,7 +137,7 @@ The wrapper runs the exact registry-pinned Commonlib consumer. When `database` i
 
 If you are using Docker Compose and the above command does not work or displays `ERROR: Hostname missing`, you can try running the following command, replacing the placeholders with your own values:
 ```
-curl -s https://raw.githubusercontent.com/vrtmrz/obsidian-livesync/main/utils/couchdb/couchdb-init.sh | hostname=http://<YOUR SERVER IP>:5984 username=<INSERT USERNAME HERE> password=<INSERT PASSWORD HERE> database=obsidiannotes bash
+curl -s https://raw.githubusercontent.com/vrtmrz/obsidian-livesync/main/utils/couchdb/couchdb-init.sh | hostname=http://<YOUR SERVER IP>:5984 username=<INSERT COUCHDB ADMINISTRATOR USERNAME HERE> password=<INSERT COUCHDB ADMINISTRATOR PASSWORD HERE> database=obsidiannotes bash
 ```
 
 ## 3. Expose CouchDB to the Internet
@@ -170,10 +172,13 @@ Now `https://tiles-photograph-routine-groundwater.trycloudflare.com` is our serv
 > A generated Setup URI is the recommended path because it carries the current defaults for a new Vault and the selected remote profile. If a Setup URI cannot be generated, follow [Configure CouchDB manually on the first device](./quick_setup.md#configure-couchdb-manually-on-the-first-device), then generate a new Setup URI from that working device for every additional device.
 
 ### 1. Generate the setup URI on a desktop device or server
+
+The `username` and `password` here are the credentials which Self-hosted LiveSync will store for routine access to this database. They may be the administrator credentials from step 2. If you have separately configured a CouchDB account with the required access to this database, use that account instead. Neither the provisioning wrapper nor the Setup URI generator creates that separate account.
+
 ```bash
 export hostname=https://tiles-photograph-routine-groundwater.trycloudflare.com
 export database=obsidiannotes
-export username=johndoe
+export username=<INSERT COUCHDB USERNAME FOR LIVESYNC>
 export password=<INSERT THE COUCHDB PASSWORD>
 export passphrase=<INSERT A STRONG VAULT ENCRYPTION PASSPHRASE>
 export uri_passphrase=<INSERT A SEPARATE SETUP URI PASSPHRASE> # Optional

docs/specs_conflict_resolution.md

@@ -4,7 +4,7 @@ This document describes the conflict-resolution and file-reflection guarantees u
 
 ## Revision-tree model
 
-PouchDB stores a document as a revision tree. It selects one live leaf as the deterministic winner and reports the other live leaves as conflicts. That winner is not proof that its content is newer, safer, or the version currently shown in the Vault.
+PouchDB stores a document as a revision tree. It selects one current leaf as the deterministic winner and reports the other current leaves as conflicts. That winner is not proof that its content is newer, safer, or the version currently shown in the Vault.
 
 For example:
 
@@ -14,9 +14,25 @@ A1
 └── B2 ── C2
 ```
 
-The two live leaves are `D1` and `C2`. Their nearest shared ancestor is `A1`; neither `B1` nor `B2` is shared. A conservative three-way merge therefore compares the changes from `A1` to each leaf. Matching generation numbers, or selecting the first older revision from one branch, does not prove shared ancestry.
+The two current leaves are `D1` and `C2`. Their nearest shared ancestor is `A1`; neither `B1` nor `B2` is shared. A conservative three-way merge therefore compares the changes from `A1` to each leaf. Matching generation numbers, or selecting the first older revision from one branch, does not prove shared ancestry.
 
-Resolving a conflict writes the selected or merged result on one observed branch and deletes the other observed live leaf. A stale device may still have the deleted leaf's content in its Vault when it receives the resolution.
+Resolving a conflict writes the selected or merged result on one observed branch and deletes the other observed conflict leaf. A stale device may still have the deleted leaf's content in its Vault when it receives the resolution.
+
+### Independent revision properties
+
+The modifiers defined under [Revision](terms.md#revision) describe independent properties, rather than exclusive revision types. The winner is a database-tree role, Vault-matching describes current file-state equality, and displayed identifies the device-local branch recorded for the Vault. The same revision commonly has all three properties, but synchronisation, conflicts, local edits, and missing provenance can separate them.
+
+| Situation                                            | Winner             | Vault-matching                                      | Displayed                                            |
+| ---------------------------------------------------- | ------------------ | --------------------------------------------------- | ---------------------------------------------------- |
+| A present Vault file is fully converged              | `R`                | `R`                                                 | `R`                                                  |
+| The Vault displays conflict leaf `C`                 | `W`                | `C`                                                 | `C`                                                  |
+| The database advances before Vault reflection        | new winner `W2`    | previous revision `R`, while the Vault is unchanged | `R`                                                  |
+| A local edit of displayed revision `R` is pending    | independent        | none, or a coincidental content match               | `R`, as the branch which the edit must extend        |
+| Provenance is missing and exactly one revision fits  | independent        | `M`                                                 | none, then `M` after safe reconstruction             |
+| Provenance is missing and several revisions fit      | independent        | every matching revision                             | none                                                 |
+| A logical-deletion winner agrees with an absent file | deleted winner `D` | `D`, and possibly other logical-deletion revisions  | none; an absent file retains no displayed provenance |
+
+At most one revision is the winner, more than one revision can be Vault-matching, and at most one revision can be displayed for a path on one device. A displayed revision may stop matching the Vault while a local edit is pending, but its branch identity remains authoritative until that edit is stored or the relationship is safely reconstructed.
 
 ## Implemented 1.0 guarantees
 
@@ -25,7 +41,7 @@ Resolving a conflict writes the selected or merged result on one observed branch
 - A receiving Vault file which exactly matches any available revision in the document tree is treated as previously synchronised content. This includes an ancestor below a deleted losing leaf.
 - A receiving Vault file whose bytes do not match any available revision is preserved as an unsynchronised local change.
 - File bytes, rather than path, size, modification time, or revision generation, determine whether content is known.
-- Three or more live versions are reviewed one pair at a time in a deterministic order, with each completed pair committed before the next live pair is read.
+- Three or more current versions are reviewed one pair at a time in a deterministic order, with each completed pair committed before the next pair is read.
 - Each device records the exact revision most recently reflected in each Vault file. An edit, deletion, or case-only rename made while a conflict is active extends that displayed branch rather than the deterministic database winner.
 - A cross-path rename stores the target before logically deleting only the displayed source branch.
 
@@ -50,32 +66,32 @@ The compatibility implementation currently selects the newer modification time f
 
 A document revision can remain in the PouchDB tree while one or more chunks needed to reconstruct its content are unavailable. Missing content is not evidence that the revision is obsolete. LiveSync therefore leaves an unreadable winner or conflict revision in the tree instead of deleting it during automatic conflict processing.
 
-**Hatch** → **Inspect conflicts and file/database differences** inspects the current winner, every current conflict revision, and the nearest shared ancestor for each conflict. A logical-deletion winner and an absent Vault file already agree, so that state is not reported unless another live branch still requires attention. When the Vault already matches the winner but conflict branches remain, the card shows the compact status `✅ Vault matches winner · ⚠️ Conflicts: N`; matching the winner does not mean that the conflict has been resolved.
+**Hatch** → **Inspect conflicts and file/database differences** inspects the current winner, every current conflict revision, and the nearest shared ancestor for each conflict. A logical-deletion winner and an absent Vault file already agree, so that state is not reported unless another conflict branch still requires attention. When the Vault already matches the winner but conflict branches remain, the card shows the compact status `✅ Vault matches winner · ⚠️ Conflicts: N`; matching the winner does not mean that the conflict has been resolved.
 
-Each reported live revision has a compact wrench menu. The available actions depend on the exact revision and current Vault state:
+Each reported current leaf revision has a compact wrench menu. The available actions depend on the exact revision and current Vault state:
 
 - **Compare with Vault** opens the existing difference dialogue in read-only mode for differing text files.
 - **Apply this revision to Vault** writes the selected readable revision, even when it is not the database winner. Replacing an existing file requires confirmation.
 - **Mark this revision as the Vault version** is offered when the bytes already match. It records exact device-local provenance without creating a child revision, and refuses the operation if the file changed after inspection.
-- **Store Vault file as a child of this revision** preserves the current Vault bytes on the explicitly selected live branch.
+- **Store Vault file as a child of this revision** preserves the current Vault bytes on the explicitly selected current branch.
 - **Apply logical deletion to Vault** removes an existing Vault file after confirmation. An absent file needs no retained deletion provenance.
 - **Retry reading revision** attempts the configured chunk-retrieval path again. It does not change the revision tree.
-- **Discard this branch** is available for each exact live revision while at least one other live branch remains. It requires confirmation and creates a logical deletion on only the selected branch without changing the current Vault file.
-- **Discard unreadable revision** remains available as a recovery action when an unreadable revision is the only live leaf. It requires confirmation because no other database branch remains.
+- **Discard this branch** is available for each exact current leaf while at least one other current leaf remains. It requires confirmation and creates a logical deletion on only the selected branch without changing the current Vault file.
+- **Discard unreadable revision** remains available as a recovery action when an unreadable revision is the only current leaf. It requires confirmation because no other database branch remains.
 
-Every mutating action rechecks that the selected revision is still a current live leaf. If another operation resolved or replaced it, the action fails and the card is refreshed instead of extending an obsolete branch.
+Every mutating action rechecks that the selected revision is still a current leaf. If another operation resolved or replaced it, the action fails and the card is refreshed instead of extending an obsolete branch.
 
 The card uses compact, mobile-friendly diagnostic rows with an emoji and a text label. `🧩 Missing chunks: N` identifies an unreadable revision. In the database row, `Δsize` is decoded size minus recorded size; in the Vault row, `Δsize vs DB` is Vault size minus decoded database size. `Δtime` is Vault modification time minus database modification time. The ordinary two-second comparison window still labels which side is newer. These values help diagnose a mismatch; path, size, and modification time do not prove revision identity or decide which content should win.
 
-A shared ancestor is informational. An ancestor which is no longer a live revision cannot be discarded independently through this workflow. If its body is unavailable, conservative three-way merge remains disabled, although readable live revisions can still be selected manually.
+A shared ancestor is informational. An ancestor which is no longer a current leaf cannot be discarded independently through this workflow. If its body is unavailable, conservative three-way merge remains disabled, although readable current leaf revisions can still be selected manually.
 
 Logical deletion does not recreate missing bytes, purge the document history, or prove that the deleted version was unimportant. Another replica or backup may still contain the missing chunks. Recover from that source before discarding a revision whenever possible.
 
 **Recreate chunks for current Vault files** can recreate chunks only from files which are readable in the current Vault. It cannot reconstruct unique bytes from an unavailable historical or conflict revision.
 
-Garbage Collection V3 treats every live conflict revision and its nearest available shared ancestor as reachable. Their locally available chunks are retained until the conflict is resolved. After resolution, chunks used only by the discarded branch or no-longer-needed merge ancestry can become eligible for collection. See the [Garbage Collection V3 specification](specs_garbage_collection.md).
+Garbage Collection V3 treats every conflict leaf and its nearest available shared ancestor as reachable. Their locally available chunks are retained until the conflict is resolved. After resolution, chunks used only by the discarded branch or no-longer-needed merge ancestry can become eligible for collection. See the [Garbage Collection V3 specification](specs_garbage_collection.md).
 
-A generation-one revision has no parent. When its body is unavailable, LiveSync cannot preserve a changed Vault file as a sibling branch without inventing ancestry. It leaves the operation unresolved. Recover the missing chunks from another replica or backup, or explicitly discard that live revision. If the current Vault file is the intended replacement, it can be stored after the unreadable revision has been logically deleted.
+A generation-one revision has no parent. When its body is unavailable, LiveSync cannot preserve a changed Vault file as a sibling branch without inventing ancestry. It leaves the operation unresolved. Recover the missing chunks from another replica or backup, or explicitly discard that current leaf. If the current Vault file is the intended replacement, it can be stored after the unreadable revision has been logically deleted.
 
 ### Two devices independently create the same path
 
@@ -100,19 +116,19 @@ and otherwise asks the user.
 
 ## Stale and concurrent resolutions
 
-A device can resolve only the leaves which it has observed. If another device has already extended a branch, later replication can reveal another live leaf and require another resolution. Two devices can also produce different resolutions concurrently, leaving multiple live leaves after their trees meet.
+A device can resolve only the leaves which it has observed. If another device has already extended a branch, later replication can reveal another current leaf and require another resolution. Two devices can also produce different resolutions concurrently, leaving multiple current leaves after their trees meet.
 
-A higher revision generation or modification time does not make either result authoritative. The resolver must examine every current live leaf again until one result remains or user action is required. This is continued conflict processing, not a reset of the synchronisation checkpoint.
+A higher revision generation or modification time does not make either result authoritative. The resolver must examine every current leaf again until one result remains or user action is required. This is continued conflict processing, not a reset of the synchronisation checkpoint.
 
-## More than two live versions
+## More than two current versions
 
 When three or more versions remain, LiveSync compares the current PouchDB winner with one conflict leaf at a time. Commonlib orders the remaining candidates by revision generation ascending, original leaf modification time ascending, then the complete revision ID in code-unit lexical order. A missing or non-finite modification time is ordered before a finite value. Modification time makes pair selection reproducible here; it does not decide which content wins.
 
-For each pair, LiveSync first collapses identical content, then attempts a conservative sensible merge, and finally asks the user when neither automatic action is safe. A completed action is written to the ordinary revision tree and its losing observed leaf is deleted before LiveSync reads the remaining live leaves again. There is no separate persistent merge accumulator.
+For each pair, LiveSync first collapses identical content, then attempts a conservative sensible merge, and finally asks the user when neither automatic action is safe. A completed action is written to the ordinary revision tree and its losing observed leaf is deleted before LiveSync reads the remaining current leaves again. There is no separate persistent merge accumulator.
 
-**Concat both** writes the concatenated result as a new child of the displayed PouchDB winner, then deletes only the other leaf shown in that dialogue. With two live versions, that action resolves the conflict. With three or more, the new child remains live against every untouched leaf and becomes part of the next pairwise review; it does not create an unrelated root or consume an unseen branch.
+**Concat both** writes the concatenated result as a new child of the displayed PouchDB winner, then deletes only the other leaf shown in that dialogue. With two current versions, that action resolves the conflict. With three or more, the new child remains a current leaf against every untouched leaf and becomes part of the next pairwise review; it does not create an unrelated root or consume an unseen branch.
 
-Consequently, choosing **Not now** or closing Obsidian cannot undo a completed pair. After restart, LiveSync reconstructs the next pair from the live tree. If replication changes either revision while a dialogue is open, LiveSync discards the stale selection, refreshes the live count, and rechecks the path rather than deleting a revision which was not the one shown.
+Consequently, choosing **Not now** or closing Obsidian cannot undo a completed pair. After restart, LiveSync reconstructs the next pair from the current revision tree. If replication changes either revision while a dialogue is open, LiveSync discards the stale selection, refreshes the current-version count, and rechecks the path rather than deleting a revision which was not the one shown.
 
 ## Device-local file provenance
 
@@ -133,7 +149,7 @@ When no record exists, LiveSync may reconstruct the displayed revision only if t
 ## Operations while a conflict exists
 
 - Editing a file writes a child of its recorded or uniquely reconstructed displayed revision.
-- Deleting a file writes a logical-deletion child of that revision. It uses LiveSync's `deleted` marker, rather than a PouchDB `_deleted` tombstone, so the deletion remains a live branch which can replicate and be resolved against the other branch.
+- Deleting a file writes a logical-deletion child of that revision. It uses LiveSync's `deleted` marker, rather than a PouchDB `_deleted` tombstone, so the deletion remains a current branch which can replicate and be resolved against the other branch.
 - A case-only rename writes the new path as a child in the same document tree.
 - A cross-path rename stores the target document first, then writes a logical-deletion child on the displayed source branch.
 
@@ -146,7 +162,7 @@ uninterrupted conflict episode in the current plug-in session. Ordinary file
 checks and replication do not reopen the dialogue while at least one conflict
 leaf remains. If the in-editor status display is enabled, the active file shows
 **This file has 3 unresolved versions. They will be reviewed one pair at a
-time.** for three or more live versions, using the current count, and **This
+time.** for three or more current versions, using the current count, and **This
 file has unresolved conflicts.** for two. Postponement therefore does not make
 the conflict invisible.
 
@@ -163,8 +179,8 @@ When synchronisation supplies a resolved document, the existing incoming-file
 processing event closes an open conflict dialogue for that path. The same event
 rechecks the local revision tree: if no conflict leaf remains, it ends any
 postponed episode and removes the active-file warning. If conflict leaves still
-exist, the stale dialogue closes and the warning changes to the current live
-version count. A postponed episode stays postponed; otherwise, subsequent
+exist, the stale dialogue closes and the warning changes to the current-version
+count. A postponed episode stays postponed; otherwise, subsequent
 conflict processing may open a fresh dialogue for the current revision tree.
 Each dialogue owns its completion result, so a prompt which is answered or
 closed immediately still completes the waiting conflict operation; the result
@@ -193,7 +209,7 @@ A1
 └── B2 ── C2 ── D2     Android edit
 ```
 
-After synchronisation, both devices receive `C1` and `D2` as the live branches. The edit is not moved silently onto `C1`, and ordinary conflict resolution can compare the real descendants.
+After synchronisation, both devices receive `C1` and `D2` as the current branches. The edit is not moved silently onto `C1`, and ordinary conflict resolution can compare the real descendants.
 
 ### A user deletes the branch shown on one device
 
@@ -205,13 +221,13 @@ A1
 └── B2 ── C2 ── D2 (deleted: true)
 ```
 
-The deletion remains one side of the live conflict. The user can still choose between the content at `C1` and deleting the file. LiveSync does not delete `C1` merely because PouchDB selected it as the winner.
+The deletion remains one current leaf of the conflict. The user can still choose between the content at `C1` and deleting the file. LiveSync does not delete `C1` merely because PouchDB selected it as the winner.
 
 ### A user renames a conflicted file
 
 If the user changes only the spelling case, such as `Note.md` to `note.md`, LiveSync keeps the rename in the same revision tree and extends the revision displayed on that device.
 
-If the user renames `draft.md` to `published.md`, LiveSync stores `published.md` before it marks the displayed `draft.md` branch as logically deleted. If an interruption occurs between those operations, the recoverable result is a duplicate which can be reviewed, rather than loss of the only copy. Any other live branch of `draft.md` remains available for conflict resolution.
+If the user renames `draft.md` to `published.md`, LiveSync stores `published.md` before it marks the displayed `draft.md` branch as logically deleted. If an interruption occurs between those operations, the recoverable result is a duplicate which can be reviewed, rather than loss of the only copy. Any other conflict branch of `draft.md` remains available for conflict resolution.
 
 ### A remote resolution reaches a device which still shows the losing content
 
@@ -221,7 +237,7 @@ If the user edited the file on Mac before the resolution arrived, the bytes no l
 
 ### A three-version review is interrupted
 
-Mac receives three live versions of `shared.md`. The active-file status reports three unresolved versions, and the first dialogue compares the deterministic winner with the first ordered conflict leaf. The user completes that pair, leaving two live versions, then chooses **Not now** on the next dialogue and closes Obsidian.
+Mac receives three current versions of `shared.md`. The active-file status reports three unresolved versions, and the first dialogue compares the deterministic winner with the first ordered conflict leaf. The user completes that pair, leaving two current versions, then chooses **Not now** on the next dialogue and closes Obsidian.
 
 The first decision has already changed the ordinary revision tree. On restart, LiveSync reads the two surviving versions and presents only that remaining pair; it does not reconstruct the original three-version state. If another device resolves the remaining pair before or while the dialogue is open, the warning disappears and the stale dialogue closes.
 
@@ -251,8 +267,8 @@ Do not:
 
 ## Verification
 
-Commonlib's real-PouchDB and injected-boundary unit tests cover unequal branch lengths, exact shared ancestry, deterministic ordering of multiple live leaves, a sensible stage followed by reconstruction of a manual pair, content below a deleted losing leaf, recorded and reconstructed branch identity, ambiguous matches, conflict-time editing, missing-body preservation when parent metadata is available, refusal to invent a parent for a generation-one revision, logical deletion, case-only rename, cross-path rename, and safe unproven fallbacks.
+Commonlib's real-PouchDB and injected-boundary unit tests cover unequal branch lengths, exact shared ancestry, deterministic ordering of multiple current leaves, a sensible stage followed by reconstruction of a manual pair, content below a deleted losing leaf, recorded and reconstructed branch identity, ambiguous matches, conflict-time editing, missing-body preservation when parent metadata is available, refusal to invent a parent for a generation-one revision, logical deletion, case-only rename, cross-path rename, and safe unproven fallbacks.
 
-LiveSync's optional real-Obsidian two-Vault checks have two scopes. `E2E_OBSIDIAN_INCLUDE_MARKDOWN_CONFLICT=true` resolves and edits a Markdown conflict, propagates it to a Vault which still displays the deleted losing content, and requires one live result to remain. `E2E_OBSIDIAN_INCLUDE_CONFLICT_OPERATIONS=true` edits, deletes, case-renames, and cross-path-renames files while conflicts remain active; it verifies the parent revision of each resulting branch, replicates those exact trees, and confirms that the other live branches remain intact.
+LiveSync's optional real-Obsidian two-Vault checks have two scopes. `E2E_OBSIDIAN_INCLUDE_MARKDOWN_CONFLICT=true` resolves and edits a Markdown conflict, propagates it to a Vault which still displays the deleted losing content, and requires one current result to remain. `E2E_OBSIDIAN_INCLUDE_CONFLICT_OPERATIONS=true` edits, deletes, case-renames, and cross-path-renames files while conflicts remain active; it verifies the parent revision of each resulting branch, replicates those exact trees, and confirms that the other conflict branches remain intact.
 
-The focused `test:e2e:obsidian:conflict-dialog-policy` scenario creates three live versions in one real Obsidian Vault. It verifies the count warning, commits a concatenated child of the displayed winner, confirms that the untouched leaf remains as one conflict, postpones that remaining pair, restarts the isolated Obsidian profile, and confirms that only the live pair is reconstructed. It also verifies that an incoming resolution closes a stale dialogue, completes the waiting conflict operation, and clears the warning. The repair scenario removes a referenced local chunk, confirms that the exact unreadable live revision remains in the tree, and exercises explicit retry and discard controls without deleting another live revision.
+The focused `test:e2e:obsidian:conflict-dialog-policy` scenario creates three current versions in one real Obsidian Vault. It verifies the count warning, commits a concatenated child of the displayed winner, confirms that the untouched leaf remains as one conflict, postpones that remaining pair, restarts the isolated Obsidian profile, and confirms that only the current pair is reconstructed. It also verifies that an incoming resolution closes a stale dialogue, completes the waiting conflict operation, and clears the warning. The repair scenario removes a referenced local chunk, confirms that the exact unreadable current leaf remains in the tree, and exercises explicit retry and discard controls without deleting another current leaf.

docs/specs_garbage_collection.md

@@ -33,19 +33,19 @@ If the initial synchronisation, device inspection, or confirmation fails, the wo
 A chunk remains reachable when it is referenced by any of the following:
 
 - the current database winner for a file;
-- any other live conflict revision for that file;
-- an available revision on either side of a live conflict which is required to describe the divergence; or
-- the nearest available revision shared by both live conflict branches.
+- any conflict leaf for that file;
+- an available revision on either side of a current conflict which is required to describe the divergence; or
+- the nearest available revision shared by both conflict branches.
 
 Chunk identifiers are content-derived and shared between files. Reachability is therefore collected into one set across the database. A chunk used by two or more current files remains protected even when one file is updated or deleted.
 
-An ordinary superseded linear revision does not protect its former chunks. Once no current file or live conflict branch references a chunk, it can be collected. After a conflict is resolved, chunks unique to the discarded branch and to no-longer-needed merge ancestry can also become eligible.
+An ordinary superseded linear revision does not protect its former chunks. Once no current file or conflict leaf references a chunk, it can be collected. After a conflict is resolved, chunks unique to the discarded branch and to no-longer-needed merge ancestry can also become eligible.
 
 ## Consequences
 
 Garbage Collection deliberately trades historical recoverability for storage. A metadata revision may remain in the revision tree after a chunk which only that superseded revision used has been collected, so that historical body can become unreadable. Remote compaction can then discard old CouchDB revision bodies. Tombstones and retained metadata also consume storage, so the operation does not promise the smallest possible database.
 
-Writing the same bytes again produces the same content-derived chunk identifier. If that chunk was collected previously, the normal chunk-writing path creates a new live revision for it, and ordinary replication can transfer it again. This does not recover an older file revision automatically; it only makes the newly written content available.
+Writing the same bytes again produces the same content-derived chunk identifier. If that chunk was collected previously, the normal chunk-writing path creates a new non-deleted revision of the Chunk document, and ordinary replication can transfer it again. This does not recover an older file revision automatically; it only makes the newly written content available.
 
 Garbage Collection does not reconstruct a chunk which is already missing, determine whether an unreadable revision is important, or repair a damaged local database. Use **Inspect conflicts and file/database differences**, another healthy replica, or a backup for those cases. Use **Overwrite Server Data with This Device's Files** only when a chosen Vault is authoritative and a deliberate remote rebuild is required.
 
@@ -55,7 +55,7 @@ Commonlib tests use real in-memory PouchDB revision trees to verify:
 
 - collection eligibility after a normal file update;
 - protection of chunks shared by multiple current files;
-- protection of all live conflict branches and their nearest available shared ancestor;
+- protection of all conflict branches and their nearest available shared ancestor;
 - eligibility of losing-branch and ancestor-only chunks after conflict resolution;
 - propagation of chunk deletion to another PouchDB database; and
 - recreation and propagation when the same content is written again.

docs/terms.md

@@ -43,7 +43,7 @@ All guidelines and conventions listed below are disclosed and maintained solely
 - Database Suffix (additionalSuffixOfDatabaseName)
     - A unique suffix appended to the database name to allow synchronising multiple vaults with the same name on the same remote server.
 - E2EE Algorithm
-    - The cryptographic algorithm version used for end-to-end encryption. All devices in the synchronisation group must be configured with a compatible version (such as `V2` or `V1`).
+    - The cryptographic algorithm version used for end-to-end encryption. All synchronising devices must be configured with a compatible version (such as `V2` or `V1`).
 - Eden (Eden Chunks)
     - A performance optimisation where newly created chunks are held within the document until they stabilise, before graduating to independent chunks.
 - Fast Setup (Simple Fetch)
@@ -80,6 +80,22 @@ All guidelines and conventions listed below are disclosed and maintained solely
     - A recovery setting that restricts the propagation of changes from the database to local storage, ignoring any file events (such as accidental mass deletions) that occurred after a specified date and time.
 - Reset Synchronisation on This Device
     - A maintenance operation (formerly known as `Fetch everything`) that discards the local database and reconstructs it by downloading all data from the remote server.
+
+#### Revision
+
+A revision is a version of one PouchDB/CouchDB document. Concurrent changes can form a revision tree with more than one current branch.
+
+Revision modifiers describe independent properties. More than one may apply to the same revision:
+
+- **leaf**: Has no known child revision.
+- **winner**: Is the leaf selected by PouchDB/CouchDB as the current document.
+- **conflict**: Is another current leaf which was not selected as the winner.
+- **Vault-matching**: Represents the same file contents, or the same absent-file state, as the current Vault. More than one revision may match.
+- **displayed**: Is recorded by valid device-local file provenance as the branch represented in the Vault. A pending local edit may no longer match its bytes, but still extends this recorded branch.
+- **logically deleted**: Represents the absence of the file through a deletion marker. A logically deleted revision may also be a leaf, winner, conflict, or Vault-matching revision. An absent file retains no displayed provenance.
+
+Avoid **live revision** in prose because it can ambiguously mean either a current leaf or a non-deleted revision. See [Independent revision properties](specs_conflict_resolution.md#independent-revision-properties) for the relationship between revision-tree roles, Vault state, and device-local provenance.
+
 - Scram (Scram Switches)
     - Emergency controls in the settings that allow users to suspend file watching or database writes to prevent corruption.
 - Segmenter (Segmented-splitter)
@@ -94,6 +110,8 @@ All guidelines and conventions listed below are disclosed and maintained solely
     - A data transfer method that downloads database documents as a continuous stream of events. It is significantly faster than traditional chunk-by-chunk HTTP requests and is used during Fast Setup to retrieve remote metadata quickly.
 - Sync Mode
     - The replication trigger mechanism. Users can select from `On Events` (synchronising on local file changes), `Periodic and Events` (synchronising at fixed intervals as well as on events), or `LiveSync` (continuous, real-time synchronisation).
+- Synchronising devices
+    - Devices which participate in the same synchronisation for a Vault. The term describes membership rather than current activity, so it includes offline and idle devices.
 - TURN Server (WebRTC P2P)
     - A Traversal Using Relays around NAT server used as an optional fallback to relay encrypted WebRTC traffic when strict NAT or firewall rules block a direct peer connection. It is distinct from the signalling relay.
 - Update Thinning (Batch database update)

docs/tips/p2p-sync-tips.md

@@ -36,9 +36,20 @@ Try these in order:
 1. Put both devices on the same ordinary network and retry.
 2. Remove a VPN temporarily if it blocks peer traffic, or use a trusted VPN such as Tailscale when it provides a reachable path between the devices.
 3. In `P2P Configuration` -> `Advanced Settings`, configure a trusted TURN service.
+4. Under `Connection compatibility`, select `TURN relay only` to test the configured TURN path without direct ICE candidates.
 
 TURN is a fallback for encrypted WebRTC traffic. It is different from the required signalling relay. The project does not operate an official TURN service. A TURN provider cannot read encrypted Vault contents, but it can observe connection metadata and traffic volume.
 
+For a small self-hosted deployment, the repository includes an optional [Coturn Compose starter](../../docker/coturn/README.md). It uses static credentials and does not include TLS or a managed credential service; review its network and security boundaries before exposing it.
+
+## A connection opens but a transfer stalls
+
+If peers can connect but a transfer repeatedly stalls on one network path, try the `P2P message size` presets under `Connection compatibility`. Start with `Reduced`, then try `Conservative` and `Maximum compatibility` only if needed.
+
+The preset limits outgoing messages, so select the same value on every device which may send across the affected path. Smaller values add overhead and do not prove that packet fragmentation was the cause. Return to `Standard` when the path works reliably without the compatibility setting.
+
+Compatibility choices are saved with the P2P profile. You may keep separate standard and compatibility profiles with the same Group ID and credentials, then select the profile appropriate to the current network.
+
 ## A connected peer does not receive later edits
 
 An open signalling connection does not automatically move every change.

docs/troubleshooting.md

@@ -47,6 +47,14 @@ Do not switch to P2P or reset the database as the first response. Check:
 
 If the remote is healthy but one device's local database is not, use [Reset Synchronisation on This Device](recovery.md#reset-synchronisation-on-this-device) only after backing up unsynchronised local files.
 
+## Synchronisation is paused for compatibility review
+
+A compatibility review is separate from the Change Log. It can appear after an internal database or settings-format change, or when a configured Vault is copied, restored, or opened in a new Obsidian profile without its device-local acknowledgement.
+
+The **Synchronisation paused for compatibility review** dialogue opens after the Obsidian layout is ready. If it has been closed, use the persistent Notice's **Review why** link, or run `Review why synchronisation is paused` from the command palette. Opening **Change Log** does not clear the pause.
+
+Review the stated reason before continuing. When **Resume synchronisation** is available, first update every synchronising device, then use that action to record the current internal database version and restore the configured synchronisation behaviour. If the action is unavailable, the running installation is older than the recorded database or settings format. Update that installation instead of resetting the database merely to remove the warning.
+
 ## Files are missing or excluded
 
 Check Obsidian's `Detect all file extensions`, LiveSync selectors, ignore files, file-size limits, modification-time limits, and Hidden File Sync rules. A filtered file is different from a file which reached the database but could not be reconstructed from its chunks.
@@ -58,14 +66,22 @@ If the log reports missing chunks or a size mismatch:
 3. synchronise a device or restore a backup which still has the correct content;
 4. on that healthy device, run `Recreate chunks for current Vault files`, then synchronise;
 5. follow [Recover a conflicted or mismatched file](recovery.md#recover-a-conflicted-or-mismatched-file); run `Inspect conflicts and file/database differences` from `Hatch`, then use each revision's wrench menu to review and act on that exact branch; and
-6. use `Discard this branch` only after confirming that the exact live branch is no longer wanted. Use the separate `Discard unreadable revision` recovery action only when an unreadable revision is the sole live leaf.
+6. use `Discard this branch` only after confirming that the exact current branch is no longer wanted. Use the separate `Discard unreadable revision` recovery action only when an unreadable revision is the sole current leaf.
 
-The repair card uses compact diagnostic rows which remain readable in a narrow mobile settings pane. `🧩 Missing chunks: N` marks an unreadable revision. In the database row, `Δsize` means decoded size minus recorded size; `Δsize vs DB` means Vault size minus decoded database size; and `Δtime` means Vault modification time minus database modification time. These are diagnostic values, not a rule for deciding which revision is correct. `✅ Vault matches winner · ⚠️ Conflicts: N` means that the current Vault bytes agree with the database winner while other live branches still need a decision. Every mutating action rechecks that its selected revision is still live. Applying a logical deletion to an existing Vault file requires confirmation; a logical-deletion winner with no Vault file already agrees and is omitted.
+The repair card uses compact diagnostic rows which remain readable in a narrow mobile settings pane. `🧩 Missing chunks: N` marks an unreadable revision. In the database row, `Δsize` means decoded size minus recorded size; `Δsize vs DB` means Vault size minus decoded database size; and `Δtime` means Vault modification time minus database modification time. These are diagnostic values, not a rule for deciding which revision is correct. `✅ Vault matches winner · ⚠️ Conflicts: N` means that the current Vault bytes agree with the database winner while other conflict branches still need a decision. Every mutating action rechecks that its selected revision is still a current leaf. Applying a logical deletion to an existing Vault file requires confirmation; a logical-deletion winner with no Vault file already agrees and is omitted.
 
-`Retry reading revision` does not change the revision tree. `Discard this branch` creates a logical deletion on one exact live revision while another live branch remains and leaves the current Vault file unchanged. If the discarded revision was recorded as the Vault's exact source, that stale device-local provenance is removed. `Discard unreadable revision` provides the corresponding explicit escape hatch for a sole unreadable live leaf. Neither action purges history or reconstructs missing content. An unavailable non-live ancestor cannot be deleted through this workflow; it disables conservative three-way merge but does not prevent explicit selection between readable live revisions.
+`Retry reading revision` does not change the revision tree. `Discard this branch` creates a logical deletion on one exact current leaf while another current leaf remains and leaves the current Vault file unchanged. If the discarded revision was recorded as the Vault's exact source, that stale device-local provenance is removed. `Discard unreadable revision` provides the corresponding explicit escape hatch for a sole unreadable current leaf. Neither action purges history or reconstructs missing content. An unavailable ancestor which is not a current leaf cannot be deleted through this workflow; it disables conservative three-way merge but does not prevent explicit selection between readable current leaves.
 
 `Recreate chunks for current Vault files` uses current Vault content. It cannot recreate unique bytes which exist only in an unreadable historical or conflict revision.
 
+## A Metadata entry requires review
+
+When **Inspect conflicts and file/database differences** reports `Metadata entry requires review and was left unchanged`, the local database contains Metadata whose stored document ID does not agree with the ID derived from its recorded path. LiveSync withholds that entry from ordinary file reflection and deletion rather than guessing which identity is intended. The inspection is local and does not query the remote.
+
+Do not change file-name case handling or path obfuscation merely to make the displayed IDs agree. Follow [Repair a Metadata document ID mismatch](recovery.md#repair-a-metadata-document-id-mismatch) when the card offers **Repair this Metadata document ID**. If no repair action is offered, the entry is ambiguous, conflicted, deleted, outside the normal-file namespace, or otherwise unsafe for one-entry repair. Preserve the evidence and use the wider recovery guidance instead of forcing a target ID.
+
+If many entries reflect deliberate folder-name or ID-derivation differences across devices, choose an authoritative Vault and use the established Rebuild workflow. A one-entry repair is not a distributed rename or database migration.
+
 ## A configuration mismatch dialogue blocks synchronisation
 
 Some settings must match across devices. LiveSync pauses synchronisation when the local and remote values differ rather than propagating an unexpected change silently.
@@ -133,7 +149,7 @@ Browser security errors, particularly CORS failures, may reach the plug-in only
 
 LiveSync stores file metadata, chunks, revision history, conflicts, deletions, and tombstones. Deleting or shortening a file therefore does not immediately remove every object which once represented it.
 
-Garbage Collection V3 can remove unreferenced chunks from a healthy CouchDB setup, but it is appropriate only when the Vault and local database are healthy and all relevant devices have synchronised. Current files and live conflict branches protect their required chunks; an ordinary superseded revision does not. Tombstones and retained metadata are not free, so Garbage Collection does not guarantee a minimal database. Review the [Garbage Collection V3 specification](specs_garbage_collection.md) before using it.
+Garbage Collection V3 can remove unreferenced chunks from a healthy CouchDB setup, but it is appropriate only when the Vault and local database are healthy and all relevant devices have synchronised. Current files and conflict branches protect their required chunks; an ordinary superseded revision does not. Tombstones and retained metadata are not free, so Garbage Collection does not guarantee a minimal database. Review the [Garbage Collection V3 specification](specs_garbage_collection.md) before using it.
 
 `Overwrite Server Data with This Device's Files` is a separate rebuild operation and is the more certain way to reconstruct a central remote from a chosen authoritative Vault. It is also destructive and may discard changes which exist only on another device. Review [Recovery and flag files](recovery.md#garbage-collection-is-not-rebuild) before choosing between them.
 

manifest.json

@@ -1,7 +1,7 @@
 {
     "id": "obsidian-livesync",
     "name": "Self-hosted LiveSync",
-    "version": "1.0.11",
+    "version": "1.0.18",
     "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",

package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "obsidian-livesync",
-    "version": "1.0.11",
+    "version": "1.0.18",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "obsidian-livesync",
-            "version": "1.0.11",
+            "version": "1.0.18",
             "license": "MIT",
             "workspaces": [
                 "src/apps/cli",
@@ -23,8 +23,8 @@
                 "@smithy/types": "^4.14.3",
                 "@smithy/util-retry": "^4.4.5",
                 "@vrtmrz/browser-ui-kit": "0.1.0",
-                "@vrtmrz/livesync-commonlib": "0.1.10",
-                "@vrtmrz/obsidian-plugin-kit": "0.1.3",
+                "@vrtmrz/livesync-commonlib": "0.1.19",
+                "@vrtmrz/obsidian-plugin-kit": "0.1.4",
                 "@vrtmrz/ui-interactions": "0.1.2",
                 "diff-match-patch": "^1.0.5",
                 "fflate": "^0.8.2",
@@ -32,7 +32,7 @@
                 "markdown-it": "^14.2.0",
                 "minimatch": "^10.2.5",
                 "obsidian": "^1.13.1",
-                "octagonal-wheels": "^0.1.52",
+                "octagonal-wheels": "^0.1.53",
                 "qrcode-generator": "^1.4.4",
                 "xxhash-wasm-102": "npm:xxhash-wasm@^1.0.2"
             },
@@ -988,7 +988,6 @@
             "integrity": "sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==",
             "dev": true,
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "@babel/code-frame": "^7.29.7",
                 "@babel/generator": "^7.29.7",
@@ -1193,15 +1192,6 @@
                 "node": ">=6.0.0"
             }
         },
-        "node_modules/@babel/runtime": {
-            "version": "7.29.2",
-            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.29.2.tgz",
-            "integrity": "sha512-JiDShH45zKHWyGe4ZNVRrCjBz8Nh9TMmZG1kh4QTK8hCBTWBi8Da+i7s1fJw7/lYpM4ccepSNfqzZ/QvABBi5g==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=6.9.0"
-            }
-        },
         "node_modules/@babel/template": {
             "version": "7.29.7",
             "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.29.7.tgz",
@@ -1353,7 +1343,6 @@
             "integrity": "sha512-RSvbQmHzdKzNsLYa/wHrbc3KN4sYLKAdPZxqiM2HATqv/SBk2/ENSHpvXGaLOMcsAyz0poEGqkmmKYG3OWiJEQ==",
             "dev": true,
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "@emnapi/wasi-threads": "1.2.2",
                 "tslib": "^2.4.0"
@@ -1365,7 +1354,6 @@
             "integrity": "sha512-vgj7R3y3Wgx24IQaGPA/R6YFXLHVMOZ0uVEyIQPaWs+rd1AzfEMXlAC22FYwO1XkKR6NPsq7mUandH8oIRdZFw==",
             "dev": true,
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "tslib": "^2.4.0"
             }
@@ -2273,7 +2261,8 @@
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/@marijn/find-cluster-break/-/find-cluster-break-1.0.2.tgz",
             "integrity": "sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g==",
-            "license": "MIT"
+            "license": "MIT",
+            "peer": true
         },
         "node_modules/@microsoft/eslint-plugin-sdl": {
             "version": "1.1.0",
@@ -2323,12 +2312,6 @@
                 "ret": "~0.1.10"
             }
         },
-        "node_modules/@minhducsun2002/leb128": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/@minhducsun2002/leb128/-/leb128-1.0.0.tgz",
-            "integrity": "sha512-eFrYUPDVHeuwWHluTG1kwNQUEUcFjVKYwPkU8z9DR1JH3AW7JtJsG9cRVGmwz809kKtGfwGJj58juCZxEvnI/g==",
-            "license": "MIT"
-        },
         "node_modules/@napi-rs/wasm-runtime": {
             "version": "1.1.5",
             "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.5.tgz",
@@ -2445,128 +2428,167 @@
             }
         },
         "node_modules/@peculiar/asn1-cms": {
-            "version": "2.6.1",
-            "resolved": "https://registry.npmjs.org/@peculiar/asn1-cms/-/asn1-cms-2.6.1.tgz",
-            "integrity": "sha512-vdG4fBF6Lkirkcl53q6eOdn3XYKt+kJTG59edgRZORlg/3atWWEReRCx5rYE1ZzTTX6vLK5zDMjHh7vbrcXGtw==",
+            "version": "2.9.4",
+            "resolved": "https://registry.npmjs.org/@peculiar/asn1-cms/-/asn1-cms-2.9.4.tgz",
+            "integrity": "sha512-cben7oxmQsUGZqotus7yt0srYdncOT6RNWcTQ77T2RFOXejYVYkXadrfePdRcrVpO9K95IRLKKglG2k38jKXuw==",
             "license": "MIT",
             "dependencies": {
-                "@peculiar/asn1-schema": "^2.6.0",
-                "@peculiar/asn1-x509": "^2.6.1",
-                "@peculiar/asn1-x509-attr": "^2.6.1",
-                "asn1js": "^3.0.6",
+                "@peculiar/asn1-schema": "^2.9.4",
+                "@peculiar/asn1-x509": "^2.9.4",
+                "@peculiar/asn1-x509-attr": "^2.9.4",
+                "asn1js": "^3.0.10",
                 "tslib": "^2.8.1"
+            },
+            "engines": {
+                "node": ">=14"
             }
         },
         "node_modules/@peculiar/asn1-csr": {
-            "version": "2.6.1",
-            "resolved": "https://registry.npmjs.org/@peculiar/asn1-csr/-/asn1-csr-2.6.1.tgz",
-            "integrity": "sha512-WRWnKfIocHyzFYQTka8O/tXCiBquAPSrRjXbOkHbO4qdmS6loffCEGs+rby6WxxGdJCuunnhS2duHURhjyio6w==",
+            "version": "2.9.4",
+            "resolved": "https://registry.npmjs.org/@peculiar/asn1-csr/-/asn1-csr-2.9.4.tgz",
+            "integrity": "sha512-xd4YN4vpRjkDAQWVfZZkeu12IEND7DOpkqaHSIHxZl1uggUNa9Ju0QxY2jHvDAS9pP0zhRBytg8ifsnGo3V0jw==",
             "license": "MIT",
             "dependencies": {
-                "@peculiar/asn1-schema": "^2.6.0",
-                "@peculiar/asn1-x509": "^2.6.1",
-                "asn1js": "^3.0.6",
+                "@peculiar/asn1-schema": "^2.9.4",
+                "@peculiar/asn1-x509": "^2.9.4",
+                "asn1js": "^3.0.10",
                 "tslib": "^2.8.1"
+            },
+            "engines": {
+                "node": ">=14"
             }
         },
         "node_modules/@peculiar/asn1-ecc": {
-            "version": "2.6.1",
-            "resolved": "https://registry.npmjs.org/@peculiar/asn1-ecc/-/asn1-ecc-2.6.1.tgz",
-            "integrity": "sha512-+Vqw8WFxrtDIN5ehUdvlN2m73exS2JVG0UAyfVB31gIfor3zWEAQPD+K9ydCxaj3MLen9k0JhKpu9LqviuCE1g==",
+            "version": "2.9.4",
+            "resolved": "https://registry.npmjs.org/@peculiar/asn1-ecc/-/asn1-ecc-2.9.4.tgz",
+            "integrity": "sha512-JJXefFshRAuVAjWQo/39bkg1ywc1VaiO44S8RRC+Ykvf/u2KDmYffoDb0ZBPCR5uJy4AGKQhl8mX+Q8ShcWaXQ==",
             "license": "MIT",
             "dependencies": {
-                "@peculiar/asn1-schema": "^2.6.0",
-                "@peculiar/asn1-x509": "^2.6.1",
-                "asn1js": "^3.0.6",
+                "@peculiar/asn1-schema": "^2.9.4",
+                "@peculiar/asn1-x509": "^2.9.4",
+                "asn1js": "^3.0.10",
                 "tslib": "^2.8.1"
+            },
+            "engines": {
+                "node": ">=14"
             }
         },
         "node_modules/@peculiar/asn1-pfx": {
-            "version": "2.6.1",
-            "resolved": "https://registry.npmjs.org/@peculiar/asn1-pfx/-/asn1-pfx-2.6.1.tgz",
-            "integrity": "sha512-nB5jVQy3MAAWvq0KY0R2JUZG8bO/bTLpnwyOzXyEh/e54ynGTatAR+csOnXkkVD9AFZ2uL8Z7EV918+qB1qDvw==",
+            "version": "2.9.4",
+            "resolved": "https://registry.npmjs.org/@peculiar/asn1-pfx/-/asn1-pfx-2.9.4.tgz",
+            "integrity": "sha512-khuGzHTzNzk4GDlIBEILyIs6Lce0yn0ZBdoI9v93kmNncfZRhD+AQ5ODFqdhvoE8cMJF/JMTQ8yA+t1D14kqCw==",
             "license": "MIT",
             "dependencies": {
-                "@peculiar/asn1-cms": "^2.6.1",
-                "@peculiar/asn1-pkcs8": "^2.6.1",
-                "@peculiar/asn1-rsa": "^2.6.1",
-                "@peculiar/asn1-schema": "^2.6.0",
-                "asn1js": "^3.0.6",
+                "@peculiar/asn1-cms": "^2.9.4",
+                "@peculiar/asn1-pkcs8": "^2.9.4",
+                "@peculiar/asn1-rsa": "^2.9.4",
+                "@peculiar/asn1-schema": "^2.9.4",
+                "asn1js": "^3.0.10",
                 "tslib": "^2.8.1"
+            },
+            "engines": {
+                "node": ">=14"
             }
         },
         "node_modules/@peculiar/asn1-pkcs8": {
-            "version": "2.6.1",
-            "resolved": "https://registry.npmjs.org/@peculiar/asn1-pkcs8/-/asn1-pkcs8-2.6.1.tgz",
-            "integrity": "sha512-JB5iQ9Izn5yGMw3ZG4Nw3Xn/hb/G38GYF3lf7WmJb8JZUydhVGEjK/ZlFSWhnlB7K/4oqEs8HnfFIKklhR58Tw==",
+            "version": "2.9.4",
+            "resolved": "https://registry.npmjs.org/@peculiar/asn1-pkcs8/-/asn1-pkcs8-2.9.4.tgz",
+            "integrity": "sha512-duRdotlUx9eDZe6QrQpQKl61RbWykCHBCkKayP8V8XdEFwlKHZ8qGGDMyS6Pye7OX7nLFttTTpRkJeet78ckwQ==",
             "license": "MIT",
             "dependencies": {
-                "@peculiar/asn1-schema": "^2.6.0",
-                "@peculiar/asn1-x509": "^2.6.1",
-                "asn1js": "^3.0.6",
+                "@peculiar/asn1-schema": "^2.9.4",
+                "@peculiar/asn1-x509": "^2.9.4",
+                "asn1js": "^3.0.10",
                 "tslib": "^2.8.1"
+            },
+            "engines": {
+                "node": ">=14"
             }
         },
         "node_modules/@peculiar/asn1-pkcs9": {
-            "version": "2.6.1",
-            "resolved": "https://registry.npmjs.org/@peculiar/asn1-pkcs9/-/asn1-pkcs9-2.6.1.tgz",
-            "integrity": "sha512-5EV8nZoMSxeWmcxWmmcolg22ojZRgJg+Y9MX2fnE2bGRo5KQLqV5IL9kdSQDZxlHz95tHvIq9F//bvL1OeNILw==",
+            "version": "2.9.4",
+            "resolved": "https://registry.npmjs.org/@peculiar/asn1-pkcs9/-/asn1-pkcs9-2.9.4.tgz",
+            "integrity": "sha512-kaL4cNxBpdQE2dKlyZBqz4ygCrwffO+8wfoxTEqM1Z8RadvCeELBRzcv0dzM8aY9azHMwODO5nxU65zXmhToOQ==",
             "license": "MIT",
             "dependencies": {
-                "@peculiar/asn1-cms": "^2.6.1",
-                "@peculiar/asn1-pfx": "^2.6.1",
-                "@peculiar/asn1-pkcs8": "^2.6.1",
-                "@peculiar/asn1-schema": "^2.6.0",
-                "@peculiar/asn1-x509": "^2.6.1",
-                "@peculiar/asn1-x509-attr": "^2.6.1",
-                "asn1js": "^3.0.6",
+                "@peculiar/asn1-cms": "^2.9.4",
+                "@peculiar/asn1-pfx": "^2.9.4",
+                "@peculiar/asn1-pkcs8": "^2.9.4",
+                "@peculiar/asn1-schema": "^2.9.4",
+                "@peculiar/asn1-x509": "^2.9.4",
+                "@peculiar/asn1-x509-attr": "^2.9.4",
+                "asn1js": "^3.0.10",
                 "tslib": "^2.8.1"
+            },
+            "engines": {
+                "node": ">=14"
             }
         },
         "node_modules/@peculiar/asn1-rsa": {
-            "version": "2.6.1",
-            "resolved": "https://registry.npmjs.org/@peculiar/asn1-rsa/-/asn1-rsa-2.6.1.tgz",
-            "integrity": "sha512-1nVMEh46SElUt5CB3RUTV4EG/z7iYc7EoaDY5ECwganibQPkZ/Y2eMsTKB/LeyrUJ+W/tKoD9WUqIy8vB+CEdA==",
+            "version": "2.9.4",
+            "resolved": "https://registry.npmjs.org/@peculiar/asn1-rsa/-/asn1-rsa-2.9.4.tgz",
+            "integrity": "sha512-pZ96eD1PptovcWQ/GSmuNFXd/7EQJNlKfDaNCyE2rx3W0v6QFelkzquVqRSRyyDXXCYD69ZXJDzZ8GhIiQzKoA==",
             "license": "MIT",
             "dependencies": {
-                "@peculiar/asn1-schema": "^2.6.0",
-                "@peculiar/asn1-x509": "^2.6.1",
-                "asn1js": "^3.0.6",
+                "@peculiar/asn1-schema": "^2.9.4",
+                "@peculiar/asn1-x509": "^2.9.4",
+                "asn1js": "^3.0.10",
                 "tslib": "^2.8.1"
+            },
+            "engines": {
+                "node": ">=14"
             }
         },
         "node_modules/@peculiar/asn1-schema": {
-            "version": "2.6.0",
-            "resolved": "https://registry.npmjs.org/@peculiar/asn1-schema/-/asn1-schema-2.6.0.tgz",
-            "integrity": "sha512-xNLYLBFTBKkCzEZIw842BxytQQATQv+lDTCEMZ8C196iJcJJMBUZxrhSTxLaohMyKK8QlzRNTRkUmanucnDSqg==",
+            "version": "2.9.4",
+            "resolved": "https://registry.npmjs.org/@peculiar/asn1-schema/-/asn1-schema-2.9.4.tgz",
+            "integrity": "sha512-GjzePcT9Iw8NzeOPf73iNS9xM+TBhd/FilAfP+RQGkTMQJTVWtytN3JHJACCjf/ABNau5S7mS3g+DcuxmRgYEg==",
             "license": "MIT",
             "dependencies": {
-                "asn1js": "^3.0.6",
-                "pvtsutils": "^1.3.6",
+                "@peculiar/utils": "^2.0.2",
+                "asn1js": "^3.0.10",
                 "tslib": "^2.8.1"
+            },
+            "engines": {
+                "node": ">=14"
             }
         },
         "node_modules/@peculiar/asn1-x509": {
-            "version": "2.6.1",
-            "resolved": "https://registry.npmjs.org/@peculiar/asn1-x509/-/asn1-x509-2.6.1.tgz",
-            "integrity": "sha512-O9jT5F1A2+t3r7C4VT7LYGXqkGLK7Kj1xFpz7U0isPrubwU5PbDoyYtx6MiGst29yq7pXN5vZbQFKRCP+lLZlA==",
+            "version": "2.9.4",
+            "resolved": "https://registry.npmjs.org/@peculiar/asn1-x509/-/asn1-x509-2.9.4.tgz",
+            "integrity": "sha512-CxhBo/RdEbMMob7T31ZdQjGuoyRFLVwrDzTn25bihzBasRg9kRm/0IxIPvhgQtcK/9dNcO1XQL2fuPugwELL0Q==",
             "license": "MIT",
             "dependencies": {
-                "@peculiar/asn1-schema": "^2.6.0",
-                "asn1js": "^3.0.6",
-                "pvtsutils": "^1.3.6",
+                "@peculiar/asn1-schema": "^2.9.4",
+                "@peculiar/utils": "^2.0.2",
+                "asn1js": "^3.0.10",
                 "tslib": "^2.8.1"
+            },
+            "engines": {
+                "node": ">=14"
             }
         },
         "node_modules/@peculiar/asn1-x509-attr": {
-            "version": "2.6.1",
-            "resolved": "https://registry.npmjs.org/@peculiar/asn1-x509-attr/-/asn1-x509-attr-2.6.1.tgz",
-            "integrity": "sha512-tlW6cxoHwgcQghnJwv3YS+9OO1737zgPogZ+CgWRUK4roEwIPzRH4JEiG770xe5HX2ATfCpmX60gurfWIF9dcQ==",
+            "version": "2.9.4",
+            "resolved": "https://registry.npmjs.org/@peculiar/asn1-x509-attr/-/asn1-x509-attr-2.9.4.tgz",
+            "integrity": "sha512-ehQXbpQaQYycgu8OrvigwSPTFfVRcu0ECNYCWw+yzBp02Lw5paRqzzhUpfOgO2K38+WfFZuEz/0RPtam5g0OMg==",
+            "license": "MIT",
+            "dependencies": {
+                "@peculiar/asn1-schema": "^2.9.4",
+                "@peculiar/asn1-x509": "^2.9.4",
+                "asn1js": "^3.0.10",
+                "tslib": "^2.8.1"
+            },
+            "engines": {
+                "node": ">=14"
+            }
+        },
+        "node_modules/@peculiar/utils": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/@peculiar/utils/-/utils-2.0.3.tgz",
+            "integrity": "sha512-+oL3HPFRIZ1St2K50lWCXiioIgSoxzz7R1J3uF6neO2yl1sgmpgY6XXJH4BdpoDkMWznQTeYF6oWNDZLCdQ4eQ==",
             "license": "MIT",
             "dependencies": {
-                "@peculiar/asn1-schema": "^2.6.0",
-                "@peculiar/asn1-x509": "^2.6.1",
-                "asn1js": "^3.0.6",
                 "tslib": "^2.8.1"
             }
         },
@@ -3003,11 +3025,6 @@
                 "node": ">=0.10.0"
             }
         },
-        "node_modules/@shinyoshiaki/jspack": {
-            "version": "0.0.6",
-            "resolved": "https://registry.npmjs.org/@shinyoshiaki/jspack/-/jspack-0.0.6.tgz",
-            "integrity": "sha512-SdsNhLjQh4onBlyPrn4ia1Pdx5bXT88G/LIEpOYAjx2u4xeY/m/HB5yHqlkJB1uQR3Zw4R3hBWLj46STRAN0rg=="
-        },
         "node_modules/@smithy/abort-controller": {
             "version": "4.2.12",
             "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-4.2.12.tgz",
@@ -3924,6 +3941,21 @@
             "dev": true,
             "license": "MIT"
         },
+        "node_modules/@types/dom-mediacapture-transform": {
+            "version": "0.1.12",
+            "resolved": "https://registry.npmjs.org/@types/dom-mediacapture-transform/-/dom-mediacapture-transform-0.1.12.tgz",
+            "integrity": "sha512-d7/QsLRwF864A5mgIM/YrfiglHoYn7zgCcAoJgW404r+2DwnNr7EBbLnCWpmOMgH8y0te73L1AV6H1bmauaWFw==",
+            "license": "MIT",
+            "dependencies": {
+                "@types/dom-webcodecs": "*"
+            }
+        },
+        "node_modules/@types/dom-webcodecs": {
+            "version": "0.1.13",
+            "resolved": "https://registry.npmjs.org/@types/dom-webcodecs/-/dom-webcodecs-0.1.13.tgz",
+            "integrity": "sha512-O5hkiFIcjjszPIYyUSyvScyvrBoV3NOEEZx/pMlsu44TKzWNkLVBBxnxJz42in5n3QIolYOcBYFCPZZ0h8SkwQ==",
+            "license": "MIT"
+        },
         "node_modules/@types/eslint": {
             "version": "9.6.1",
             "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
@@ -4048,7 +4080,6 @@
             "integrity": "sha512-fRa09kZTgu8o71KFcDjUFuc7F+dEbZYZmkI0mg5YBTRs0yMKjYHsq/c0urDKeDb+D5qVgXOdFcuu+DZPKOITwA==",
             "dev": true,
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "undici-types": "~7.18.0"
             }
@@ -4626,7 +4657,6 @@
             "integrity": "sha512-lt3kovsyHwYe00wq4D1ti0Z974fWj4NLp6siqiyEufUpyFwK9Yhi7rBhac9JL5aA0zoMrJqc4vYPZRUnI7l7nw==",
             "dev": true,
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "@bcoe/v8-coverage": "^1.0.2",
                 "@vitest/utils": "4.1.8",
@@ -4775,9 +4805,9 @@
             }
         },
         "node_modules/@vrtmrz/livesync-commonlib": {
-            "version": "0.1.10",
-            "resolved": "https://registry.npmjs.org/@vrtmrz/livesync-commonlib/-/livesync-commonlib-0.1.10.tgz",
-            "integrity": "sha512-1t1e8EPM2fuIbC107jJQXbSivWXcspD7kR/3AOgT29O9E5UbGFZR6vj1f84D6vOe8BiHhv8Ng9GvrCV6U+gGXg==",
+            "version": "0.1.19",
+            "resolved": "https://registry.npmjs.org/@vrtmrz/livesync-commonlib/-/livesync-commonlib-0.1.19.tgz",
+            "integrity": "sha512-sVQcVJaelm575xoopay1yUWsIlfh2Um6Oi70Jp4WLdO3vlPCoYUbCKH+zGDwU/r05BbB2xGwU+kgy6OjxyxGeQ==",
             "license": "MIT",
             "dependencies": {
                 "@aws-sdk/client-s3": "^3.808.0",
@@ -4793,7 +4823,7 @@
                 "idb": "^8.0.3",
                 "markdown-it": "^14.2.0",
                 "minimatch": "^10.2.5",
-                "octagonal-wheels": "^0.1.51",
+                "octagonal-wheels": "^0.1.53",
                 "pouchdb-adapter-http": "^9.0.0",
                 "pouchdb-adapter-idb": "^9.0.0",
                 "pouchdb-adapter-indexeddb": "^9.0.0",
@@ -4838,9 +4868,9 @@
             }
         },
         "node_modules/@vrtmrz/obsidian-plugin-kit": {
-            "version": "0.1.3",
-            "resolved": "https://registry.npmjs.org/@vrtmrz/obsidian-plugin-kit/-/obsidian-plugin-kit-0.1.3.tgz",
-            "integrity": "sha512-6fsKdhFZtBv6FXlZHtSmpqwROohFzDmres6q08nr2xYGVeh2ooBGU3zJS94WN/tOjDT+wa/Vr3yE42wmI0pIZA==",
+            "version": "0.1.4",
+            "resolved": "https://registry.npmjs.org/@vrtmrz/obsidian-plugin-kit/-/obsidian-plugin-kit-0.1.4.tgz",
+            "integrity": "sha512-MxZgd7UOr8DXk0e+JsAXJmYj/8bfIoEliI4ruvp1Cu4U+mmVI/p63nZ5we3dDW+EaCgRAgF+ztuVDkcMUk1DwA==",
             "license": "MIT",
             "dependencies": {
                 "@vrtmrz/ui-interactions": "0.1.2"
@@ -5138,7 +5168,6 @@
             "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
             "devOptional": true,
             "license": "MIT",
-            "peer": true,
             "bin": {
                 "acorn": "bin/acorn"
             },
@@ -5156,12 +5185,6 @@
                 "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
             }
         },
-        "node_modules/aes-js": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-3.1.2.tgz",
-            "integrity": "sha512-e5pEa2kBnBOgR4Y/p20pskXI74UEz7de8ZGVo58asOtvSVG5YAbJeELPZxOmt+Bnz3rX753YKhfIn4X4l1PPRQ==",
-            "license": "MIT"
-        },
         "node_modules/agent-base": {
             "version": "7.1.4",
             "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz",
@@ -5606,13 +5629,13 @@
             }
         },
         "node_modules/asn1js": {
-            "version": "3.0.7",
-            "resolved": "https://registry.npmjs.org/asn1js/-/asn1js-3.0.7.tgz",
-            "integrity": "sha512-uLvq6KJu04qoQM6gvBfKFjlh6Gl0vOKQuR5cJMDHQkmwfMOQeN3F3SHCv9SNYSL+CRoHvOGFfllDlVz03GQjvQ==",
+            "version": "3.0.10",
+            "resolved": "https://registry.npmjs.org/asn1js/-/asn1js-3.0.10.tgz",
+            "integrity": "sha512-S2s3aOytiKdFRdulw2qPE51MzjzVOisppcVv7jVFR+Kw0kxwvFrDcYA0h7Ndqbmj0HkMIXYWaoj7fli8kgx1eg==",
             "license": "BSD-3-Clause",
             "dependencies": {
                 "pvtsutils": "^1.3.6",
-                "pvutils": "^1.1.3",
+                "pvutils": "^1.1.5",
                 "tslib": "^2.8.1"
             },
             "engines": {
@@ -6030,7 +6053,6 @@
                 }
             ],
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "baseline-browser-mapping": "^2.10.12",
                 "caniuse-lite": "^1.0.30001782",
@@ -6073,6 +6095,7 @@
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-1.0.0.tgz",
             "integrity": "sha512-Db1SbgBS/fg/392AblrMJk97KggmvYhr4pB5ZIMTWtaivCPMWLkmb7m21cJvpvgK+J3nsU2CmmixNBZx4vFj/w==",
+            "dev": true,
             "license": "MIT",
             "engines": {
                 "node": ">=8.0.0"
@@ -6502,7 +6525,8 @@
             "version": "1.0.6",
             "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz",
             "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==",
-            "license": "MIT"
+            "license": "MIT",
+            "peer": true
         },
         "node_modules/cross-spawn": {
             "version": "7.0.6",
@@ -6639,26 +6663,11 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "node_modules/date-fns": {
-            "version": "2.30.0",
-            "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz",
-            "integrity": "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==",
-            "license": "MIT",
-            "dependencies": {
-                "@babel/runtime": "^7.21.0"
-            },
-            "engines": {
-                "node": ">=0.11"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/date-fns"
-            }
-        },
         "node_modules/debug": {
             "version": "4.4.3",
             "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
             "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "ms": "^2.1.3"
@@ -7344,7 +7353,6 @@
             "dev": true,
             "hasInstallScript": true,
             "license": "MIT",
-            "peer": true,
             "bin": {
                 "esbuild": "bin/esbuild"
             },
@@ -7476,7 +7484,6 @@
             "integrity": "sha512-XoMjdBOwe/esVgEvLmNsD3IRHkm7fbKIUGvrleloJXUZgDHig2IPWNniv+GwjyJXzuNqVjlr5+4yVUZjycJwfQ==",
             "dev": true,
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "@eslint-community/eslint-utils": "^4.8.0",
                 "@eslint-community/regexpp": "^4.12.1",
@@ -8441,6 +8448,7 @@
             "version": "3.1.3",
             "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
             "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+            "dev": true,
             "license": "MIT"
         },
         "node_modules/fast-fifo": {
@@ -9404,12 +9412,6 @@
             "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
             "license": "ISC"
         },
-        "node_modules/int64-buffer": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/int64-buffer/-/int64-buffer-1.1.0.tgz",
-            "integrity": "sha512-94smTCQOvigN4d/2R/YDjz8YVG0Sufvv2aAh8P5m42gwhCsDAJqnbNOrxJsrADuAFAA69Q/ptGzxvNcNuIJcvw==",
-            "license": "MIT"
-        },
         "node_modules/internal-slot": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz",
@@ -9425,12 +9427,6 @@
                 "node": ">= 0.4"
             }
         },
-        "node_modules/ip": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.1.tgz",
-            "integrity": "sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==",
-            "license": "MIT"
-        },
         "node_modules/ip-address": {
             "version": "10.2.0",
             "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.2.0.tgz",
@@ -10036,7 +10032,6 @@
             "integrity": "sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==",
             "dev": true,
             "license": "MIT",
-            "peer": true,
             "bin": {
                 "jiti": "lib/jiti-cli.mjs"
             }
@@ -10927,6 +10922,7 @@
             "version": "4.18.1",
             "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz",
             "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==",
+            "dev": true,
             "license": "MIT"
         },
         "node_modules/lodash-es": {
@@ -11095,6 +11091,24 @@
             "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==",
             "license": "MIT"
         },
+        "node_modules/mediabunny": {
+            "version": "1.55.2",
+            "resolved": "https://registry.npmjs.org/mediabunny/-/mediabunny-1.55.2.tgz",
+            "integrity": "sha512-EEx4O6qYddAdCyWPMZNDwI7uc5hewNHrPAf9jLcVhIbXoPsiqNQ+D9i1pfadmGkjN2V318jSrZljkpoziYm6Lg==",
+            "license": "MPL-2.0",
+            "workspaces": [
+                ".",
+                "packages/*"
+            ],
+            "dependencies": {
+                "@types/dom-mediacapture-transform": "^0.1.11",
+                "@types/dom-webcodecs": "0.1.13"
+            },
+            "funding": {
+                "type": "individual",
+                "url": "https://github.com/sponsors/Vanilagy"
+            }
+        },
         "node_modules/memdown": {
             "version": "1.4.1",
             "resolved": "https://registry.npmjs.org/memdown/-/memdown-1.4.1.tgz",
@@ -11212,12 +11226,6 @@
                 "node": "*"
             }
         },
-        "node_modules/mp4box": {
-            "version": "0.5.4",
-            "resolved": "https://registry.npmjs.org/mp4box/-/mp4box-0.5.4.tgz",
-            "integrity": "sha512-GcCH0fySxBurJtvr0dfhz0IxHZjc1RP+F+I8xw+LIwkU1a+7HJx8NCDiww1I5u4Hz6g4eR1JlGADEGJ9r4lSfA==",
-            "license": "BSD-3-Clause"
-        },
         "node_modules/mri": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz",
@@ -11510,7 +11518,6 @@
             "resolved": "https://registry.npmjs.org/obsidian/-/obsidian-1.13.1.tgz",
             "integrity": "sha512-qtTEA2pmhJzhuhJqzbBFRYhpIOqvW+krDYjtFynv66KbxBbumHBlsJfWw3I4jtnK/6fZwbQhCrmmDdRwXmX56w==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "@types/codemirror": "5.60.8",
                 "moment": "2.29.4"
@@ -11532,9 +11539,9 @@
             "license": "MIT"
         },
         "node_modules/octagonal-wheels": {
-            "version": "0.1.52",
-            "resolved": "https://registry.npmjs.org/octagonal-wheels/-/octagonal-wheels-0.1.52.tgz",
-            "integrity": "sha512-9WJN2UveNh90Op1S07cIso1WyNrQbO/unibDLfUGnpomIcU4g6F+p8reZHW0Ed8sGzKF5qGnQp991Y9MB1TwNg==",
+            "version": "0.1.53",
+            "resolved": "https://registry.npmjs.org/octagonal-wheels/-/octagonal-wheels-0.1.53.tgz",
+            "integrity": "sha512-4NJsb96Sk6rJXhrTyjAY5GRIoWMFJsFp56b5ba9fV8/87ys2HCjMo0hior4F8k4ma72pLTJT7i6DvuihHxSsMA==",
             "license": "MIT",
             "dependencies": {
                 "idb": "^8.0.3"
@@ -11586,15 +11593,6 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "node_modules/p-cancelable": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
-            "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            }
-        },
         "node_modules/p-limit": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
@@ -12001,7 +11999,6 @@
             "integrity": "sha512-Z+7BeeqQPRRzklHsVFP4KTGIyMxKUmfeRA4WisM6G3/XW6nwGeX6fX9qYaDa+CiUqpOkb2f6X3nar05R3kSuJQ==",
             "dev": true,
             "license": "Apache-2.0",
-            "peer": true,
             "dependencies": {
                 "playwright-core": "1.61.0"
             },
@@ -12058,7 +12055,6 @@
                 }
             ],
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "nanoid": "^3.3.12",
                 "picocolors": "^1.1.1",
@@ -12582,9 +12578,9 @@
             }
         },
         "node_modules/pvutils": {
-            "version": "1.1.5",
-            "resolved": "https://registry.npmjs.org/pvutils/-/pvutils-1.1.5.tgz",
-            "integrity": "sha512-KTqnxsgGiQ6ZAzZCVlJH5eOjSnvlyEgx1m8bkRJfOhmGRqfo5KLvmAlACQkrjEtOQ4B7wF9TdSLIs9O90MX9xA==",
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/pvutils/-/pvutils-1.2.0.tgz",
+            "integrity": "sha512-BbubeCEyTuQjVMakvJQ/Sxbc93F2pwmbsxONT/ZRrwU7Ua38d8unYTwXpTVLAKJ4BDuH9IGztCjQcd/N/39Dvg==",
             "license": "MIT",
             "engines": {
                 "node": ">=16.0.0"
@@ -12958,11 +12954,6 @@
                 "queue-microtask": "^1.2.2"
             }
         },
-        "node_modules/rx.mini": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/rx.mini/-/rx.mini-1.4.0.tgz",
-            "integrity": "sha512-8w5cSc1mwNja7fl465DXOkVvIOkpvh2GW4jo31nAIvX4WTXCsRnKJGUfiDBzWtYRInEcHAUYIZfzusjIrea8gA=="
-        },
         "node_modules/sade": {
             "version": "1.8.1",
             "resolved": "https://registry.npmjs.org/sade/-/sade-1.8.1.tgz",
@@ -13752,7 +13743,8 @@
             "version": "4.1.3",
             "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.3.tgz",
             "integrity": "sha512-i/n8VsZydrugj3Iuzll8+x/00GH2vnYsk1eomD8QiRrSAeW6ItbCQDtfXCeJHd0iwiNagqjQkvpvREEPtW3IoQ==",
-            "license": "MIT"
+            "license": "MIT",
+            "peer": true
         },
         "node_modules/sublevel-pouchdb": {
             "version": "9.0.0",
@@ -13821,7 +13813,6 @@
             "integrity": "sha512-w7JvrM5IFl5cmfbY0TLik9o7mjRUJmRMhOR51tBPu708Gr/MjbGs7VnJnr/B0CaXeI4vtnOh7RKxDr0cwhMdDA==",
             "devOptional": true,
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "@jridgewell/remapping": "^2.3.4",
                 "@jridgewell/sourcemap-codec": "^1.5.0",
@@ -13887,6 +13878,21 @@
                 }
             }
         },
+        "node_modules/svelte-check/node_modules/picomatch": {
+            "version": "4.0.7",
+            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.7.tgz",
+            "integrity": "sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==",
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "peer": true,
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/jonschlinkert"
+            }
+        },
         "node_modules/svelte-eslint-parser": {
             "version": "1.8.0",
             "resolved": "https://registry.npmjs.org/svelte-eslint-parser/-/svelte-eslint-parser-1.8.0.tgz",
@@ -14060,7 +14066,6 @@
             "integrity": "sha512-vzCjQO/rgUuK9sf8VJZvjqiqiHFaZLnOiimmUuOKODxWL8mm/xua7viT7aqX7dgPY60otQjUotzFMmCB4VdmqQ==",
             "dev": true,
             "license": "BSD-2-Clause",
-            "peer": true,
             "dependencies": {
                 "@jridgewell/source-map": "^0.3.3",
                 "acorn": "^8.15.0",
@@ -14158,7 +14163,6 @@
             "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
             "dev": true,
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">=12"
             },
@@ -14457,7 +14461,6 @@
             "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
             "dev": true,
             "license": "Apache-2.0",
-            "peer": true,
             "bin": {
                 "tsc": "bin/tsc",
                 "tsserver": "bin/tsserver"
@@ -14525,7 +14528,6 @@
             "integrity": "sha512-PJ5vePq5/ognBbrIcoC5+SHO5dfpeLPzP9FpLkzWrguoYQEeeSjlJpVwOpo1JRSTEi7dRcwNy4h4dzV70PqHcg==",
             "dev": true,
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "@typescript-eslint/scope-manager": "8.61.1",
                 "@typescript-eslint/types": "8.61.1",
@@ -14855,7 +14857,6 @@
             "integrity": "sha512-h9bXPmJichP5fLmVQo3PyaGSDE2n3aPuomeAlVRm0JLmt4rY6zmPKd59HYI4LNW8oTK7tlTsuC7l/m7awx9Jcw==",
             "dev": true,
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "lightningcss": "^1.32.0",
                 "picomatch": "^4.0.4",
@@ -14982,7 +14983,6 @@
             "integrity": "sha512-flY6ScbCIt9HThs+C5HS7jvGOB560DJtk/Z15IQROTA6zEy49Nh8T/dofWTQL+n3vswqn87sbJNiuqw1SDp5Ig==",
             "dev": true,
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "@vitest/expect": "4.1.8",
                 "@vitest/mocker": "4.1.8",
@@ -15097,7 +15097,8 @@
             "version": "2.2.8",
             "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz",
             "integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==",
-            "license": "MIT"
+            "license": "MIT",
+            "peer": true
         },
         "node_modules/wait-port": {
             "version": "1.1.0",
@@ -15250,137 +15251,25 @@
             "link": true
         },
         "node_modules/werift": {
-            "version": "0.23.0",
-            "resolved": "https://registry.npmjs.org/werift/-/werift-0.23.0.tgz",
-            "integrity": "sha512-/WcIN5DHFG9Ri4anGOmIkp8gxBGFMWSIB/m4sfZ5CWlLfD3iMhiaAUuTBuc+KV3SY9NDmvmLtiN2uaM7k3lVzw==",
+            "version": "0.24.4",
+            "resolved": "https://registry.npmjs.org/werift/-/werift-0.24.4.tgz",
+            "integrity": "sha512-NoROZ11L/ZqAB5ombCB4VBuVNdIZfwI493zlxlIX7BlwfWRy55eDJdtWMC2VX35yBXFaWwA8NtYbmJ8qWtVk9Q==",
             "license": "MIT",
             "dependencies": {
                 "@fidm/x509": "^1.2.1",
-                "@minhducsun2002/leb128": "^1.0.0",
                 "@noble/curves": "^1.8.1",
                 "@peculiar/x509": "^1.12.3",
                 "@shinyoshiaki/binary-data": "^0.6.1",
-                "@shinyoshiaki/jspack": "^0.0.6",
-                "aes-js": "^3.1.2",
                 "buffer": "^6.0.3",
                 "debug": "4.4.0",
-                "fast-deep-equal": "^3.1.3",
-                "int64-buffer": "1.1.0",
-                "ip": "^2.0.1",
-                "mp4box": "^0.5.3",
+                "mediabunny": "^1.45.2",
                 "multicast-dns": "^7.2.5",
-                "tweetnacl": "^1.0.3",
-                "werift-common": "*",
-                "werift-dtls": "*",
-                "werift-ice": "*",
-                "werift-rtp": "*",
-                "werift-sctp": "*"
-            },
-            "engines": {
-                "node": ">=16"
-            }
-        },
-        "node_modules/werift-common": {
-            "version": "0.0.3",
-            "resolved": "https://registry.npmjs.org/werift-common/-/werift-common-0.0.3.tgz",
-            "integrity": "sha512-ma3E4BqKTyZVLhrdfTVs2T1tg9seeUtKMRn5e64LwgrogWa62+3LAUoLBUSl1yPWhgSkXId7GmcHuWDen9IJeQ==",
-            "license": "MIT",
-            "dependencies": {
-                "@shinyoshiaki/jspack": "^0.0.6",
-                "debug": "^4.4.0"
-            },
-            "engines": {
-                "node": ">=16"
-            }
-        },
-        "node_modules/werift-dtls": {
-            "version": "0.5.7",
-            "resolved": "https://registry.npmjs.org/werift-dtls/-/werift-dtls-0.5.7.tgz",
-            "integrity": "sha512-z2fjbP7fFUFmu/Ky4bCKXzdgPTtmSY1DYi0TUf3GG2zJT4jMQ3TQmGY8y7BSSNGetvL4h3pRZ5un0EcSOWpPog==",
-            "license": "MIT",
-            "dependencies": {
-                "@fidm/x509": "^1.2.1",
-                "@noble/curves": "^1.3.0",
-                "@peculiar/x509": "^1.9.2",
-                "@shinyoshiaki/binary-data": "^0.6.1",
-                "date-fns": "^2.29.3",
-                "lodash": "^4.17.21",
-                "rx.mini": "^1.2.2",
                 "tweetnacl": "^1.0.3"
             },
             "engines": {
                 "node": ">=16"
             }
         },
-        "node_modules/werift-ice": {
-            "version": "0.2.2",
-            "resolved": "https://registry.npmjs.org/werift-ice/-/werift-ice-0.2.2.tgz",
-            "integrity": "sha512-td52pHp+JmFnUn5jfDr/SSNO0dMCbknhuPdN1tFp9cfRj5jaktN63qnAdUuZC20QCC3ETWdsOthcm+RalHpFCQ==",
-            "license": "MIT",
-            "dependencies": {
-                "@shinyoshiaki/jspack": "^0.0.6",
-                "buffer-crc32": "^1.0.0",
-                "debug": "^4.3.4",
-                "int64-buffer": "^1.0.1",
-                "ip": "^2.0.1",
-                "lodash": "^4.17.21",
-                "multicast-dns": "^7.2.5",
-                "p-cancelable": "^2.1.1",
-                "rx.mini": "^1.2.2"
-            }
-        },
-        "node_modules/werift-rtp": {
-            "version": "0.8.8",
-            "resolved": "https://registry.npmjs.org/werift-rtp/-/werift-rtp-0.8.8.tgz",
-            "integrity": "sha512-GiYMSdvCyScQaw5bnEsraSoHUVZpjfokJAiLV4R1FsiB06t6XiebPYPpkqB9nYNNKiA8Z/cYWsym7wISq1sYSQ==",
-            "license": "MIT",
-            "dependencies": {
-                "@minhducsun2002/leb128": "^1.0.0",
-                "@shinyoshiaki/jspack": "^0.0.6",
-                "aes-js": "^3.1.2",
-                "buffer": "^6.0.3",
-                "mp4box": "^0.5.3"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/werift-rtp/node_modules/buffer": {
-            "version": "6.0.3",
-            "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
-            "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ],
-            "license": "MIT",
-            "dependencies": {
-                "base64-js": "^1.3.1",
-                "ieee754": "^1.2.1"
-            }
-        },
-        "node_modules/werift-sctp": {
-            "version": "0.0.11",
-            "resolved": "https://registry.npmjs.org/werift-sctp/-/werift-sctp-0.0.11.tgz",
-            "integrity": "sha512-7109yuI5U7NTEHjqjn0A8VeynytkgVaxM6lRr1Ziv0D8bPcaB8A7U/P88M7WaCpWDoELHoXiRUjQycMWStIgjQ==",
-            "license": "MIT",
-            "dependencies": {
-                "@shinyoshiaki/jspack": "^0.0.6"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
         "node_modules/werift/node_modules/buffer": {
             "version": "6.0.3",
             "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
@@ -15924,11 +15813,11 @@
         },
         "src/apps/cli": {
             "name": "self-hosted-livesync-cli",
-            "version": "1.0.11-cli",
+            "version": "1.0.18-cli",
             "dependencies": {
                 "chokidar": "^4.0.0",
                 "minimatch": "^10.2.5",
-                "octagonal-wheels": "^0.1.52",
+                "octagonal-wheels": "^0.1.53",
                 "pouchdb-adapter-http": "^9.0.0",
                 "pouchdb-adapter-leveldb": "^9.0.0",
                 "pouchdb-core": "^9.0.0",
@@ -15939,7 +15828,7 @@
                 "pouchdb-replication": "^9.0.0",
                 "pouchdb-utils": "^9.0.0",
                 "transform-pouch": "^2.0.0",
-                "werift": "^0.23.0"
+                "werift": "^0.24.4"
             },
             "devDependencies": {
                 "typescript": "5.9.3",
@@ -15949,9 +15838,9 @@
         },
         "src/apps/webapp": {
             "name": "livesync-webapp",
-            "version": "1.0.11-webapp",
+            "version": "1.0.18-webapp",
             "dependencies": {
-                "octagonal-wheels": "^0.1.52"
+                "octagonal-wheels": "^0.1.53"
             },
             "devDependencies": {
                 "@sveltejs/vite-plugin-svelte": "^7.1.2",
@@ -15961,9 +15850,9 @@
             }
         },
         "src/apps/webpeer": {
-            "version": "1.0.11-webpeer",
+            "version": "1.0.18-webpeer",
             "dependencies": {
-                "octagonal-wheels": "^0.1.52"
+                "octagonal-wheels": "^0.1.53"
             },
             "devDependencies": {
                 "@sveltejs/vite-plugin-svelte": "^7.1.2",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "obsidian-livesync",
-    "version": "1.0.11",
+    "version": "1.0.18",
     "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",
@@ -59,6 +59,7 @@
         "test:e2e:obsidian:conflict-dialog-policy": "tsx test/e2e-obsidian/scripts/conflict-dialog-policy.ts",
         "test:e2e:obsidian:revision-repair": "tsx test/e2e-obsidian/scripts/revision-repair.ts",
         "test:e2e:obsidian:document-history-nav": "tsx test/e2e-obsidian/scripts/document-history-nav.ts",
+        "test:e2e:obsidian:document-history-restore": "tsx test/e2e-obsidian/scripts/document-history-restore.ts",
         "test:e2e:obsidian:settings-ui": "tsx test/e2e-obsidian/scripts/settings-ui.ts",
         "test:e2e:obsidian:review-harness": "tsx test/e2e-obsidian/scripts/review-harness.ts",
         "test:e2e:obsidian:p2p-pane": "tsx test/e2e-obsidian/scripts/p2p-pane.ts",
@@ -177,8 +178,8 @@
         "@smithy/types": "^4.14.3",
         "@smithy/util-retry": "^4.4.5",
         "@vrtmrz/browser-ui-kit": "0.1.0",
-        "@vrtmrz/livesync-commonlib": "0.1.10",
-        "@vrtmrz/obsidian-plugin-kit": "0.1.3",
+        "@vrtmrz/livesync-commonlib": "0.1.19",
+        "@vrtmrz/obsidian-plugin-kit": "0.1.4",
         "@vrtmrz/ui-interactions": "0.1.2",
         "diff-match-patch": "^1.0.5",
         "fflate": "^0.8.2",
@@ -186,7 +187,7 @@
         "markdown-it": "^14.2.0",
         "minimatch": "^10.2.5",
         "obsidian": "^1.13.1",
-        "octagonal-wheels": "^0.1.52",
+        "octagonal-wheels": "^0.1.53",
         "qrcode-generator": "^1.4.4",
         "xxhash-wasm-102": "npm:xxhash-wasm@^1.0.2"
     },

src/apps/cli/commands/runCommand.ts

@@ -58,7 +58,11 @@ async function verifyRemoteState(
                 standardIo.writeStderr(`[Verification] Failed to connect to remote CouchDB: ${dbRet}\n`);
                 return false;
             }
-            milestone = await dbRet.db.get(MILESTONE_DOCID);
+            try {
+                milestone = await dbRet.db.get(MILESTONE_DOCID);
+            } finally {
+                await dbRet.db.close();
+            }
         } else if (settings.remoteType === REMOTE_MINIO) {
             milestone = await (replicator as LiveSyncJournalReplicator).client.downloadJson("_00000000-milestone.json");
         }

src/apps/cli/commands/runCommand.unit.spec.ts

@@ -708,6 +708,18 @@ describe("runCommand abnormal cases", () => {
     describe("mark-resolved and unlock-remote commands", () => {
         it("mark-resolved without args runs on active database", async () => {
             const core = createCoreMock();
+            const remoteDatabase = {
+                close: vi.fn(async () => undefined),
+                get: vi.fn(async () => ({
+                    locked: false,
+                    accepted_nodes: ["test-node-id"],
+                })),
+            };
+            core.services.replicator.getActiveReplicator.mockReturnValueOnce({
+                nodeid: "test-node-id",
+                initializeDatabaseForReplication: vi.fn(async () => undefined),
+                connectRemoteCouchDBWithSetting: vi.fn(async () => ({ db: remoteDatabase })),
+            });
             const result = await runCommand(makeOptions("mark-resolved", []), {
                 ...context,
                 core,
@@ -715,6 +727,7 @@ describe("runCommand abnormal cases", () => {
             expect(result).toBe(true);
             expect(core.services.replication.markResolved).toHaveBeenCalledTimes(1);
             expect(core.services.control.applySettings).not.toHaveBeenCalled();
+            expect(remoteDatabase.close).toHaveBeenCalledOnce();
         });
 
         it("mark-resolved with remote-id temporarily activates it and runs markResolved", async () => {

src/apps/cli/package.json

@@ -1,7 +1,7 @@
 {
     "name": "self-hosted-livesync-cli",
     "private": true,
-    "version": "1.0.11-cli",
+    "version": "1.0.18-cli",
     "main": "dist/index.cjs",
     "type": "module",
     "scripts": {
@@ -37,7 +37,7 @@
     "dependencies": {
         "chokidar": "^4.0.0",
         "minimatch": "^10.2.5",
-        "octagonal-wheels": "^0.1.52",
+        "octagonal-wheels": "^0.1.53",
         "pouchdb-adapter-http": "^9.0.0",
         "pouchdb-adapter-leveldb": "^9.0.0",
         "pouchdb-core": "^9.0.0",
@@ -48,7 +48,7 @@
         "pouchdb-replication": "^9.0.0",
         "pouchdb-utils": "^9.0.0",
         "transform-pouch": "^2.0.0",
-        "werift": "^0.23.0"
+        "werift": "^0.24.4"
     },
     "devDependencies": {
         "typescript": "5.9.3",

src/apps/cli/serviceModules/CLIServiceModules.ts

@@ -111,6 +111,7 @@ export function initialiseServiceModulesCLI(
         UI: services.UI,
         vault: services.vault,
         fileHandler: fileHandler,
+        fileProcessing: services.fileProcessing,
         storageAccess: storageAccess,
         control: services.control,
     });

src/apps/webapp/package.json

@@ -1,7 +1,7 @@
 {
     "name": "livesync-webapp",
     "private": true,
-    "version": "1.0.11-webapp",
+    "version": "1.0.18-webapp",
     "type": "module",
     "description": "Browser-based Self-hosted LiveSync using FileSystem API",
     "scripts": {
@@ -15,7 +15,7 @@
         "test:browser": "deno test -A --no-check --frozen --config ../../../test/browser-apps/deno.json --lock ../../../test/browser-apps/deno.lock ../../../test/browser-apps/webapp/browser-smoke.test.ts"
     },
     "dependencies": {
-        "octagonal-wheels": "^0.1.52"
+        "octagonal-wheels": "^0.1.53"
     },
     "devDependencies": {
         "@sveltejs/vite-plugin-svelte": "^7.1.2",

src/apps/webapp/serviceModules/FSAPIServiceModules.ts

@@ -102,6 +102,7 @@ export function initialiseServiceModulesFSAPI(
         UI: services.UI,
         vault: services.vault,
         fileHandler: fileHandler,
+        fileProcessing: services.fileProcessing,
         storageAccess: storageAccess,
         control: services.control,
     });

src/apps/webpeer/package.json

@@ -1,7 +1,7 @@
 {
     "name": "webpeer",
     "private": true,
-    "version": "1.0.11-webpeer",
+    "version": "1.0.18-webpeer",
     "type": "module",
     "scripts": {
         "dev": "vite",
@@ -15,7 +15,7 @@
         "test:browser": "deno test -A --no-check --frozen --config ../../../test/browser-apps/deno.json --lock ../../../test/browser-apps/deno.lock ../../../test/browser-apps/webpeer/browser-smoke.test.ts"
     },
     "dependencies": {
-        "octagonal-wheels": "^0.1.52"
+        "octagonal-wheels": "^0.1.53"
     },
     "devDependencies": {
         "eslint-plugin-svelte": "^3.19.0",

src/common/compatibilitySettings.ts

@@ -0,0 +1,32 @@
+type LegacyLocalDatabaseSelection = {
+    useIndexedDBAdapter: boolean;
+};
+
+type LegacyBulkChunkPreSendSettings = {
+    sendChunksBulk: boolean;
+    sendChunksBulkMaxSize: number;
+};
+
+/**
+ * Returns whether persisted settings select the legacy PouchDB IndexedDB adapter.
+ *
+ * New local databases use IDB. Existing devices must retain this operative value until their local database has
+ * been explicitly migrated, so compatibility code must not treat the setting as inert.
+ */
+export function usesLegacyIndexedDBAdapter(settings: LegacyLocalDatabaseSelection): boolean {
+    return settings.useIndexedDBAdapter;
+}
+
+/**
+ * Disables the removed automatic bulk chunk pre-send option in persisted settings.
+ *
+ * The field remains readable only so older settings and Setup URIs can be migrated to the supported behaviour.
+ *
+ * @returns `true` when the legacy setting was enabled and has been changed.
+ */
+export function disableLegacyBulkChunkPreSend(settings: LegacyBulkChunkPreSendSettings): boolean {
+    if (!settings.sendChunksBulk) return false;
+    settings.sendChunksBulk = false;
+    settings.sendChunksBulkMaxSize = 1;
+    return true;
+}

src/common/compatibilitySettings.unit.spec.ts

@@ -0,0 +1,22 @@
+import { describe, expect, it } from "vitest";
+import { disableLegacyBulkChunkPreSend, usesLegacyIndexedDBAdapter } from "./compatibilitySettings.ts";
+
+describe("compatibility settings", () => {
+    it.each([true, false])("preserves the operative legacy adapter selection (%s)", (useIndexedDBAdapter) => {
+        expect(usesLegacyIndexedDBAdapter({ useIndexedDBAdapter })).toBe(useIndexedDBAdapter);
+    });
+
+    it("disables automatic bulk chunk pre-send and restores its inert size value", () => {
+        const settings = { sendChunksBulk: true, sendChunksBulkMaxSize: 16 };
+
+        expect(disableLegacyBulkChunkPreSend(settings)).toBe(true);
+        expect(settings).toEqual({ sendChunksBulk: false, sendChunksBulkMaxSize: 1 });
+    });
+
+    it("leaves an already migrated bulk chunk setting unchanged", () => {
+        const settings = { sendChunksBulk: false, sendChunksBulkMaxSize: 4 };
+
+        expect(disableLegacyBulkChunkPreSend(settings)).toBe(false);
+        expect(settings).toEqual({ sendChunksBulk: false, sendChunksBulkMaxSize: 4 });
+    });
+});

src/common/events.ts

@@ -7,7 +7,6 @@ export const EVENT_FILE_SAVED = "file-saved";
 export const EVENT_LEAF_ACTIVE_CHANGED = "leaf-active-changed";
 
 export const EVENT_REQUEST_OPEN_SETTINGS = "request-open-settings";
-export const EVENT_REQUEST_OPEN_SETTING_WIZARD = "request-open-setting-wizard";
 export const EVENT_REQUEST_OPEN_SETUP_URI = "request-open-setup-uri";
 export const EVENT_REQUEST_COPY_SETUP_URI = "request-copy-setup-uri";
 export const EVENT_REQUEST_SHOW_SETUP_QR = "request-show-setup-qr";
@@ -30,7 +29,6 @@ declare global {
         [EVENT_PLUGIN_UNLOADED]: undefined;
         [EVENT_REQUEST_OPEN_PLUGIN_SYNC_DIALOG]: undefined;
         [EVENT_REQUEST_OPEN_SETTINGS]: undefined;
-        [EVENT_REQUEST_OPEN_SETTING_WIZARD]: undefined;
         [EVENT_REQUEST_RELOAD_SETTING_TAB]: undefined;
         [EVENT_LEAF_ACTIVE_CHANGED]: undefined;
         [EVENT_REQUEST_OPEN_SETUP_URI]: undefined;

src/common/messages/LiveSyncProvisionalMessages.ts

@@ -32,6 +32,20 @@ export const liveSyncProvisionalEnglishMessages = {
     "Learn more about signalling and TURN": "Learn more about signalling and TURN",
     "TURN relays the encrypted WebRTC connection only when a direct path cannot be established. A TURN provider cannot read encrypted Vault contents, but it can observe connection metadata and traffic volume. Use a provider you trust.":
         "TURN relays the encrypted WebRTC connection only when a direct path cannot be established. A TURN provider cannot read encrypted Vault contents, but it can observe connection metadata and traffic volume. Use a provider you trust.",
+    "Connection compatibility": "Connection compatibility",
+    "P2P message size": "P2P message size",
+    Standard: "Standard",
+    Reduced: "Reduced",
+    Conservative: "Conservative",
+    "Maximum compatibility": "Maximum compatibility",
+    "Smaller messages can improve compatibility on paths which fragment or drop larger WebRTC messages. This setting limits outgoing P2P messages, so use a compatible profile on each sending device when required.":
+        "Smaller messages can improve compatibility on paths which fragment or drop larger WebRTC messages. This setting limits outgoing P2P messages, so use a compatible profile on each sending device when required.",
+    "Connection path": "Connection path",
+    "TURN relay only": "TURN relay only",
+    "TURN relay only is available when at least one valid TURN server URL is configured under Advanced Settings.":
+        "TURN relay only is available when at least one valid TURN server URL is configured under Advanced Settings.",
+    "TURN relay only requires at least one valid TURN server URL. Connection path has been restored to Automatic.":
+        "TURN relay only requires at least one valid TURN server URL. Connection path has been restored to Automatic.",
     "Announce changes": "Announce changes",
     "Announce changes automatically after connecting": "Announce changes automatically after connecting",
     "When enabled, this device notifies connected peers after a local change. The notification contains no Vault data; a peer which follows this device then fetches the change through the encrypted P2P connection.":
@@ -150,9 +164,38 @@ export const liveSyncProvisionalEnglishMessages = {
         "Resolve every conflict by modification time? This logically deletes every version except the newest one and cannot recover content which is already unavailable.",
     "Resolve all conflicts by the newest version": "Resolve all conflicts by the newest version",
     "Inspect conflicts and file/database differences": "Inspect conflicts and file/database differences",
-    "Scan every Vault file and live local-database revision for conflicts, missing chunks, and differences. Each result provides actions for the exact revision.":
-        "Scan every Vault file and live local-database revision for conflicts, missing chunks, and differences. Each result provides actions for the exact revision.",
+    "Scan Vault files and local-database Metadata for conflicts, missing chunks, identity mismatches, and differences. Each result provides actions for one exact entry or revision.":
+        "Scan Vault files and local-database Metadata for conflicts, missing chunks, identity mismatches, and differences. Each result provides actions for one exact entry or revision.",
     "Begin inspection": "Begin inspection",
+    "Metadata entry requires review and was left unchanged": "Metadata entry requires review and was left unchanged",
+    "The stored document ID does not match the ID derived from its recorded path.":
+        "The stored document ID does not match the ID derived from its recorded path.",
+    "The stored document ID and recorded path are handled by different synchronisation features.":
+        "The stored document ID and recorded path are handled by different synchronisation features.",
+    "Stored document ID: ${ID}": "Stored document ID: ${ID}",
+    "Expected document ID: ${ID}": "Expected document ID: ${ID}",
+    "Source revision: ${REVISION}": "Source revision: ${REVISION}",
+    "One-step repair is unavailable because this entry is ambiguous, no longer current, or unsafe to change.":
+        "One-step repair is unavailable because this entry is ambiguous, no longer current, or unsafe to change.",
+    "An exact target is already present; repair can remove the obsolete ID.":
+        "An exact target is already present; repair can remove the obsolete ID.",
+    "Repair is available for this entry.": "Repair is available for this entry.",
+    "Repair this Metadata document ID": "Repair this Metadata document ID",
+    "Repair Metadata ID": "Repair Metadata ID",
+    "Keep unchanged": "Keep unchanged",
+    "Repair Metadata document ID": "Repair Metadata document ID",
+    "This moves one local Metadata entry to the ID derived from its recorded path.\n\n**File:** `${FILE}`  \n**Source:** `${SOURCE}@${REVISION}`  \n**Target:** `${TARGET}`\n\nThe target is verified before the source is removed. Its CouchDB revision ancestry cannot be preserved.\n\n> [!warning] Before repairing\n> - Back up this device.\n> - If file-name case or path obfuscation was intentionally changed for the whole database, use Rebuild instead.\n> - If other devices share this database, pause them, allow this device to upload the repair, then resume them one at a time.":
+        "This moves one local Metadata entry to the ID derived from its recorded path.\n\n**File:** `${FILE}`  \n**Source:** `${SOURCE}@${REVISION}`  \n**Target:** `${TARGET}`\n\nThe target is verified before the source is removed. Its CouchDB revision ancestry cannot be preserved.\n\n> [!warning] Before repairing\n> - Back up this device.\n> - If file-name case or path obfuscation was intentionally changed for the whole database, use Rebuild instead.\n> - If other devices share this database, pause them, allow this device to upload the repair, then resume them one at a time.",
+    "Metadata document ID repair and the ordinary Vault scan completed. Run this inspection again after synchronisation.":
+        "Metadata document ID repair and the ordinary Vault scan completed. Run this inspection again after synchronisation.",
+    "Metadata document ID repair completed, but the ordinary Vault scan did not run. Keep synchronisation paused, resolve the scan condition, then run 'Scan storage and database again'.":
+        "Metadata document ID repair completed, but the ordinary Vault scan did not run. Keep synchronisation paused, resolve the scan condition, then run 'Scan storage and database again'.",
+    "The inspected state changed. No repair was performed; run inspection again.":
+        "The inspected state changed. No repair was performed; run inspection again.",
+    "Repair stopped after creating the target. The source was retained. Run inspection again before retrying.":
+        "Repair stopped after creating the target. The source was retained. Run inspection again before retrying.",
+    "Repair failed before the source was removed. Run inspection again before retrying.":
+        "Repair failed before the source was removed. Run inspection again before retrying.",
     "Connection settings": "Connection settings",
     "Saved connections": "Saved connections",
 } as const;

src/common/messagesJson/de.json

@@ -112,8 +112,6 @@
     "Obsidian version": "Obsidian-Version",
     "obsidianLiveSyncSettingTab.btnApply": "Anwenden",
     "obsidianLiveSyncSettingTab.btnDisable": "Deaktivieren",
-    "obsidianLiveSyncSettingTab.btnNext": "Weiter",
-    "obsidianLiveSyncSettingTab.buttonNext": "Weiter",
     "obsidianLiveSyncSettingTab.defaultLanguage": "Standardsprache",
     "obsidianLiveSyncSettingTab.labelDisabled": "⏹️ : Deaktiviert",
     "obsidianLiveSyncSettingTab.labelEnabled": "🔁 : Aktiviert",
@@ -124,9 +122,7 @@
     "obsidianLiveSyncSettingTab.msgConfigCheckFailed": "Die Konfigurationsprüfung ist fehlgeschlagen. Trotzdem fortfahren?",
     "obsidianLiveSyncSettingTab.msgEnableEncryptionRecommendation": "Wir empfehlen, Ende-zu-Ende-Verschlüsselung und Pfadverschleierung zu aktivieren. Möchten Sie wirklich ohne Verschlüsselung fortfahren?",
     "obsidianLiveSyncSettingTab.msgFetchConfigFromRemote": "Möchten Sie die Konfiguration vom Remote-Server abrufen?",
-    "obsidianLiveSyncSettingTab.msgGenerateSetupURI": "Alles fertig! Möchten Sie eine Setup-URI erzeugen, um andere Geräte einzurichten?",
     "obsidianLiveSyncSettingTab.msgInvalidPassphrase": "Ihre Verschlüsselungs-Passphrase könnte ungültig sein. Möchten Sie wirklich fortfahren?",
-    "obsidianLiveSyncSettingTab.msgSelectAndApplyPreset": "Bitte wählen und übernehmen Sie eine beliebige Voreinstellung, um den Assistenten abzuschließen.",
     "obsidianLiveSyncSettingTab.nameDisableHiddenFileSync": "Synchronisation versteckter Dateien deaktivieren",
     "obsidianLiveSyncSettingTab.nameEnableHiddenFileSync": "Synchronisation versteckter Dateien aktivieren",
     "obsidianLiveSyncSettingTab.nameHiddenFileSynchronization": "Synchronisation versteckter Dateien",
@@ -137,7 +133,6 @@
     "obsidianLiveSyncSettingTab.optionPeriodicWithBatch": "Periodisch mit Stapelverarbeitung",
     "obsidianLiveSyncSettingTab.titleAppearance": "Darstellung",
     "obsidianLiveSyncSettingTab.titleConflictResolution": "Konfliktbehandlung",
-    "obsidianLiveSyncSettingTab.titleCongratulations": "Glückwunsch!",
     "obsidianLiveSyncSettingTab.titleCouchDB": "CouchDB-Server",
     "obsidianLiveSyncSettingTab.titleDeletionPropagation": "Weitergabe von Löschungen",
     "obsidianLiveSyncSettingTab.titleEncryptionNotEnabled": "Verschlüsselung ist nicht aktiviert",

src/common/messagesJson/en.json

@@ -478,7 +478,6 @@
     "moduleLiveSyncMain.titleScramEnabled": "Scram Enabled",
     "moduleLocalDatabase.logWaitingForReady": "Waiting for ready...",
     "moduleLog.showLog": "Show Log",
-    "moduleMigration.docUri": "https://github.com/vrtmrz/obsidian-livesync/blob/main/README.md#how-to-use",
     "moduleMigration.fix0256.buttons.checkItLater": "Check it later",
     "moduleMigration.fix0256.buttons.DismissForever": "I have fixed it, and do not ask again",
     "moduleMigration.fix0256.buttons.fix": "Fix",
@@ -500,26 +499,16 @@
     "moduleMigration.logRemoteTweakUnavailable": "Could not get remote tweak values",
     "moduleMigration.logSetupCancelled": "The setup has been cancelled, Self-hosted LiveSync waiting for your setup!",
     "moduleMigration.msgFetchRemoteAgain": "As you may already know, the self-hosted LiveSync has changed its default behaviour and database structure.\n\nAnd thankfully, with your time and efforts, the remote database appears to have already been migrated. Congratulations!\n\nHowever, we need a bit more. The configuration of this device is not compatible with the remote database. We will need to fetch the remote database again. Should we fetch from the remote again now?\n\n___Note: We cannot synchronise until the configuration has been changed and the database has been fetched again.___\n___Note2: The chunks are completely immutable, we can fetch only the metadata and difference.___",
-    "moduleMigration.msgInitialSetup": "Your device has **not been set up yet**. Let me guide you through the setup process.\n\nPlease keep in mind that every dialogue content can be copied to the clipboard. If you need to refer to it later, you can paste it into a note in Obsidian. You can also translate it into your language using a translation tool.\n\nFirst, do you have **Setup URI**?\n\nNote: If you do not know what it is, please refer to the [documentation](${URI_DOC}).",
-    "moduleMigration.msgRecommendSetupUri": "We strongly recommend that you generate a set-up URI and use it.\nIf you do not have knowledge about it, please refer to the [documentation](${URI_DOC}) (Sorry again, but it is important).\n\nHow do you want to set it up manually?",
     "moduleMigration.msgSinceV02321": "Since v0.23.21, the self-hosted LiveSync has changed the default behaviour and database structure. The following changes have been made:\n\n1. **Case sensitivity of filenames**\n   The handling of filenames is now case-insensitive. This is a beneficial change for most platforms, other than Linux and iOS, which do not manage filename case sensitivity effectively.\n   (On These, a warning will be displayed for files with the same name but different cases).\n\n2. **Revision handling of the chunks**\n   Chunks are immutable, which allows their revisions to be fixed. This change will enhance the performance of file saving.\n\n___However, to enable either of these changes, both remote and local databases need to be rebuilt. This process takes a few minutes, and we recommend doing it when you have ample time.___\n\n- If you wish to maintain the previous behaviour, you can skip this process by using `${KEEP}`.\n- If you do not have enough time, please choose `${DISMISS}`. You will be prompted again later.\n- If you have rebuilt the database on another device, please select `${DISMISS}` and try synchronizing again. Since a difference has been detected, you will be prompted again.",
     "moduleMigration.optionAdjustRemote": "Adjust to remote",
     "moduleMigration.optionDecideLater": "Decide it later",
     "moduleMigration.optionEnableBoth": "Enable both",
     "moduleMigration.optionEnableFilenameCaseInsensitive": "Enable only #1",
     "moduleMigration.optionEnableFixedRevisionForChunks": "Enable only #2",
-    "moduleMigration.optionHaveSetupUri": "Yes, I have",
     "moduleMigration.optionKeepPreviousBehaviour": "Keep previous behaviour",
-    "moduleMigration.optionManualSetup": "Set it up all manually",
     "moduleMigration.optionNoAskAgain": "No, please ask again",
-    "moduleMigration.optionNoSetupUri": "No, I do not have",
-    "moduleMigration.optionRemindNextLaunch": "Remind me at the next launch",
-    "moduleMigration.optionSetupViaP2P": "Use %{short_p2p_sync} to set up",
-    "moduleMigration.optionSetupWizard": "Take me into the setup wizard",
     "moduleMigration.optionYesFetchAgain": "Yes, fetch again",
     "moduleMigration.titleCaseSensitivity": "Case Sensitivity",
-    "moduleMigration.titleRecommendSetupUri": "Recommendation to use Setup URI",
-    "moduleMigration.titleWelcome": "Welcome to Self-hosted LiveSync",
     "moduleObsidianMenu.replicate": "Replicate",
     "More actions": "More actions",
     "Mostly Complete: Decision Required": "Mostly Complete: Decision Required",
@@ -564,12 +553,10 @@
     "obsidianLiveSyncSettingTab.btnEnable": "Enable",
     "obsidianLiveSyncSettingTab.btnFix": "Fix",
     "obsidianLiveSyncSettingTab.btnGotItAndUpdated": "I got it and updated.",
-    "obsidianLiveSyncSettingTab.btnNext": "Next",
     "obsidianLiveSyncSettingTab.btnStart": "Start",
     "obsidianLiveSyncSettingTab.btnTest": "Test",
     "obsidianLiveSyncSettingTab.btnUse": "Use",
     "obsidianLiveSyncSettingTab.buttonFetch": "Fetch",
-    "obsidianLiveSyncSettingTab.buttonNext": "Next",
     "obsidianLiveSyncSettingTab.defaultLanguage": "Default",
     "obsidianLiveSyncSettingTab.descConnectSetupURI": "This is the recommended method to set up Self-hosted LiveSync with a Setup URI.",
     "obsidianLiveSyncSettingTab.descCopySetupURI": "Perfect for setting up a new device!",
@@ -633,7 +620,6 @@
     "obsidianLiveSyncSettingTab.msgEnableCorsChttpd": "Set chttpd.enable_cors",
     "obsidianLiveSyncSettingTab.msgEnableEncryptionRecommendation": "We recommend enabling End-To-End Encryption, and Path Obfuscation. Are you sure you want to continue without encryption?",
     "obsidianLiveSyncSettingTab.msgFetchConfigFromRemote": "Do you want to fetch the config from the remote server?",
-    "obsidianLiveSyncSettingTab.msgGenerateSetupURI": "All done! Do you want to generate a setup URI to set up other devices?",
     "obsidianLiveSyncSettingTab.msgIfConfigNotPersistent": "If the server configuration is not persistent (e.g., running on docker), the values here may change. Once you are able to connect, please update the settings in the server's local.ini.",
     "obsidianLiveSyncSettingTab.msgInvalidPassphrase": "Your encryption passphrase might be invalid. Are you sure you want to continue?",
     "obsidianLiveSyncSettingTab.msgNewVersionNote": "Here due to an upgrade notification? Please review the version history. If you're satisfied, click the button. A new update will prompt this again.",
@@ -643,7 +629,6 @@
     "obsidianLiveSyncSettingTab.msgObjectStorageWarning": "WARNING: This feature is a Work In Progress, so please keep in mind the following:\n- Append only architecture. A rebuild is required to shrink the storage.\n- A bit fragile.\n- When first syncing, all history will be transferred from the remote. Be mindful of data caps and slow speeds.\n- Only differences are synced live.\n\nIf you run into any issues, or have ideas about this feature, please create a issue on GitHub.\nI appreciate you for your great dedication.",
     "obsidianLiveSyncSettingTab.msgOriginCheck": "Origin check: ${org}",
     "obsidianLiveSyncSettingTab.msgRebuildRequired": "Rebuilding Databases are required to apply the changes.. Please select the method to apply the changes.\n\n<details>\n<summary>Legends</summary>\n\n| Symbol | Meaning |\n|: ------ :| ------- |\n| ⇔ | Up to Date |\n| ⇄ | Synchronise to balance |\n| ⇐,⇒ | Transfer to overwrite |\n| ⇠,⇢ | Transfer to overwrite from other side |\n\n</details>\n\n## ${OPTION_REBUILD_BOTH}\nAt a glance:  📄 ⇒¹ 💻 ⇒² 🛰️ ⇢ⁿ 💻 ⇄ⁿ⁺¹ 📄\nReconstruct both the local and remote databases using existing files from this device.\nThis causes a lockout other devices, and they need to perform fetching.\n## ${OPTION_FETCH}\nAt a glance: 📄 ⇄² 💻 ⇐¹ 🛰️ ⇔ 💻 ⇔ 📄\nInitialise the local database and reconstruct it using data fetched from the remote database.\nThis case includes the case which you have rebuilt the remote database.\n## ${OPTION_ONLY_SETTING}\nStore only the settings. **Caution: This may lead to data corruption**; database reconstruction is generally necessary.",
-    "obsidianLiveSyncSettingTab.msgSelectAndApplyPreset": "Please select and apply any preset item to complete the wizard.",
     "obsidianLiveSyncSettingTab.msgSetCorsCredentials": "Set cors.credentials",
     "obsidianLiveSyncSettingTab.msgSetCorsOrigins": "Set cors.origins",
     "obsidianLiveSyncSettingTab.msgSetMaxDocSize": "Set couchdb.max_document_size",
@@ -698,19 +683,24 @@
     "obsidianLiveSyncSettingTab.panelSetup": "Setup",
     "obsidianLiveSyncSettingTab.serverVersion": "Server info: ${info}",
     "obsidianLiveSyncSettingTab.titleActiveRemoteServer": "Active Remote Server",
+    "obsidianLiveSyncSettingTab.titleAdvancedSettings": "Advanced settings",
     "obsidianLiveSyncSettingTab.titleAppearance": "Appearance",
     "obsidianLiveSyncSettingTab.titleConflictResolution": "Conflict resolution",
-    "obsidianLiveSyncSettingTab.titleCongratulations": "Congratulations!",
     "obsidianLiveSyncSettingTab.titleCouchDB": "CouchDB",
     "obsidianLiveSyncSettingTab.titleDeletionPropagation": "Deletion Propagation",
     "obsidianLiveSyncSettingTab.titleEncryptionNotEnabled": "Encryption is not enabled",
     "obsidianLiveSyncSettingTab.titleEncryptionPassphraseInvalid": "Encryption Passphrase Invalid",
     "obsidianLiveSyncSettingTab.titleExtraFeatures": "Enable extra and advanced features",
+    "obsidianLiveSyncSettingTab.titleExtraFeaturesGroup": "Extra features",
+    "obsidianLiveSyncSettingTab.titleExtraMenus": "Extra menus",
     "obsidianLiveSyncSettingTab.titleFetchConfig": "Fetch Config",
     "obsidianLiveSyncSettingTab.titleFetchConfigFromRemote": "Fetch config from remote server",
     "obsidianLiveSyncSettingTab.titleFetchSettings": "Fetch Settings",
+    "obsidianLiveSyncSettingTab.titleHelpAndInformation": "Help and information",
+    "obsidianLiveSyncSettingTab.titleHelpAndTroubleshooting": "Help and troubleshooting",
     "obsidianLiveSyncSettingTab.titleHiddenFiles": "Hidden Files",
     "obsidianLiveSyncSettingTab.titleLogging": "Logging",
+    "obsidianLiveSyncSettingTab.titleMaintenanceAndRecovery": "Maintenance and recovery",
     "obsidianLiveSyncSettingTab.titleMinioS3R2": "Minio,S3,R2",
     "obsidianLiveSyncSettingTab.titleNotification": "Notification",
     "obsidianLiveSyncSettingTab.titleOnlineTips": "Online Tips",
@@ -719,7 +709,8 @@
     "obsidianLiveSyncSettingTab.titleRemoteConfigCheckFailed": "Remote Configuration Check Failed",
     "obsidianLiveSyncSettingTab.titleRemoteServer": "Remote Server",
     "obsidianLiveSyncSettingTab.titleReset": "Reset",
-    "obsidianLiveSyncSettingTab.titleSetupOtherDevices": "To setup other devices",
+    "obsidianLiveSyncSettingTab.titleSetupOtherDevices": "Set up other devices",
+    "obsidianLiveSyncSettingTab.titleSynchronisation": "Synchronisation",
     "obsidianLiveSyncSettingTab.titleSynchronizationMethod": "Synchronization Method",
     "obsidianLiveSyncSettingTab.titleSynchronizationPreset": "Synchronization Preset",
     "obsidianLiveSyncSettingTab.titleSyncSettings": "Sync Settings",
@@ -878,7 +869,7 @@
     "Replicator.Message.InitialiseFatalError": "No replicator is available, this is the fatal error.",
     "Replicator.Message.Pending": "Some file events are pending. Replication has been cancelled.",
     "Replicator.Message.SomeModuleFailed": "Replication has been cancelled by some module failure",
-    "Replicator.Message.VersionUpFlash": "An update has been detected. Please open the Settings dialogue and check the Change Log. Replication has been cancelled.",
+    "Replicator.Message.VersionUpFlash": "Remote synchronisation is paused for compatibility review. Run the 'Review why synchronisation is paused' command for details and available actions.",
     "Requires restart of Obsidian": "Requires restart of Obsidian",
     "Requires restart of Obsidian.": "Requires restart of Obsidian.",
     "Rerun Onboarding Wizard": "Rerun Onboarding Wizard",
@@ -1330,6 +1321,28 @@
     "Ui.Settings.SyncSettings.Fetch": "Fetch",
     "Ui.Settings.SyncSettings.Merge": "Merge",
     "Ui.Settings.SyncSettings.Overwrite": "Overwrite",
+    "Ui.SetupWizard.ApplySettingsInitialisation.ApplyWithoutInitialisation": "Apply without Initialisation",
+    "Ui.SetupWizard.ApplySettingsInitialisation.Back": "Review another way to apply these settings",
+    "Ui.SetupWizard.ApplySettingsInitialisation.BypassGuidance": "Applying these settings alone can make this device incompatible with its existing synchronisation data. Use this only when you have confirmed that reconstruction is unnecessary.",
+    "Ui.SetupWizard.ApplySettingsInitialisation.BypassTitle": "Apply Settings without Initialisation?",
+    "Ui.SetupWizard.ApplySettingsInitialisation.ContinueFetch": "Continue with Fetch",
+    "Ui.SetupWizard.ApplySettingsInitialisation.FetchOption": "Reset Synchronisation on This Device",
+    "Ui.SetupWizard.ApplySettingsInitialisation.FetchOptionDesc": "After restarting, rebuild this device's local database from the current remote synchronisation data. Files in the Vault will then be reconciled with that data.",
+    "Ui.SetupWizard.ApplySettingsInitialisation.FetchOptionP2PDesc": "After restarting, select an online source device. This device's local LiveSync database will be rebuilt from that source.",
+    "Ui.SetupWizard.ApplySettingsInitialisation.Guidance": "These setting changes alter how synchronisation data is interpreted. Apply them together with an initialisation operation after restart.",
+    "Ui.SetupWizard.ApplySettingsInitialisation.KeepEditing": "Keep Editing",
+    "Ui.SetupWizard.ApplySettingsInitialisation.ProceedFetch": "Restart and Fetch Synchronisation Data",
+    "Ui.SetupWizard.ApplySettingsInitialisation.ProceedFetchP2P": "Restart and Select a Source Device",
+    "Ui.SetupWizard.ApplySettingsInitialisation.ProceedRebuild": "Restart and Overwrite Server Data",
+    "Ui.SetupWizard.ApplySettingsInitialisation.ProceedRebuildP2P": "Restart and Prepare This Device",
+    "Ui.SetupWizard.ApplySettingsInitialisation.Question": "Which existing data should be used after restart?",
+    "Ui.SetupWizard.ApplySettingsInitialisation.RebuildOption": "Overwrite Server Data with This Device's Files",
+    "Ui.SetupWizard.ApplySettingsInitialisation.RebuildOptionDesc": "Rebuild the local and remote databases from the files currently in this Vault. Other synchronising devices must reset their local synchronisation afterwards.",
+    "Ui.SetupWizard.ApplySettingsInitialisation.RebuildOptionP2P": "Prepare This Device from This Vault",
+    "Ui.SetupWizard.ApplySettingsInitialisation.RebuildOptionP2PDesc": "Rebuild this device's local LiveSync database from the files currently in this Vault. This does not overwrite another device.",
+    "Ui.SetupWizard.ApplySettingsInitialisation.RemoteVerificationGuidance": "The configured remote could not be verified with the current credentials and encryption settings. Continuing may make the Fetch fail after restart.",
+    "Ui.SetupWizard.ApplySettingsInitialisation.RemoteVerificationTitle": "Remote Synchronisation Data Could Not Be Verified",
+    "Ui.SetupWizard.ApplySettingsInitialisation.Title": "Apply Settings and Reinitialise Synchronisation",
     "Ui.SetupWizard.Common.Back": "No, please take me back",
     "Ui.SetupWizard.Common.Cancel": "Cancel",
     "Ui.SetupWizard.Common.ProceedSelectOption": "Please select an option to proceed",

src/common/messagesJson/es.json

@@ -479,7 +479,6 @@
     "moduleLiveSyncMain.titleScramEnabled": "Scram habilitado",
     "moduleLocalDatabase.logWaitingForReady": "Esperando a que la base de datos esté lista...",
     "moduleLog.showLog": "Mostrar registro",
-    "moduleMigration.docUri": "https://github.com/vrtmrz/obsidian-livesync/blob/main/README_ES.md#how-to-use",
     "moduleMigration.fix0256.buttons.checkItLater": "Comprobarlo más tarde",
     "moduleMigration.fix0256.buttons.DismissForever": "Ya lo he corregido, no volver a preguntar",
     "moduleMigration.fix0256.buttons.fix": "Corregir",
@@ -501,26 +500,16 @@
     "moduleMigration.logRemoteTweakUnavailable": "No se pudieron obtener los valores de ajuste remoto",
     "moduleMigration.logSetupCancelled": "La configuración ha sido cancelada, ¡Self-hosted LiveSync está esperando tu configuración!",
     "moduleMigration.msgFetchRemoteAgain": "Como ya sabrás, Self-hosted LiveSync ha cambiado su comportamiento predeterminado y la estructura de la base de datos.\n\nAfortunadamente, con tu tiempo y esfuerzo, la base de datos remota parece haber sido ya migrada. ¡Felicidades!\n\nSin embargo, necesitamos un poco más. La configuración de este dispositivo no es compatible con la base de datos remota. Necesitaremos volver a obtener la base de datos remota. ¿Debemos obtenerla nuevamente ahora?\n\n___Nota: No podemos sincronizar hasta que la configuración haya sido cambiada y la base de datos haya sido obtenida nuevamente.___\n___Nota2: Los fragmentos son completamente inmutables, solo podemos obtener los metadatos y diferencias.___",
-    "moduleMigration.msgInitialSetup": "Tu dispositivo **aún no ha sido configurado**. Permíteme guiarte a través del proceso de configuración.\n\nTen en cuenta que todo el contenido del diálogo se puede copiar al portapapeles. Si necesitas consultarlo más tarde, puedes pegarlo en una nota en Obsidian. También puedes traducirlo a tu idioma utilizando una herramienta de traducción.\n\nPrimero, ¿tienes **URI de configuración**?\n\nNota: Si no sabes qué es, consulta la [documentación](${URI_DOC}).",
-    "moduleMigration.msgRecommendSetupUri": "Te recomendamos encarecidamente que generes una URI de configuración y la utilices.\nSi no tienes conocimientos al respecto, consulta la [documentación](${URI_DOC}) (Lo siento de nuevo, pero es importante).\n\n¿Cómo quieres configurarlo manualmente?",
     "moduleMigration.msgSinceV02321": "Desde la versión v0.23.21, Self-hosted LiveSync ha cambiado el comportamiento predeterminado y la estructura de la base de datos. Se han realizado los siguientes cambios:\n\n1. **Sensibilidad a mayúsculas de los nombres de archivo**\n    El manejo de los nombres de archivo ahora no distingue entre mayúsculas y minúsculas. Este cambio es beneficioso para la mayoría de las plataformas, excepto Linux y iOS, que no gestionan efectivamente la sensibilidad a mayúsculas de los nombres de archivo.\n    (En estos, se mostrará una advertencia para archivos con el mismo nombre pero diferentes mayúsculas).\n\n2. **Manejo de revisiones de los fragmentos**\n    Los fragmentos son inmutables, lo que permite que sus revisiones sean fijas. Este cambio mejorará el rendimiento al guardar archivos.\n\n___Sin embargo, para habilitar cualquiera de estos cambios, es necesario reconstruir tanto las bases de datos remota como la local. Este proceso toma unos minutos, y recomendamos hacerlo cuando tengas tiempo suficiente.___\n\n- Si deseas mantener el comportamiento anterior, puedes omitir este proceso usando `${KEEP}`.\n- Si no tienes suficiente tiempo, por favor elige `${DISMISS}`. Se te pedirá nuevamente más tarde.\n- Si has reconstruido la base de datos en otro dispositivo, selecciona `${DISMISS}` e intenta sincronizar nuevamente. Dado que se ha detectado una diferencia, se te solicitará nuevamente.",
     "moduleMigration.optionAdjustRemote": "Ajustar al remoto",
     "moduleMigration.optionDecideLater": "Decidirlo más tarde",
     "moduleMigration.optionEnableBoth": "Habilitar ambos",
     "moduleMigration.optionEnableFilenameCaseInsensitive": "Habilitar solo #1",
     "moduleMigration.optionEnableFixedRevisionForChunks": "Habilitar solo #2",
-    "moduleMigration.optionHaveSetupUri": "Sí, tengo",
     "moduleMigration.optionKeepPreviousBehaviour": "Mantener comportamiento anterior",
-    "moduleMigration.optionManualSetup": "Configurarlo todo manualmente",
     "moduleMigration.optionNoAskAgain": "No, por favor pregúntame de nuevo",
-    "moduleMigration.optionNoSetupUri": "No, no tengo",
-    "moduleMigration.optionRemindNextLaunch": "Recordármelo en el próximo inicio",
-    "moduleMigration.optionSetupViaP2P": "Usar %{short_p2p_sync} para configurarlo",
-    "moduleMigration.optionSetupWizard": "Llévame al asistente de configuración",
     "moduleMigration.optionYesFetchAgain": "Sí, obtener de nuevo",
     "moduleMigration.titleCaseSensitivity": "Distinción de mayúsculas y minúsculas",
-    "moduleMigration.titleRecommendSetupUri": "Recomendación de usar un Setup URI",
-    "moduleMigration.titleWelcome": "Bienvenido a Self-hosted LiveSync",
     "moduleObsidianMenu.replicate": "Replicar",
     "More actions": "Más acciones",
     "Mostly Complete: Decision Required": "Casi terminado: se requiere una decisión",
@@ -565,12 +554,10 @@
     "obsidianLiveSyncSettingTab.btnEnable": "Activar",
     "obsidianLiveSyncSettingTab.btnFix": "Corregir",
     "obsidianLiveSyncSettingTab.btnGotItAndUpdated": "Lo entendí y actualicé.",
-    "obsidianLiveSyncSettingTab.btnNext": "Siguiente",
     "obsidianLiveSyncSettingTab.btnStart": "Iniciar",
     "obsidianLiveSyncSettingTab.btnTest": "Probar",
     "obsidianLiveSyncSettingTab.btnUse": "Usar",
     "obsidianLiveSyncSettingTab.buttonFetch": "Obtener",
-    "obsidianLiveSyncSettingTab.buttonNext": "Siguiente",
     "obsidianLiveSyncSettingTab.defaultLanguage": "Predeterminado",
     "obsidianLiveSyncSettingTab.descConnectSetupURI": "Este es el método recomendado para configurar Self-hosted LiveSync con una URI de configuración.",
     "obsidianLiveSyncSettingTab.descCopySetupURI": "¡Perfecto para configurar un nuevo dispositivo!",
@@ -633,7 +620,6 @@
     "obsidianLiveSyncSettingTab.msgEnableCorsChttpd": "Establecer chttpd.enable_cors",
     "obsidianLiveSyncSettingTab.msgEnableEncryptionRecommendation": "Recomendamos habilitar el cifrado de extremo a extremo y la obfuscación de ruta. ¿Estás seguro de querer continuar sin cifrado?",
     "obsidianLiveSyncSettingTab.msgFetchConfigFromRemote": "¿Quieres obtener la configuración del servidor remoto?",
-    "obsidianLiveSyncSettingTab.msgGenerateSetupURI": "¡Todo listo! ¿Quieres generar un URI de configuración para configurar otros dispositivos?",
     "obsidianLiveSyncSettingTab.msgIfConfigNotPersistent": "Si la configuración del servidor no es persistente (por ejemplo, ejecutándose en docker), los valores aquí pueden cambiar. Una vez que puedas conectarte, por favor actualiza las configuraciones en el local.ini del servidor.",
     "obsidianLiveSyncSettingTab.msgInvalidPassphrase": "Tu frase de contraseña de cifrado podría ser inválida. ¿Estás seguro de querer continuar?",
     "obsidianLiveSyncSettingTab.msgNewVersionNote": "¿Aquí debido a una notificación de actualización? Por favor, revise el historial de versiones. Si está satisfecho, haga clic en el botón. Una nueva actualización volverá a mostrar esto.",
@@ -643,7 +629,6 @@
     "obsidianLiveSyncSettingTab.msgObjectStorageWarning": "ADVERTENCIA: Esta característica está en desarrollo, así que por favor ten en cuenta lo siguiente:\n- Arquitectura de solo anexado. Se requiere una reconstrucción para reducir el almacenamiento.\n- Un poco frágil.\n- Al sincronizar por primera vez, todo el historial será transferido desde el remoto. Ten en cuenta los límites de datos y las velocidades lentas.\n- Solo las diferencias se sincronizan en vivo.\n\nSi encuentras algún problema o tienes ideas sobre esta característica, por favor crea un issue en GitHub.\nAprecio mucho tu gran dedicación.",
     "obsidianLiveSyncSettingTab.msgOriginCheck": "Verificación de origen: {org}",
     "obsidianLiveSyncSettingTab.msgRebuildRequired": "Es necesario reconstruir las bases de datos para aplicar los cambios. Por favor selecciona el método para aplicar los cambios.\n\n<details>\n<summary>Legendas</summary>\n\n| Símbolo | Significado |\n|: ------ :| ------- |\n| ⇔ | Actualizado |\n| ⇄ | Sincronizar para equilibrar |\n| ⇐,⇒ | Transferir para sobrescribir |\n| ⇠,⇢ | Transferir para sobrescribir desde otro lado |\n\n</details>\n\n## ${OPTION_REBUILD_BOTH}\nA simple vista:  📄 ⇒¹ 💻 ⇒² 🛰️ ⇢ⁿ 💻 ⇄ⁿ⁺¹ 📄\nReconstruir tanto la base de datos local como la remota utilizando los archivos existentes de este dispositivo.\nEsto bloquea a otros dispositivos, y necesitan realizar la obtención.\n## ${OPTION_FETCH}\nA simple vista: 📄 ⇄² 💻 ⇐¹ 🛰️ ⇔ 💻 ⇔ 📄\nInicializa la base de datos local y la reconstruye utilizando los datos obtenidos de la base de datos remota.\nEste caso incluye el caso en el que has reconstruido la base de datos remota.\n## ${OPTION_ONLY_SETTING}\nAlmacena solo la configuración. **Precaución: esto puede provocar corrupción de datos**; generalmente es necesario reconstruir la base de datos.",
-    "obsidianLiveSyncSettingTab.msgSelectAndApplyPreset": "Por favor, selecciona y aplica cualquier elemento preestablecido para completar el asistente.",
     "obsidianLiveSyncSettingTab.msgSetCorsCredentials": "Configurar cors.credentials",
     "obsidianLiveSyncSettingTab.msgSetCorsOrigins": "Configurar cors.origins",
     "obsidianLiveSyncSettingTab.msgSetMaxDocSize": "Configurar couchdb.max_document_size",
@@ -700,7 +685,6 @@
     "obsidianLiveSyncSettingTab.titleActiveRemoteServer": "Servidor remoto activo",
     "obsidianLiveSyncSettingTab.titleAppearance": "Apariencia",
     "obsidianLiveSyncSettingTab.titleConflictResolution": "Resolución de conflictos",
-    "obsidianLiveSyncSettingTab.titleCongratulations": "¡Felicidades!",
     "obsidianLiveSyncSettingTab.titleCouchDB": "Servidor CouchDB",
     "obsidianLiveSyncSettingTab.titleDeletionPropagation": "Propagación de eliminación",
     "obsidianLiveSyncSettingTab.titleEncryptionNotEnabled": "El cifrado no está habilitado",

src/common/messagesJson/fr.json

@@ -190,7 +190,6 @@
     "moduleLiveSyncMain.titleScramEnabled": "Mode Scram activé",
     "moduleLocalDatabase.logWaitingForReady": "En attente de disponibilité...",
     "moduleLog.showLog": "Afficher le journal",
-    "moduleMigration.docUri": "https://github.com/vrtmrz/obsidian-livesync/blob/main/README.md#how-to-use",
     "moduleMigration.fix0256.buttons.checkItLater": "Vérifier plus tard",
     "moduleMigration.fix0256.buttons.DismissForever": "J'ai corrigé, et ne plus demander",
     "moduleMigration.fix0256.buttons.fix": "Corriger",
@@ -212,26 +211,16 @@
     "moduleMigration.logRemoteTweakUnavailable": "Impossible d'obtenir les valeurs d'ajustement distantes",
     "moduleMigration.logSetupCancelled": "La configuration a été annulée, Self-hosted LiveSync attend votre configuration !",
     "moduleMigration.msgFetchRemoteAgain": "Comme vous le savez peut-être déjà, Self-hosted LiveSync a modifié son comportement par défaut et la structure de sa base de données.\n\nEt, grâce à votre temps et vos efforts, la base distante semble déjà avoir été migrée. Félicitations !\n\nCependant, il faut encore un peu plus. La configuration de cet appareil n'est pas compatible avec la base distante. Nous devrons récupérer à nouveau la base distante. Devons-nous récupérer depuis le distant maintenant ?\n\n___Note : Nous ne pouvons pas synchroniser tant que la configuration n'a pas été modifiée et que la base n'a pas été récupérée à nouveau.___\n___Note 2 : Les fragments sont complètement immuables, nous ne pouvons récupérer que les métadonnées et les différences.___",
-    "moduleMigration.msgInitialSetup": "Votre appareil n'a **pas encore été configuré**. Laissez-moi vous guider dans le processus de configuration.\n\nVeuillez noter que chaque contenu de boîte de dialogue peut être copié dans le presse-papiers. Si vous souhaitez vous y référer plus tard, vous pouvez le coller dans une note d'Obsidian. Vous pouvez également le traduire dans votre langue via un outil de traduction.\n\nTout d'abord, disposez-vous d'une **URI de configuration** ?\n\nNote : Si vous ne savez pas ce que c'est, consultez la [documentation](${URI_DOC}).",
-    "moduleMigration.msgRecommendSetupUri": "Nous recommandons vivement de générer une URI de configuration et de l'utiliser.\nSi vous ne connaissez pas, veuillez consulter la [documentation](${URI_DOC}) (Désolé encore, mais c'est important).\n\nComment souhaitez-vous effectuer la configuration manuellement ?",
     "moduleMigration.msgSinceV02321": "Depuis la v0.23.21, Self-hosted LiveSync a modifié son comportement par défaut et la structure de sa base. Les changements suivants ont été effectués :\n\n1. **Sensibilité à la casse des noms de fichiers**\n   La gestion des noms de fichiers est désormais insensible à la casse. C'est un changement bénéfique pour la plupart des plateformes, hormis Linux et iOS, qui ne gèrent pas efficacement la casse des noms de fichiers.\n   (Sur celles-ci, un avertissement s'affichera pour les fichiers portant le même nom avec une casse différente).\n\n2. **Gestion des révisions des fragments**\n   Les fragments sont immuables, ce qui permet de fixer leurs révisions. Ce changement améliore les performances d'enregistrement des fichiers.\n\n___Cependant, pour activer l'un ou l'autre de ces changements, les bases locale et distante doivent être reconstruites. Ce processus prend quelques minutes, et nous recommandons de le faire quand vous avez le temps.___\n\n- Si vous souhaitez conserver le comportement précédent, vous pouvez ignorer ce processus via `${KEEP}`.\n- Si vous n'avez pas le temps, choisissez `${DISMISS}`. Vous serez invité à nouveau plus tard.\n- Si vous avez reconstruit la base sur un autre appareil, sélectionnez `${DISMISS}` et réessayez la synchronisation. Une différence étant détectée, vous serez invité à nouveau.",
     "moduleMigration.optionAdjustRemote": "Ajuster au distant",
     "moduleMigration.optionDecideLater": "Décider plus tard",
     "moduleMigration.optionEnableBoth": "Activer les deux",
     "moduleMigration.optionEnableFilenameCaseInsensitive": "Activer seulement #1",
     "moduleMigration.optionEnableFixedRevisionForChunks": "Activer seulement #2",
-    "moduleMigration.optionHaveSetupUri": "Oui, j'en ai une",
     "moduleMigration.optionKeepPreviousBehaviour": "Conserver le comportement précédent",
-    "moduleMigration.optionManualSetup": "Tout configurer manuellement",
     "moduleMigration.optionNoAskAgain": "Non, demandez à nouveau",
-    "moduleMigration.optionNoSetupUri": "Non, je n'en ai pas",
-    "moduleMigration.optionRemindNextLaunch": "Me rappeler au prochain lancement",
-    "moduleMigration.optionSetupViaP2P": "Utiliser %{short_p2p_sync} pour configurer",
-    "moduleMigration.optionSetupWizard": "Ouvrir l'assistant de configuration",
     "moduleMigration.optionYesFetchAgain": "Oui, récupérer à nouveau",
     "moduleMigration.titleCaseSensitivity": "Sensibilité à la casse",
-    "moduleMigration.titleRecommendSetupUri": "Recommandation d'utilisation de l'URI de configuration",
-    "moduleMigration.titleWelcome": "Bienvenue dans Self-hosted LiveSync",
     "moduleObsidianMenu.replicate": "Répliquer",
     "Move remotely deleted files to the trash, instead of deleting.": "Déplacer les fichiers supprimés à distance vers la corbeille, au lieu de les supprimer.",
     "Not all messages have been translated. And, please revert to \"Default\" when reporting errors.": "Tous les messages n'ont pas été traduits. Et veuillez revenir à « Par défaut » lorsque vous signalez des erreurs.",
@@ -249,12 +238,10 @@
     "obsidianLiveSyncSettingTab.btnEnable": "Activer",
     "obsidianLiveSyncSettingTab.btnFix": "Corriger",
     "obsidianLiveSyncSettingTab.btnGotItAndUpdated": "J'ai compris et mis à jour.",
-    "obsidianLiveSyncSettingTab.btnNext": "Suivant",
     "obsidianLiveSyncSettingTab.btnStart": "Démarrer",
     "obsidianLiveSyncSettingTab.btnTest": "Tester",
     "obsidianLiveSyncSettingTab.btnUse": "Utiliser",
     "obsidianLiveSyncSettingTab.buttonFetch": "Récupérer",
-    "obsidianLiveSyncSettingTab.buttonNext": "Suivant",
     "obsidianLiveSyncSettingTab.defaultLanguage": "Par défaut",
     "obsidianLiveSyncSettingTab.descConnectSetupURI": "Méthode recommandée pour configurer Self-hosted LiveSync avec une URI de configuration.",
     "obsidianLiveSyncSettingTab.descCopySetupURI": "Parfait pour configurer un nouvel appareil !",
@@ -317,7 +304,6 @@
     "obsidianLiveSyncSettingTab.msgEnableCorsChttpd": "Définir chttpd.enable_cors",
     "obsidianLiveSyncSettingTab.msgEnableEncryptionRecommendation": "Nous recommandons d'activer le chiffrement de bout en bout et l'obfuscation des chemins. Êtes-vous sûr de vouloir continuer sans chiffrement ?",
     "obsidianLiveSyncSettingTab.msgFetchConfigFromRemote": "Voulez-vous récupérer la configuration depuis le serveur distant ?",
-    "obsidianLiveSyncSettingTab.msgGenerateSetupURI": "Tout est prêt ! Voulez-vous générer une URI de configuration pour configurer d'autres appareils ?",
     "obsidianLiveSyncSettingTab.msgIfConfigNotPersistent": "Si la configuration du serveur n'est pas persistante (par ex. fonctionnant sur Docker), les valeurs peuvent changer. Une fois la connexion établie, mettez à jour les paramètres dans le local.ini du serveur.",
     "obsidianLiveSyncSettingTab.msgInvalidPassphrase": "Votre phrase secrète de chiffrement peut être invalide. Êtes-vous sûr de vouloir continuer ?",
     "obsidianLiveSyncSettingTab.msgNewVersionNote": "Arrivé ici suite à une notification de mise à jour ? Consultez l'historique des versions. Si vous êtes satisfait, cliquez sur le bouton. Une nouvelle mise à jour reproposera ceci.",
@@ -327,7 +313,6 @@
     "obsidianLiveSyncSettingTab.msgObjectStorageWarning": "AVERTISSEMENT : cette fonctionnalité est en cours de développement, gardez à l'esprit ce qui suit :\n- Architecture en ajout seul. Une reconstruction est nécessaire pour réduire le stockage.\n- Un peu fragile.\n- Lors de la première synchronisation, tout l'historique sera transféré depuis le distant. Attention aux limites de données et aux débits lents.\n- Seules les différences sont synchronisées en direct.\n\nSi vous rencontrez des problèmes ou avez des idées sur cette fonctionnalité, merci d'ouvrir un ticket sur GitHub.\nMerci pour votre grand dévouement.",
     "obsidianLiveSyncSettingTab.msgOriginCheck": "Vérification d'origine : ${org}",
     "obsidianLiveSyncSettingTab.msgRebuildRequired": "La reconstruction des bases de données est nécessaire pour appliquer les changements. Veuillez sélectionner la méthode d'application.\n\n<details>\n<summary>Légende</summary>\n\n| Symbole | Signification |\n|: ------ :| ------- |\n| ⇔ | À jour |\n| ⇄ | Synchroniser pour équilibrer |\n| ⇐,⇒ | Transférer pour écraser |\n| ⇠,⇢ | Transférer pour écraser depuis l'autre côté |\n\n</details>\n\n## ${OPTION_REBUILD_BOTH}\nEn bref :  📄 ⇒¹ 💻 ⇒² 🛰️ ⇢ⁿ 💻 ⇄ⁿ⁺¹ 📄\nReconstruit les bases locale et distante à partir des fichiers existants de cet appareil.\nCeci provoque un verrouillage des autres appareils, qui devront effectuer une récupération.\n## ${OPTION_FETCH}\nEn bref : 📄 ⇄² 💻 ⇐¹ 🛰️ ⇔ 💻 ⇔ 📄\nInitialise la base locale et la reconstruit à partir des données récupérées depuis la base distante.\nCe cas inclut également celui où vous avez reconstruit la base distante.\n## ${OPTION_ONLY_SETTING}\nNe stocker que les paramètres. **Attention : cela peut entraîner une corruption des données** ; une reconstruction de la base est généralement nécessaire.",
-    "obsidianLiveSyncSettingTab.msgSelectAndApplyPreset": "Veuillez sélectionner et appliquer un préréglage pour terminer l'assistant.",
     "obsidianLiveSyncSettingTab.msgSetCorsCredentials": "Définir cors.credentials",
     "obsidianLiveSyncSettingTab.msgSetCorsOrigins": "Définir cors.origins",
     "obsidianLiveSyncSettingTab.msgSetMaxDocSize": "Définir couchdb.max_document_size",
@@ -384,7 +369,6 @@
     "obsidianLiveSyncSettingTab.titleActiveRemoteServer": "Serveur distant actif",
     "obsidianLiveSyncSettingTab.titleAppearance": "Apparence",
     "obsidianLiveSyncSettingTab.titleConflictResolution": "Résolution des conflits",
-    "obsidianLiveSyncSettingTab.titleCongratulations": "Félicitations !",
     "obsidianLiveSyncSettingTab.titleCouchDB": "CouchDB",
     "obsidianLiveSyncSettingTab.titleDeletionPropagation": "Propagation des suppressions",
     "obsidianLiveSyncSettingTab.titleEncryptionNotEnabled": "Le chiffrement n'est pas activé",

src/common/messagesJson/he.json

@@ -191,7 +191,6 @@
     "moduleLiveSyncMain.titleScramEnabled": "מצב בלימה פעיל",
     "moduleLocalDatabase.logWaitingForReady": "ממתין לכשירות...",
     "moduleLog.showLog": "הצג יומן",
-    "moduleMigration.docUri": "https://github.com/vrtmrz/obsidian-livesync/blob/main/README.md#how-to-use",
     "moduleMigration.fix0256.buttons.checkItLater": "בדוק מאוחר יותר",
     "moduleMigration.fix0256.buttons.DismissForever": "תיקנתי, ואל תשאל שוב",
     "moduleMigration.fix0256.buttons.fix": "תקן",
@@ -213,26 +212,16 @@
     "moduleMigration.logRemoteTweakUnavailable": "לא ניתן לקבל ערכי כיוונון מרוחקים",
     "moduleMigration.logSetupCancelled": "ההגדרה בוטלה, Self-hosted LiveSync ממתין להגדרתך!",
     "moduleMigration.msgFetchRemoteAgain": "כפי שייתכן שכבר ידוע לך, Self-hosted LiveSync שינה את התנהגות ברירת המחדל ומבנה מסד הנתונים.\n\nובזכות זמנך ומאמציך, מסד הנתונים המרוחד נראה כבר הוגר. ברכות!\n\nעם זאת, נדרש עוד קצת. תצורת מכשיר זה אינה תואמת למסד הנתונים המרוחד. נצטרך למשוך את מסד הנתונים המרוחד שוב. האם למשוך מהשרת המרוחד עכשיו?\n\n___הערה: לא ניתן לסנכרן עד שהתצורה תשתנה ומסד הנתונים יימשך שוב.___\n___הערה 2: הנתחים הם בלתי-ניתנים לשינוי לחלוטין, ניתן למשוך רק את המטה-נתונים וההפרש.___",
-    "moduleMigration.msgInitialSetup": "המכשיר שלך **טרם הוגדר**. אנחנו כאן לעזור לך בתהליך ההגדרה.\n\nשים לב שניתן להעתיק את תוכן כל דיאלוג ללוח. אם צריך לחזור אליו מאוחר יותר, ניתן להדביק אותו כפתק ב-Obsidian. ניתן גם לתרגם לשפתך בעזרת כלי תרגום.\n\nראשית, האם יש לך **Setup URI**?\n\nהערה: אם אינך יודע מהו, אנא עיין ב[תיעוד](${URI_DOC}).",
-    "moduleMigration.msgRecommendSetupUri": "אנו ממליצים בחום לייצר Setup URI ולהשתמש בו.\nאם אין לך ידע בנושא, אנא עיין ב[תיעוד](${URI_DOC}) (מתנצלים שוב, אך זה חשוב).\n\nכיצד ברצונך להגדיר ידנית?",
     "moduleMigration.msgSinceV02321": "מאז גרסה 0.23.21, Self-hosted LiveSync שינה את התנהגות ברירת המחדל ומבנה מסד הנתונים. השינויים הבאים בוצעו:\n\n1. **תלות רישיות בשמות קבצים**\n   הטיפול בשמות קבצים הוא כעת ללא תלות רישיות. זהו שינוי מועיל לרוב הפלטפורמות,\n   פרט ל-Linux ו-iOS שאינן מנהלות תלות רישיות בקבצים ביעילות.\n   (בפלטפורמות אלה, תוצג אזהרה עבור קבצים עם אותו שם אך רישיות שונה).\n\n2. **טיפול בגרסאות של נתחים**\n   נתחים הם בלתי-ניתנים לשינוי, מה שמאפשר גרסאות קבועות. שינוי זה ישפר את\n   ביצועי שמירת הקבצים.\n\n___עם זאת, כדי להפעיל אחד מהשינויים הללו, יש לבנות מחדש גם את מסד הנתונים המרוחד וגם את המקומי. תהליך זה לוקח כמה דקות, ואנו ממליצים לעשות זאת כשיש לך זמן פנוי.___\n\n- אם ברצונך לשמור את ההתנהגות הקודמת, ניתן לדלג על תהליך זה באמצעות `${KEEP}`.\n- אם אין לך מספיק זמן, אנא בחר `${DISMISS}`. תקבל תזכורת בהמשך.\n- אם בנית מחדש את מסד הנתונים במכשיר אחר, אנא בחר `${DISMISS}` ונסה לסנכרן שוב. מאחר שזוהה הפרש, תקבל תזכורת שוב.",
     "moduleMigration.optionAdjustRemote": "התאם לשרת המרוחד",
     "moduleMigration.optionDecideLater": "החלט מאוחר יותר",
     "moduleMigration.optionEnableBoth": "הפעל את שניהם",
     "moduleMigration.optionEnableFilenameCaseInsensitive": "הפעל רק #1",
     "moduleMigration.optionEnableFixedRevisionForChunks": "הפעל רק #2",
-    "moduleMigration.optionHaveSetupUri": "כן, יש לי",
     "moduleMigration.optionKeepPreviousBehaviour": "שמור על התנהגות קודמת",
-    "moduleMigration.optionManualSetup": "הגדר הכל ידנית",
     "moduleMigration.optionNoAskAgain": "לא, אנא שאל שוב",
-    "moduleMigration.optionNoSetupUri": "לא, אין לי",
-    "moduleMigration.optionRemindNextLaunch": "הזכר לי בהפעלה הבאה",
-    "moduleMigration.optionSetupViaP2P": "השתמש ב-%{short_p2p_sync} להגדרה",
-    "moduleMigration.optionSetupWizard": "קח אותי לאשף ההגדרה",
     "moduleMigration.optionYesFetchAgain": "כן, משוך שוב",
     "moduleMigration.titleCaseSensitivity": "תלות רישיות",
-    "moduleMigration.titleRecommendSetupUri": "המלצה לשימוש ב-Setup URI",
-    "moduleMigration.titleWelcome": "ברוך הבא ל-Self-hosted LiveSync",
     "moduleObsidianMenu.replicate": "שכפל",
     "Move remotely deleted files to the trash, instead of deleting.": "העבר קבצים שנמחקו מרחוק לאשפה, במקום למחוק.",
     "Not all messages have been translated. And, please revert to \"Default\" when reporting errors.": "לא כל ההודעות תורגמו. בנוסף, אנא חזור ל\"ברירת מחדל\" בעת דיווח על שגיאות.",
@@ -250,12 +239,10 @@
     "obsidianLiveSyncSettingTab.btnEnable": "הפעל",
     "obsidianLiveSyncSettingTab.btnFix": "תקן",
     "obsidianLiveSyncSettingTab.btnGotItAndUpdated": "הבנתי ועדכנתי.",
-    "obsidianLiveSyncSettingTab.btnNext": "הבא",
     "obsidianLiveSyncSettingTab.btnStart": "התחל",
     "obsidianLiveSyncSettingTab.btnTest": "בדוק",
     "obsidianLiveSyncSettingTab.btnUse": "השתמש",
     "obsidianLiveSyncSettingTab.buttonFetch": "משוך",
-    "obsidianLiveSyncSettingTab.buttonNext": "הבא",
     "obsidianLiveSyncSettingTab.defaultLanguage": "ברירת מחדל",
     "obsidianLiveSyncSettingTab.descConnectSetupURI": "זוהי השיטה המומלצת להגדרת Self-hosted LiveSync עם Setup URI.",
     "obsidianLiveSyncSettingTab.descCopySetupURI": "מושלם להגדרת מכשיר חדש!",
@@ -318,7 +305,6 @@
     "obsidianLiveSyncSettingTab.msgEnableCorsChttpd": "הגדר chttpd.enable_cors",
     "obsidianLiveSyncSettingTab.msgEnableEncryptionRecommendation": "אנו ממליצים להפעיל הצפנה מקצה לקצה ואת ערפול הנתיב. האם אתה בטוח שברצונך להמשיך ללא הצפנה?",
     "obsidianLiveSyncSettingTab.msgFetchConfigFromRemote": "האם ברצונך למשוך את התצורה מהשרת המרוחד?",
-    "obsidianLiveSyncSettingTab.msgGenerateSetupURI": "הכל מוכן! האם ברצונך לייצר Setup URI להגדרת מכשירים אחרים?",
     "obsidianLiveSyncSettingTab.msgIfConfigNotPersistent": "אם תצורת השרת אינה קבועה (למשל, פועלת ב-docker), הערכים כאן עשויים להשתנות. לאחר שתצליח להתחבר, אנא עדכן את ההגדרות ב-local.ini של השרת.",
     "obsidianLiveSyncSettingTab.msgInvalidPassphrase": "ביטוי הסיסמה להצפנה שלך עשוי להיות לא תקין. האם אתה בטוח שברצונך להמשיך?",
     "obsidianLiveSyncSettingTab.msgNewVersionNote": "הגעת כאן בשל הודעת שדרוג? אנא עיין בהיסטוריית הגרסאות. אם אתה מרוצה, לחץ על הכפתור. עדכון חדש יציג זאת שוב.",
@@ -328,7 +314,6 @@
     "obsidianLiveSyncSettingTab.msgObjectStorageWarning": "אזהרה: תכונה זו בשלב פיתוח, לכן שים לב לנקודות הבאות:\n- ארכיטקטורת הוספה בלבד. נדרשת בנייה מחדש לצמצום האחסון.\n- קצת רגיש.\n- בסנכרון הראשון, כל ההיסטוריה תועבר מהשרת המרוחד. שים לב למגבלות נתונים ומהירות.\n- רק הפרשים מסונכרנים בזמן אמת.\n\nאם נתקלת בבעיות, או שיש לך רעיונות לגבי תכונה זו, אנא פתח Issue ב-GitHub.\nאנחנו מעריכים את ההקדשה הגדולה שלך.",
     "obsidianLiveSyncSettingTab.msgOriginCheck": "בדיקת מקור: ${org}",
     "obsidianLiveSyncSettingTab.msgRebuildRequired": "נדרשת בנייה מחדש של מסדי הנתונים כדי להחיל את השינויים. אנא בחר את השיטה.\n\n<details>\n<summary>מקרא</summary>\n\n| סמל | משמעות |\n|: ------ :| ------- |\n| ⇔ | מעודכן |\n| ⇄ | סנכרן לאיזון |\n| ⇐,⇒ | העבר לדריסה |\n| ⇠,⇢ | העבר לדריסה מהצד השני |\n\n</details>\n\n## ${OPTION_REBUILD_BOTH}\nבמבט: 📄 ⇒¹ 💻 ⇒² 🛰️ ⇢ⁿ 💻 ⇄ⁿ⁺¹ 📄\nבנה מחדש גם את מסד הנתונים המקומי וגם המרוחד תוך שימוש בקבצים קיימים ממכשיר זה.\nפעולה זו תנעל מכשירים אחרים שיצטרכו לבצע משיכה.\n## ${OPTION_FETCH}\nבמבט: 📄 ⇄² 💻 ⇐¹ 🛰️ ⇔ 💻 ⇔ 📄\nאתחל את מסד הנתונים המקומי ובנה אותו מחדש תוך שימוש בנתונים שנמשכו ממסד הנתונים המרוחד.\nכולל את המקרה שבו בנית מחדש את מסד הנתונים המרוחד.\n## ${OPTION_ONLY_SETTING}\nשמור רק את ההגדרות. **זהירות: עלול לגרום לפגיעה בנתונים**; בנייה מחדש של מסד הנתונים נדרשת בדרך כלל.",
-    "obsidianLiveSyncSettingTab.msgSelectAndApplyPreset": "אנא בחר והחל פריט קבוע מראש כלשהו להשלמת האשף.",
     "obsidianLiveSyncSettingTab.msgSetCorsCredentials": "הגדר cors.credentials",
     "obsidianLiveSyncSettingTab.msgSetCorsOrigins": "הגדר cors.origins",
     "obsidianLiveSyncSettingTab.msgSetMaxDocSize": "הגדר couchdb.max_document_size",
@@ -385,7 +370,6 @@
     "obsidianLiveSyncSettingTab.titleActiveRemoteServer": "שרת מרוחד פעיל",
     "obsidianLiveSyncSettingTab.titleAppearance": "מראה",
     "obsidianLiveSyncSettingTab.titleConflictResolution": "פתרון קונפליקטים",
-    "obsidianLiveSyncSettingTab.titleCongratulations": "מזל טוב!",
     "obsidianLiveSyncSettingTab.titleCouchDB": "CouchDB",
     "obsidianLiveSyncSettingTab.titleDeletionPropagation": "הפצת מחיקות",
     "obsidianLiveSyncSettingTab.titleEncryptionNotEnabled": "ההצפנה אינה מופעלת",

src/common/messagesJson/ja.json

@@ -291,7 +291,6 @@
     "moduleLiveSyncMain.titleScramEnabled": "緊急停止(Scram)が有効",
     "moduleLocalDatabase.logWaitingForReady": "しばらくお待ちください...",
     "moduleLog.showLog": "ログを表示",
-    "moduleMigration.docUri": "https://github.com/vrtmrz/obsidian-livesync/blob/main/README.md#how-to-use",
     "moduleMigration.fix0256.buttons.checkItLater": "後で確認する",
     "moduleMigration.fix0256.buttons.DismissForever": "修正済み、今後確認しない",
     "moduleMigration.fix0256.buttons.fix": "修正",
@@ -313,26 +312,16 @@
     "moduleMigration.logRemoteTweakUnavailable": "リモートの調整値を取得できませんでした",
     "moduleMigration.logSetupCancelled": "セットアップがキャンセルされました。Self-hosted LiveSyncはセットアップを待っています！",
     "moduleMigration.msgFetchRemoteAgain": "ご存知のとおり、self-hosted LiveSyncはデフォルトの動作とデータベース構造を変更しました。\n\nご協力のおかげで、リモートデータベースはすでに移行されているようです。おめでとうございます！\n\nしかし、もう少し必要です。このデバイスの設定はリモートデータベースと互換性がありません。リモートデータベースを再度フェッチする必要があります。今すぐリモートから再フェッチしますか？\n\n___注意: 設定が変更され、データベースが再フェッチされるまで同期できません。___\n___注意2: チャンクは完全に不変なので、メタデータと差分のみフェッチできます。___",
-    "moduleMigration.msgInitialSetup": "このデバイスは**まだセットアップされていません**。セットアッププロセスをご案内します。\n\nすべてのダイアログの内容はクリップボードにコピーできます。後で参照する必要があれば、Obsidianのノートに貼り付けてください。翻訳ツールを使ってお使いの言語に翻訳することもできます。\n\nまず、**セットアップURI**をお持ちですか？\n\n注意: それが何か分からない場合は、[documentation](${URI_DOC})を参照してください。",
-    "moduleMigration.msgRecommendSetupUri": "セットアップURIを生成して使用することを強くお勧めします。\nこれについて知識がない場合は、[documentation](${URI_DOC})を参照してください（重要です）。\n\n手動でセットアップしますか？",
     "moduleMigration.msgSinceV02321": "v0.23.21以降、self-hosted LiveSyncはデフォルトの動作とデータベース構造を変更しました。以下の変更が行われました：\n\n1. **ファイル名の大文字小文字の区別**\n   ファイル名の処理が大文字小文字を区別しなくなりました。これは、ファイル名の大文字小文字を効果的に管理しないLinuxとiOS以外のほとんどのプラットフォームにとって有益な変更です。\n   （これらの環境では、同じ名前で大文字小文字が異なるファイルに対して警告が表示されます）。\n\n2. **チャンクのリビジョン処理**\n   チャンクは不変であり、リビジョンを固定できます。この変更により、ファイル保存のパフォーマンスが向上します。\n\n___しかし、これらの変更を有効にするには、リモートとローカルの両方のデータベースを再構築する必要があります。このプロセスは数分かかります。時間に余裕があるときに行うことをお勧めします。___\n\n- 以前の動作を維持したい場合は、`${KEEP}`を使用してこのプロセスをスキップできます。\n- 時間がない場合は、`${DISMISS}`を選択してください。後で再度確認されます。\n- 別のデバイスでデータベースを再構築した場合は、`${DISMISS}`を選択して再度同期してみてください。差異が検出されたため、再度確認されます。",
     "moduleMigration.optionAdjustRemote": "リモートに合わせる",
     "moduleMigration.optionDecideLater": "後で決める",
     "moduleMigration.optionEnableBoth": "両方を有効にする",
     "moduleMigration.optionEnableFilenameCaseInsensitive": "#1のみ有効にする",
     "moduleMigration.optionEnableFixedRevisionForChunks": "#2のみ有効にする",
-    "moduleMigration.optionHaveSetupUri": "はい、持っています",
     "moduleMigration.optionKeepPreviousBehaviour": "以前の動作を維持",
-    "moduleMigration.optionManualSetup": "すべて手動でセットアップ",
     "moduleMigration.optionNoAskAgain": "いいえ、後で確認する",
-    "moduleMigration.optionNoSetupUri": "いいえ、持っていません",
-    "moduleMigration.optionRemindNextLaunch": "次回起動時にリマインド",
-    "moduleMigration.optionSetupViaP2P": "%{short_p2p_sync}を使ってセットアップ",
-    "moduleMigration.optionSetupWizard": "セットアップウィザードへ",
     "moduleMigration.optionYesFetchAgain": "はい、再フェッチする",
     "moduleMigration.titleCaseSensitivity": "大文字小文字の区別",
-    "moduleMigration.titleRecommendSetupUri": "セットアップURIの使用を推奨",
-    "moduleMigration.titleWelcome": "Self-hosted LiveSyncへようこそ",
     "moduleObsidianMenu.replicate": "レプリケート",
     "More actions": "その他の操作",
     "Move remotely deleted files to the trash, instead of deleting.": "リモートで削除されたファイルを削除せずにゴミ箱に移動する。",
@@ -361,12 +350,10 @@
     "obsidianLiveSyncSettingTab.btnEnable": "有効化",
     "obsidianLiveSyncSettingTab.btnFix": "修正",
     "obsidianLiveSyncSettingTab.btnGotItAndUpdated": "理解しました、更新しました。",
-    "obsidianLiveSyncSettingTab.btnNext": "次へ",
     "obsidianLiveSyncSettingTab.btnStart": "開始",
     "obsidianLiveSyncSettingTab.btnTest": "テスト",
     "obsidianLiveSyncSettingTab.btnUse": "使用",
     "obsidianLiveSyncSettingTab.buttonFetch": "フェッチ",
-    "obsidianLiveSyncSettingTab.buttonNext": "次へ",
     "obsidianLiveSyncSettingTab.defaultLanguage": "デフォルト",
     "obsidianLiveSyncSettingTab.descConnectSetupURI": "セットアップURIを使用してSelf-hosted LiveSyncをセットアップする推奨方法です。",
     "obsidianLiveSyncSettingTab.descCopySetupURI": "新しいデバイスのセットアップにおすすめ！",
@@ -429,7 +416,6 @@
     "obsidianLiveSyncSettingTab.msgEnableCorsChttpd": "chttpd.enable_corsを設定",
     "obsidianLiveSyncSettingTab.msgEnableEncryptionRecommendation": "エンドツーエンド暗号化とパス難読化を有効にすることをお勧めします。暗号化なしで続行してもよろしいですか？",
     "obsidianLiveSyncSettingTab.msgFetchConfigFromRemote": "リモートサーバーから設定を取得しますか？",
-    "obsidianLiveSyncSettingTab.msgGenerateSetupURI": "完了！他のデバイスをセットアップするためのセットアップURIを生成しますか？",
     "obsidianLiveSyncSettingTab.msgIfConfigNotPersistent": "サーバー設定が永続的でない場合（例: Dockerで実行中）、ここの値は変更される可能性があります。接続できるようになったら、サーバーのlocal.iniの設定を更新してください。",
     "obsidianLiveSyncSettingTab.msgInvalidPassphrase": "暗号化パスフレーズが無効かもしれません。続行してもよろしいですか？",
     "obsidianLiveSyncSettingTab.msgNewVersionNote": "アップグレード通知でここに来ましたか？バージョン履歴を確認してください。納得したらボタンをクリックしてください。新しい更新があると再度確認されます。",
@@ -439,7 +425,6 @@
     "obsidianLiveSyncSettingTab.msgObjectStorageWarning": "警告: この機能は開発中です。以下の点にご注意ください：\n- 追記専用アーキテクチャ。ストレージを縮小するには再構築が必要です。\n- やや不安定です。\n- 初回同期時、すべての履歴がリモートから転送されます。データ制限と速度に注意してください。\n- ライブ同期は差分のみです。\n\n問題があれば、またはこの機能についてアイデアがあれば、GitHubにIssueを作成してください。\nご協力に感謝します。",
     "obsidianLiveSyncSettingTab.msgOriginCheck": "オリジン確認: ${org}",
     "obsidianLiveSyncSettingTab.msgRebuildRequired": "変更を適用するにはデータベースの再構築が必要です。変更を適用する方法を選択してください。\n\n<details>\n<summary>凡例</summary>\n\n| 記号 | 意味 |\n|: ------ :| ------- |\n| ⇔ | 最新 |\n| ⇄ | 同期してバランスを取る |\n| ⇐,⇒ | 上書きするため転送 |\n| ⇠,⇢ | 反対側から上書きするため転送 |\n\n</details>\n\n## ${OPTION_REBUILD_BOTH}\n概要: 📄 ⇒¹ 💻 ⇒² 🛰️ ⇢ⁿ 💻 ⇄ⁿ⁺¹ 📄\nこのデバイスの既存ファイルを使用してローカルとリモートの両方のデータベースを再構築します。\n他のデバイスはロックアウトされ、フェッチが必要です。\n## ${OPTION_FETCH}\n概要: 📄 ⇄² 💻 ⇐¹ 🛰️ ⇔ 💻 ⇔ 📄\nローカルデータベースを初期化し、リモートデータベースから取得したデータを使用して再構築します。\nリモートデータベースを再構築した場合も含まれます。\n## ${OPTION_ONLY_SETTING}\n設定のみを保存します。**注意: データ破損につながる可能性があります**。通常、データベースの再構築が必要です。",
-    "obsidianLiveSyncSettingTab.msgSelectAndApplyPreset": "ウィザードを完了するには、プリセット項目を選択して適用してください。",
     "obsidianLiveSyncSettingTab.msgSetCorsCredentials": "cors.credentialsを設定",
     "obsidianLiveSyncSettingTab.msgSetCorsOrigins": "cors.originsを設定",
     "obsidianLiveSyncSettingTab.msgSetMaxDocSize": "couchdb.max_document_sizeを設定",
@@ -496,7 +481,6 @@
     "obsidianLiveSyncSettingTab.titleActiveRemoteServer": "アクティブなリモートサーバー",
     "obsidianLiveSyncSettingTab.titleAppearance": "外観",
     "obsidianLiveSyncSettingTab.titleConflictResolution": "競合解決",
-    "obsidianLiveSyncSettingTab.titleCongratulations": "おめでとうございます！",
     "obsidianLiveSyncSettingTab.titleCouchDB": "CouchDB サーバー",
     "obsidianLiveSyncSettingTab.titleDeletionPropagation": "削除の伝播",
     "obsidianLiveSyncSettingTab.titleEncryptionNotEnabled": "暗号化が有効になっていません",

src/common/messagesJson/ko.json

@@ -478,7 +478,6 @@
     "moduleLiveSyncMain.titleScramEnabled": "긴급 정지 활성화됨",
     "moduleLocalDatabase.logWaitingForReady": "준비 대기 중...",
     "moduleLog.showLog": "로그 표시",
-    "moduleMigration.docUri": "https://github.com/vrtmrz/obsidian-livesync/blob/main/README.md#how-to-use",
     "moduleMigration.fix0256.buttons.checkItLater": "나중에 확인",
     "moduleMigration.fix0256.buttons.DismissForever": "이미 해결했으니 다시 묻지 않기",
     "moduleMigration.fix0256.buttons.fix": "수정",
@@ -500,26 +499,16 @@
     "moduleMigration.logRemoteTweakUnavailable": "원격 조정 값을 가져올 수 없습니다",
     "moduleMigration.logSetupCancelled": "설정이 취소되었습니다. Self-hosted LiveSync가 설정을 기다리고 있습니다!",
     "moduleMigration.msgFetchRemoteAgain": "이미 알고 계시겠지만, Self-hosted LiveSync의 기본 동작 방식과 데이터베이스 구조가 변경되었습니다.\n\n다행히도 여러분의 노력 덕분에 원격 데이터베이스는 이미 성공적으로 데이터 구조 전환이 완료된 것으로 보입니다. 축하드립니다!\n\n하지만 아직 일부 추가 작업이 필요합니다. 이 기기의 설정이 원격 데이터베이스와 호환되지 않으므로, 원격 데이터를 다시 가져와야 합니다. 지금 원격 데이터베이스를 다시 가져오시겠습니까?\n\n___참고: 설정이 변경되고 데이터베이스를 다시 불러오기 전까지는 동기화가 불가능합니다.___\n___참고2: 청크는 변경이 불가능한 구조이므로, 메타데이터와 차이점만 가져올 수 있습니다.___",
-    "moduleMigration.msgInitialSetup": "이 기기는 **아직 초기 설정이 완료되지 않았습니다**. 지금부터 설정 과정을 안내해 드리겠습니다.\n\n모든 대화 내용은 클립보드에 복사할 수 있습니다. 나중에 참고하려면 Obsidian 노트에 붙여넣거나 번역 도구를 활용해 번역하셔도 됩니다.\n\n먼저, **Setup URI**를 가지고 계신가요?\n\n참고: Setup URI가 무엇인지 잘 모르시겠다면 [문서](${URI_DOC})를 참고해 주세요.",
-    "moduleMigration.msgRecommendSetupUri": "Setup URI를 생성해 사용하는 것을 강력히 권장합니다.\nSetup URI가 무엇인지 잘 모르시겠다면 [문서](${URI_DOC})를 참고해 주세요. 중요한 내용이니 꼭 확인하시기 바랍니다.\n\n직접 수동 설정을 진행하시겠습니까?",
     "moduleMigration.msgSinceV02321": "v0.23.21부터 Self-hosted LiveSync의 기본 동작 방식과 데이터베이스 구조가 변경되었습니다. 변경 내용은 다음과 같습니다:\n\n1. **파일명의 대소문자 구분**\n   이제 파일명을 대소문자 구분 없이 처리합니다. 파일명의 대소문자를 제대로 관리하지 못하는 Linux와 iOS를 제외한 대부분의 플랫폼에서 유리한 변경입니다.\n   (해당 플랫폼에서는 이름이 같고 대소문자만 다른 파일에 대해 경고가 표시됩니다)\n\n2. **청크의 리비전 처리**\n   청크는 변경 불가능하므로 리비전을 고정할 수 있습니다. 이 변경으로 파일 저장 성능이 향상됩니다.\n\n___다만 이 변경 중 어느 하나라도 적용하려면 원격과 로컬 데이터베이스를 모두 재구축해야 합니다. 이 과정은 몇 분이 걸리므로 시간이 충분할 때 진행하시기를 권장합니다.___\n\n- 기존 동작을 유지하려면 `${KEEP}`을 선택해 이 과정을 건너뛸 수 있습니다.\n- 시간이 충분하지 않다면 `${DISMISS}`를 선택해 주세요. 나중에 다시 여쭤보겠습니다.\n- 다른 기기에서 이미 데이터베이스를 재구축했다면 `${DISMISS}`를 선택한 뒤 다시 동기화해 보세요. 차이가 감지되면 다시 안내해 드립니다.",
     "moduleMigration.optionAdjustRemote": "원격에 맞추기",
     "moduleMigration.optionDecideLater": "나중에 결정하기",
     "moduleMigration.optionEnableBoth": "둘 다 활성화",
     "moduleMigration.optionEnableFilenameCaseInsensitive": "#1만 활성화",
     "moduleMigration.optionEnableFixedRevisionForChunks": "#2만 활성화",
-    "moduleMigration.optionHaveSetupUri": "예, 있습니다",
     "moduleMigration.optionKeepPreviousBehaviour": "이전 동작 유지",
-    "moduleMigration.optionManualSetup": "모든 것을 수동으로 설정",
     "moduleMigration.optionNoAskAgain": "아니요 (나중에 다시 물어보기)",
-    "moduleMigration.optionNoSetupUri": "아니요, 없습니다",
-    "moduleMigration.optionRemindNextLaunch": "다음 시작 시 알림",
-    "moduleMigration.optionSetupViaP2P": "%{short_p2p_sync}를 사용하여 설정",
-    "moduleMigration.optionSetupWizard": "설정 마법사로 안내",
     "moduleMigration.optionYesFetchAgain": "예 (다시 가져오기)",
     "moduleMigration.titleCaseSensitivity": "대소문자 구분",
-    "moduleMigration.titleRecommendSetupUri": "Setup URI 사용 권장",
-    "moduleMigration.titleWelcome": "Self-hosted LiveSync에 오신 것을 환영합니다",
     "moduleObsidianMenu.replicate": "복제",
     "More actions": "추가 작업",
     "Mostly Complete: Decision Required": "거의 완료: 결정이 필요합니다",
@@ -564,12 +553,10 @@
     "obsidianLiveSyncSettingTab.btnEnable": "활성화",
     "obsidianLiveSyncSettingTab.btnFix": "수정",
     "obsidianLiveSyncSettingTab.btnGotItAndUpdated": "알겠습니다. 업데이트했습니다.",
-    "obsidianLiveSyncSettingTab.btnNext": "다음",
     "obsidianLiveSyncSettingTab.btnStart": "시작",
     "obsidianLiveSyncSettingTab.btnTest": "테스트",
     "obsidianLiveSyncSettingTab.btnUse": "사용",
     "obsidianLiveSyncSettingTab.buttonFetch": "가져오기",
-    "obsidianLiveSyncSettingTab.buttonNext": "다음",
     "obsidianLiveSyncSettingTab.defaultLanguage": "기본값",
     "obsidianLiveSyncSettingTab.descConnectSetupURI": "이것은 Setup URI로 Self-hosted LiveSync를 설정하는 권장 방법입니다.",
     "obsidianLiveSyncSettingTab.descCopySetupURI": "새 기기 설정에 완벽합니다!",
@@ -633,7 +620,6 @@
     "obsidianLiveSyncSettingTab.msgEnableCorsChttpd": "chttpd.enable_cors 설정",
     "obsidianLiveSyncSettingTab.msgEnableEncryptionRecommendation": "종단 간 암호화와 경로 난독화를 활성화하는 것을 권장합니다. 정말로 암호화 없이 계속하시겠습니까?",
     "obsidianLiveSyncSettingTab.msgFetchConfigFromRemote": "원격 서버에서 구성을 가져오시겠습니까?",
-    "obsidianLiveSyncSettingTab.msgGenerateSetupURI": "모든 작업이 완료되었습니다! 다른 기기를 설정하기 위해 Setup URI를 생성하시겠습니까?",
     "obsidianLiveSyncSettingTab.msgIfConfigNotPersistent": "서버 설정이 영구적으로 저장되지 않는 환경(예: Docker에서 실행 중)에서는 이곳의 값들이 변경될 수 있습니다. 연결이 가능해지면 서버의 local.ini 파일에서 설정을 수동으로 업데이트해 주세요.",
     "obsidianLiveSyncSettingTab.msgInvalidPassphrase": "암호화 패스프레이즈가 유효하지 않을 수 있습니다. 정말로 계속하시겠습니까?",
     "obsidianLiveSyncSettingTab.msgNewVersionNote": "업그레이드 알림으로 여기에 오셨나요? 버전 기록을 검토해 주세요. 만족하신다면 버튼을 클릭하세요. 새로운 업데이트 시 다시 안내됩니다.",
@@ -643,7 +629,6 @@
     "obsidianLiveSyncSettingTab.msgObjectStorageWarning": "경고: 이 기능은 아직 개발 중이므로 다음 사항을 유의해 주세요:\n- 추가 전용 구조로 동작합니다. 저장 용량을 줄이려면 재구축이 필요합니다.\n- 다소 불안정합니다.\n- 최초 동기화 시 모든 기록이 원격에서 전송됩니다. 데이터 사용량 제한과 느린 속도에 유의해 주세요.\n- 실시간 동기화는 변경분만 처리합니다.\n\n문제가 발생했거나 이 기능에 대한 아이디어가 있다면 GitHub에 이슈를 등록해 주세요.\n큰 관심에 깊이 감사드립니다.",
     "obsidianLiveSyncSettingTab.msgOriginCheck": "출처 확인: ${org}",
     "obsidianLiveSyncSettingTab.msgRebuildRequired": "변경 사항을 적용하려면 데이터베이스를 재구축해야 합니다. 변경 사항을 적용할 방법을 선택해 주세요.\n\n<details>\n<summary>범례</summary>\n\n| 기호 | 의미 |\n|: ------ :| ------- |\n| ⇔ | 최신 상태 |\n| ⇄ | 양쪽을 맞추는 동기화 |\n| ⇐,⇒ | 덮어쓰기 전송 |\n| ⇠,⇢ | 반대편에서 덮어쓰기 전송 |\n\n</details>\n\n## ${OPTION_REBUILD_BOTH}\n한눈에 보기:  📄 ⇒¹ 💻 ⇒² 🛰️ ⇢ⁿ 💻 ⇄ⁿ⁺¹ 📄\n이 기기의 기존 파일을 사용해 로컬과 원격 데이터베이스를 모두 재구축합니다.\n이 경우 다른 기기는 잠기며, 가져오기를 수행해야 합니다.\n## ${OPTION_FETCH}\n한눈에 보기: 📄 ⇄² 💻 ⇐¹ 🛰️ ⇔ 💻 ⇔ 📄\n로컬 데이터베이스를 초기화한 뒤, 원격 데이터베이스에서 가져온 데이터로 재구축합니다.\n원격 데이터베이스를 이미 재구축한 경우도 여기에 해당합니다.\n## ${OPTION_ONLY_SETTING}\n설정만 저장합니다. **주의: 데이터가 손상될 수 있습니다.** 일반적으로는 데이터베이스 재구축이 필요합니다.",
-    "obsidianLiveSyncSettingTab.msgSelectAndApplyPreset": "마법사를 완료하려면 프리셋 항목을 선택하고 적용해 주세요.",
     "obsidianLiveSyncSettingTab.msgSetCorsCredentials": "cors.credentials 설정",
     "obsidianLiveSyncSettingTab.msgSetCorsOrigins": "cors.origins 설정",
     "obsidianLiveSyncSettingTab.msgSetMaxDocSize": "couchdb.max_document_size 설정",
@@ -700,7 +685,6 @@
     "obsidianLiveSyncSettingTab.titleActiveRemoteServer": "활성 원격 서버",
     "obsidianLiveSyncSettingTab.titleAppearance": "모양",
     "obsidianLiveSyncSettingTab.titleConflictResolution": "충돌 해결",
-    "obsidianLiveSyncSettingTab.titleCongratulations": "축하합니다!",
     "obsidianLiveSyncSettingTab.titleCouchDB": "CouchDB",
     "obsidianLiveSyncSettingTab.titleDeletionPropagation": "삭제 전파",
     "obsidianLiveSyncSettingTab.titleEncryptionNotEnabled": "암호화가 활성화되지 않음",

src/common/messagesJson/ru.json

@@ -306,7 +306,6 @@
     "moduleLiveSyncMain.titleScramEnabled": "Экстренная остановка включена",
     "moduleLocalDatabase.logWaitingForReady": "Ожидание готовности...",
     "moduleLog.showLog": "Показать лог",
-    "moduleMigration.docUri": "https://github.com/vrtmrz/obsidian-livesync/blob/main/README.md#how-to-use",
     "moduleMigration.fix0256.buttons.checkItLater": "Проверить позже",
     "moduleMigration.fix0256.buttons.DismissForever": "Исправлено, больше не спрашивать",
     "moduleMigration.fix0256.buttons.fix": "Исправить",
@@ -328,26 +327,16 @@
     "moduleMigration.logRemoteTweakUnavailable": "Не удалось получить удалённые настройки",
     "moduleMigration.logSetupCancelled": "Настройка отменена, Self-hosted LiveSync ожидает вашей настройки!",
     "moduleMigration.msgFetchRemoteAgain": "Удалённая база данных, похоже, уже была мигрирована. Конфигурация этого устройства несовместима.",
-    "moduleMigration.msgInitialSetup": "Ваше устройство ещё не настроено. У вас есть Setup URI?",
-    "moduleMigration.msgRecommendSetupUri": "Мы рекомендуем сгенерировать Setup URI.",
     "moduleMigration.msgSinceV02321": "Начиная с v0.23.21, self-hosted LiveSync изменил поведение и структуру базы данных.",
     "moduleMigration.optionAdjustRemote": "Настроить под удалённую",
     "moduleMigration.optionDecideLater": "Решить позже",
     "moduleMigration.optionEnableBoth": "Включить оба",
     "moduleMigration.optionEnableFilenameCaseInsensitive": "Включить только #1",
     "moduleMigration.optionEnableFixedRevisionForChunks": "Включить только #2",
-    "moduleMigration.optionHaveSetupUri": "Да, есть",
     "moduleMigration.optionKeepPreviousBehaviour": "Сохранить предыдущее поведение",
-    "moduleMigration.optionManualSetup": "Настроить всё вручную",
     "moduleMigration.optionNoAskAgain": "Нет, спросить снова",
-    "moduleMigration.optionNoSetupUri": "Нет, нет",
-    "moduleMigration.optionRemindNextLaunch": "Напомнить при следующем запуске",
-    "moduleMigration.optionSetupViaP2P": "Использовать short_p2p_sync для настройки",
-    "moduleMigration.optionSetupWizard": "Перейти в мастер настройки",
     "moduleMigration.optionYesFetchAgain": "Да, загрузить снова",
     "moduleMigration.titleCaseSensitivity": "Чувствительность к регистру",
-    "moduleMigration.titleRecommendSetupUri": "Рекомендация использовать Setup URI",
-    "moduleMigration.titleWelcome": "Добро пожаловать в Self-hosted LiveSync",
     "moduleObsidianMenu.replicate": "Реплицировать",
     "More actions": "Другие действия",
     "Move remotely deleted files to the trash, instead of deleting.": "Перемещать удалённые на удалённом сервере файлы в корзину вместо удаления.",
@@ -377,12 +366,10 @@
     "obsidianLiveSyncSettingTab.btnEnable": "Включить",
     "obsidianLiveSyncSettingTab.btnFix": "Исправить",
     "obsidianLiveSyncSettingTab.btnGotItAndUpdated": "Понял и обновил.",
-    "obsidianLiveSyncSettingTab.btnNext": "Далее",
     "obsidianLiveSyncSettingTab.btnStart": "Старт",
     "obsidianLiveSyncSettingTab.btnTest": "Тест",
     "obsidianLiveSyncSettingTab.btnUse": "Использовать",
     "obsidianLiveSyncSettingTab.buttonFetch": "Загрузить",
-    "obsidianLiveSyncSettingTab.buttonNext": "Далее",
     "obsidianLiveSyncSettingTab.defaultLanguage": "По умолчанию",
     "obsidianLiveSyncSettingTab.descConnectSetupURI": "Это рекомендуемый способ настройки Self-hosted LiveSync с помощью Setup URI.",
     "obsidianLiveSyncSettingTab.descCopySetupURI": "Идеально подходит для настройки нового устройства!",
@@ -445,7 +432,6 @@
     "obsidianLiveSyncSettingTab.msgEnableCorsChttpd": "Установить chttpd.enable_cors",
     "obsidianLiveSyncSettingTab.msgEnableEncryptionRecommendation": "Мы рекомендуем включить сквозное шифрование. Вы уверены, что хотите продолжить без шифрования?",
     "obsidianLiveSyncSettingTab.msgFetchConfigFromRemote": "Вы хотите загрузить конфигурацию с удалённого сервера?",
-    "obsidianLiveSyncSettingTab.msgGenerateSetupURI": "Всё готово! Вы хотите сгенерировать Setup URI для настройки других устройств?",
     "obsidianLiveSyncSettingTab.msgIfConfigNotPersistent": "Если конфигурация сервера непостоянна, значения здесь могут измениться.",
     "obsidianLiveSyncSettingTab.msgInvalidPassphrase": "Ваша парольная фраза шифрования может быть недействительна.",
     "obsidianLiveSyncSettingTab.msgNewVersionNote": "Вы пришли из-за уведомления об обновлении? Просмотрите историю версий.",
@@ -455,7 +441,6 @@
     "obsidianLiveSyncSettingTab.msgObjectStorageWarning": "ПРЕДУПРЕЖДЕНИЕ: Эта функция в разработке.",
     "obsidianLiveSyncSettingTab.msgOriginCheck": "Проверка origin: org",
     "obsidianLiveSyncSettingTab.msgRebuildRequired": "Требуется перестроение баз данных для применения изменений.",
-    "obsidianLiveSyncSettingTab.msgSelectAndApplyPreset": "Выберите и примените любой пресет для завершения мастера.",
     "obsidianLiveSyncSettingTab.msgSetCorsCredentials": "Установить cors.credentials",
     "obsidianLiveSyncSettingTab.msgSetCorsOrigins": "Установить cors.origins",
     "obsidianLiveSyncSettingTab.msgSetMaxDocSize": "Установить couchdb.max_document_size",
@@ -512,7 +497,6 @@
     "obsidianLiveSyncSettingTab.titleActiveRemoteServer": "Активный удалённый сервер",
     "obsidianLiveSyncSettingTab.titleAppearance": "Внешний вид",
     "obsidianLiveSyncSettingTab.titleConflictResolution": "Разрешение конфликтов",
-    "obsidianLiveSyncSettingTab.titleCongratulations": "Поздравляем!",
     "obsidianLiveSyncSettingTab.titleCouchDB": "Сервер CouchDB",
     "obsidianLiveSyncSettingTab.titleDeletionPropagation": "Распространение удалений",
     "obsidianLiveSyncSettingTab.titleEncryptionNotEnabled": "Шифрование не включено",

src/common/messagesJson/zh.json

@@ -293,7 +293,6 @@
     "moduleLiveSyncMain.titleScramEnabled": "紧急停止已启用",
     "moduleLocalDatabase.logWaitingForReady": "等待就绪...",
     "moduleLog.showLog": "显示日志",
-    "moduleMigration.docUri": "https://github.com/vrtmrz/obsidian-livesync/blob/main/docs/zh/README_zh.md#%E5%A6%82%E4%BD%95%E4%BD%BF%E7%94%A8",
     "moduleMigration.fix0256.buttons.checkItLater": "稍后检查",
     "moduleMigration.fix0256.buttons.DismissForever": "我已经修复了，不再询问",
     "moduleMigration.fix0256.buttons.fix": "修复",
@@ -315,26 +314,16 @@
     "moduleMigration.logRemoteTweakUnavailable": "无法获取远程调整值",
     "moduleMigration.logSetupCancelled": "设置已取消,Self-hosted LiveSync 正在等待您的设置！",
     "moduleMigration.msgFetchRemoteAgain": "您可能已经知道,Self-hosted LiveSync 更改了其默认行为和数据库结构。\n\n值得庆幸的是,在您的时间和努力下,远程数据库似乎已经迁移完成。恭喜！\n\n但是,我们还需要一点点操作。此设备的配置与远程数据库不兼容。我们需要再次从远程数据库获取。我们现在应该再次从远程获取吗？\n\n___注意:在更改配置并再次获取数据库之前,我们无法进行同步。___\n___注意2:chunks 是完全不可变的,我们只能获取元数据和差异",
-    "moduleMigration.msgInitialSetup": "您的设备**尚未设置**。让我引导您完成设置过程。\n\n请记住,每个对话框内容都可以复制到剪贴板。如果以后需要参考,可以将其粘贴到 Obsidian 的笔记中。您也可以使用翻译工具将其翻译成您的语言。\n\n首先,您有**设置 URI** 吗？\n\n注意:如果您不知道这是什么,请参阅[文档](${URI_DOC})",
-    "moduleMigration.msgRecommendSetupUri": "我们强烈建议您生成一个设置 URI 并使用它。\n如果您对此不了解,请参阅[文档](${URI_DOC})(再次抱歉,但这很重要)。\n\n您想如何手动设置?",
     "moduleMigration.msgSinceV02321": "自 v0.23.21 起,Self-hosted LiveSync 更改了默认行为和数据库结构。进行了以下更改：\n\n1. **文件名的区分大小写**\n现在处理文件名时不区分大小写。这对于大多数平台来说是一个有益的更改,除了 Linux 和 iOS,它们不能有效地管理文件名的大小写敏感性。\n(在这些平台上,对于名称相同但大小写不同的文件将显示警告)。\n\n2. **chunks 的版本处理**\nchunks 是不可变的,这使得它们的版本可以固定。此更改将提高文件保存的性能。\n\n___然而,要启用这些更改中的任何一个,都需要重建远程和本地数据库。这个过程需要几分钟,我们建议您在有充足时间时进行。___\n\n- 如果您希望保持以前的行为,可以使用 `${KEEP}` 跳过此过程。\n- 如果您没有足够的时间,请选择 `${DISMISS}`。稍后会再次提示您。\n- 如果您已在另一台设备上重建了数据库,请选择 `${DISMISS}` 并尝试再次同步。由于检测到差异,系统会再次提示您",
     "moduleMigration.optionAdjustRemote": "调整到远程设置",
     "moduleMigration.optionDecideLater": "稍后决定",
     "moduleMigration.optionEnableBoth": "启用两者",
     "moduleMigration.optionEnableFilenameCaseInsensitive": "仅启用 #1",
     "moduleMigration.optionEnableFixedRevisionForChunks": "仅启用 #2",
-    "moduleMigration.optionHaveSetupUri": "是的,我有",
     "moduleMigration.optionKeepPreviousBehaviour": "保持以前的行为",
-    "moduleMigration.optionManualSetup": "全部手动设置",
     "moduleMigration.optionNoAskAgain": "不,请稍后再次询问",
-    "moduleMigration.optionNoSetupUri": "不,我没有",
-    "moduleMigration.optionRemindNextLaunch": "下次启动时提醒我",
-    "moduleMigration.optionSetupViaP2P": "Use %{short_p2p_sync} to set up",
-    "moduleMigration.optionSetupWizard": "带我进入设置向导",
     "moduleMigration.optionYesFetchAgain": "是的,再次获取",
     "moduleMigration.titleCaseSensitivity": "大小写敏感性",
-    "moduleMigration.titleRecommendSetupUri": "推荐使用设置 URI",
-    "moduleMigration.titleWelcome": "欢迎使用 Self-hosted LiveSync",
     "moduleObsidianMenu.replicate": "复制",
     "More actions": "更多操作",
     "Move remotely deleted files to the trash, instead of deleting.": "将远程删除的文件移至回收站,而不是直接删除",
@@ -363,12 +352,10 @@
     "obsidianLiveSyncSettingTab.btnEnable": "启用",
     "obsidianLiveSyncSettingTab.btnFix": "修复",
     "obsidianLiveSyncSettingTab.btnGotItAndUpdated": "我明白了并且已更新",
-    "obsidianLiveSyncSettingTab.btnNext": "下一步",
     "obsidianLiveSyncSettingTab.btnStart": "开始",
     "obsidianLiveSyncSettingTab.btnTest": "测试",
     "obsidianLiveSyncSettingTab.btnUse": "使用",
     "obsidianLiveSyncSettingTab.buttonFetch": "获取",
-    "obsidianLiveSyncSettingTab.buttonNext": "下一步",
     "obsidianLiveSyncSettingTab.defaultLanguage": "默认语言",
     "obsidianLiveSyncSettingTab.descConnectSetupURI": "这是使用设置 URI 设置 Self-hosted LiveSync 的推荐方法",
     "obsidianLiveSyncSettingTab.descCopySetupURI": "非常适合设置新设备！",
@@ -431,7 +418,6 @@
     "obsidianLiveSyncSettingTab.msgEnableCorsChttpd": "设置 chttpd.enable_cors",
     "obsidianLiveSyncSettingTab.msgEnableEncryptionRecommendation": "建议启用端到端加密和路径混淆。你确定要在未加密的情况下继续吗？",
     "obsidianLiveSyncSettingTab.msgFetchConfigFromRemote": "要从远端服务器获取配置吗？",
-    "obsidianLiveSyncSettingTab.msgGenerateSetupURI": "全部完成！要生成设置 URI 以便配置其他设备吗？",
     "obsidianLiveSyncSettingTab.msgIfConfigNotPersistent": "如果服务器配置不是持久的(例如,在 docker 上运行),此处的值可能会更改。一旦能够连接,请更新服务器 local.ini 中的设置",
     "obsidianLiveSyncSettingTab.msgInvalidPassphrase": "你的加密密码短语可能无效。你确定要继续吗？",
     "obsidianLiveSyncSettingTab.msgNewVersionNote": "因为升级通知来到这里？请查看版本历史。如果您满意,请点击按钮。新的更新将再次提示此信息",
@@ -441,7 +427,6 @@
     "obsidianLiveSyncSettingTab.msgObjectStorageWarning": "警告：此功能仍在开发中,请注意以下几点：\n- 仅追加架构。需要重建才能缩小存储空间。\n- 有点脆弱。\n- 首次同步时,所有历史记录将从远程传输。注意数据上限和慢速。\n- 只有差异会实时同步。\n\n如果您遇到任何问题,或对此功能有任何想法,请在 GitHub 上创建 issue。\n感谢您的巨大贡献",
     "obsidianLiveSyncSettingTab.msgOriginCheck": "源检查: {org}",
     "obsidianLiveSyncSettingTab.msgRebuildRequired": "需要重建数据库以应用更改。请选择应用更改的方法。\n\n<details>\n<summary>图例</summary>\n\n| 符号 | 含义 |\n|: ------ :| ------- |\n| ⇔ | 最新 |\n| ⇄ | 同步以平衡 |\n| ⇐,⇒ | 传输以覆盖 |\n| ⇠,⇢ | 从另一侧传输以覆盖 |\n\n</details>\n\n## ${OPTION_REBUILD_BOTH}\n概览:📄 ⇒¹ 💻 ⇒² 🛰️ ⇢ⁿ 💻 ⇄ⁿ⁺¹ 📄\n使用此设备的现有文件重建本地和远程数据库。\n这将导致其他设备被锁定,并且它们需要执行获取操作。\n## ${OPTION_FETCH}\n概览:📄 ⇄² 💻 ⇐¹ 🛰️ ⇔ 💻 ⇔ 📄\n初始化本地数据库并使用从远程数据库获取的数据重建它。\n这种情况包括您已经重建了远程数据库的情况。\n## ${OPTION_ONLY_SETTING}\n仅存储设置。**注意：这可能导致数据损坏**；通常需要重建数据库",
-    "obsidianLiveSyncSettingTab.msgSelectAndApplyPreset": "请选择并应用任一预设项以完成向导。",
     "obsidianLiveSyncSettingTab.msgSetCorsCredentials": "设置 cors.credentials",
     "obsidianLiveSyncSettingTab.msgSetCorsOrigins": "设置 cors.origins",
     "obsidianLiveSyncSettingTab.msgSetMaxDocSize": "设置 couchdb.max_document_size",
@@ -498,7 +483,6 @@
     "obsidianLiveSyncSettingTab.titleActiveRemoteServer": "活动远程服务器",
     "obsidianLiveSyncSettingTab.titleAppearance": "外观",
     "obsidianLiveSyncSettingTab.titleConflictResolution": "冲突处理",
-    "obsidianLiveSyncSettingTab.titleCongratulations": "恭喜！",
     "obsidianLiveSyncSettingTab.titleCouchDB": "CouchDB 服务器",
     "obsidianLiveSyncSettingTab.titleDeletionPropagation": "删除传播",
     "obsidianLiveSyncSettingTab.titleEncryptionNotEnabled": "尚未启用加密",

src/common/messagesYAML/de.yaml

@@ -92,8 +92,6 @@ Normal Files: Normale Dateien
 obsidianLiveSyncSettingTab:
   btnApply: Anwenden
   btnDisable: Deaktivieren
-  btnNext: Weiter
-  buttonNext: Weiter
   defaultLanguage: Standardsprache
   labelDisabled: "⏹️ : Deaktiviert"
   labelEnabled: "🔁 : Aktiviert"
@@ -106,12 +104,8 @@ obsidianLiveSyncSettingTab:
     und Pfadverschleierung zu aktivieren. Möchten Sie wirklich ohne
     Verschlüsselung fortfahren?
   msgFetchConfigFromRemote: Möchten Sie die Konfiguration vom Remote-Server abrufen?
-  msgGenerateSetupURI: Alles fertig! Möchten Sie eine Setup-URI erzeugen, um
-    andere Geräte einzurichten?
   msgInvalidPassphrase: Ihre Verschlüsselungs-Passphrase könnte ungültig sein.
     Möchten Sie wirklich fortfahren?
-  msgSelectAndApplyPreset: Bitte wählen und übernehmen Sie eine beliebige
-    Voreinstellung, um den Assistenten abzuschließen.
   nameDisableHiddenFileSync: Synchronisation versteckter Dateien deaktivieren
   nameEnableHiddenFileSync: Synchronisation versteckter Dateien aktivieren
   nameHiddenFileSynchronization: Synchronisation versteckter Dateien
@@ -122,7 +116,6 @@ obsidianLiveSyncSettingTab:
   optionPeriodicWithBatch: Periodisch mit Stapelverarbeitung
   titleAppearance: Darstellung
   titleConflictResolution: Konfliktbehandlung
-  titleCongratulations: Glückwunsch!
   titleCouchDB: CouchDB-Server
   titleDeletionPropagation: Weitergabe von Löschungen
   titleEncryptionNotEnabled: Verschlüsselung ist nicht aktiviert

src/common/messagesYAML/en.yaml

@@ -725,7 +725,6 @@ moduleLocalDatabase:
 moduleLog:
     showLog: Show Log
 moduleMigration:
-    docUri: https://github.com/vrtmrz/obsidian-livesync/blob/main/README.md#how-to-use
     fix0256:
         buttons:
             checkItLater: Check it later
@@ -819,30 +818,6 @@ moduleMigration:
 
         ___Note2: The chunks are completely immutable, we can fetch only the
         metadata and difference.___
-    msgInitialSetup: >-
-        Your device has **not been set up yet**. Let me guide you through the setup
-        process.
-
-
-        Please keep in mind that every dialogue content can be copied to the
-        clipboard. If you need to refer to it later, you can paste it into a note in
-        Obsidian. You can also translate it into your language using a translation
-        tool.
-
-
-        First, do you have **Setup URI**?
-
-
-        Note: If you do not know what it is, please refer to the
-        [documentation](${URI_DOC}).
-    msgRecommendSetupUri: >-
-        We strongly recommend that you generate a set-up URI and use it.
-
-        If you do not have knowledge about it, please refer to the
-        [documentation](${URI_DOC}) (Sorry again, but it is important).
-
-
-        How do you want to set it up manually?
     msgSinceV02321: >-
         Since v0.23.21, the self-hosted LiveSync has changed the default behaviour
         and database structure. The following changes have been made:
@@ -874,18 +849,10 @@ moduleMigration:
     optionEnableBoth: Enable both
     optionEnableFilenameCaseInsensitive: "Enable only #1"
     optionEnableFixedRevisionForChunks: "Enable only #2"
-    optionHaveSetupUri: Yes, I have
     optionKeepPreviousBehaviour: Keep previous behaviour
-    optionManualSetup: Set it up all manually
     optionNoAskAgain: No, please ask again
-    optionNoSetupUri: No, I do not have
-    optionRemindNextLaunch: Remind me at the next launch
-    optionSetupViaP2P: Use %{short_p2p_sync} to set up
-    optionSetupWizard: Take me into the setup wizard
     optionYesFetchAgain: Yes, fetch again
     titleCaseSensitivity: Case Sensitivity
-    titleRecommendSetupUri: Recommendation to use Setup URI
-    titleWelcome: Welcome to Self-hosted LiveSync
 moduleObsidianMenu:
     replicate: Replicate
 More actions: More actions
@@ -940,12 +907,10 @@ obsidianLiveSyncSettingTab:
     btnEnable: Enable
     btnFix: Fix
     btnGotItAndUpdated: I got it and updated.
-    btnNext: Next
     btnStart: Start
     btnTest: Test
     btnUse: Use
     buttonFetch: Fetch
-    buttonNext: Next
     defaultLanguage: Default
     descConnectSetupURI: This is the recommended method to set up Self-hosted
         LiveSync with a Setup URI.
@@ -1018,7 +983,6 @@ obsidianLiveSyncSettingTab:
     msgEnableEncryptionRecommendation: We recommend enabling End-To-End Encryption,
         and Path Obfuscation. Are you sure you want to continue without encryption?
     msgFetchConfigFromRemote: Do you want to fetch the config from the remote server?
-    msgGenerateSetupURI: All done! Do you want to generate a setup URI to set up other devices?
     msgIfConfigNotPersistent: If the server configuration is not persistent (e.g.,
         running on docker), the values here may change. Once you are able to
         connect, please update the settings in the server's local.ini.
@@ -1098,7 +1062,6 @@ obsidianLiveSyncSettingTab:
 
         Store only the settings. **Caution: This may lead to data corruption**;
         database reconstruction is generally necessary.
-    msgSelectAndApplyPreset: Please select and apply any preset item to complete the wizard.
     msgSetCorsCredentials: Set cors.credentials
     msgSetCorsOrigins: Set cors.origins
     msgSetMaxDocSize: Set couchdb.max_document_size
@@ -1158,12 +1121,17 @@ obsidianLiveSyncSettingTab:
     titleActiveRemoteServer: Active Remote Server
     titleAppearance: Appearance
     titleConflictResolution: Conflict resolution
-    titleCongratulations: Congratulations!
     titleCouchDB: CouchDB
     titleDeletionPropagation: Deletion Propagation
     titleEncryptionNotEnabled: Encryption is not enabled
     titleEncryptionPassphraseInvalid: Encryption Passphrase Invalid
     titleExtraFeatures: Enable extra and advanced features
+    titleExtraFeaturesGroup: Extra features
+    titleExtraMenus: Extra menus
+    titleHelpAndInformation: Help and information
+    titleHelpAndTroubleshooting: Help and troubleshooting
+    titleMaintenanceAndRecovery: Maintenance and recovery
+    titleAdvancedSettings: Advanced settings
     titleFetchConfig: Fetch Config
     titleFetchConfigFromRemote: Fetch config from remote server
     titleFetchSettings: Fetch Settings
@@ -1177,7 +1145,8 @@ obsidianLiveSyncSettingTab:
     titleRemoteConfigCheckFailed: Remote Configuration Check Failed
     titleRemoteServer: Remote Server
     titleReset: Reset
-    titleSetupOtherDevices: To setup other devices
+    titleSetupOtherDevices: Set up other devices
+    titleSynchronisation: Synchronisation
     titleSynchronizationMethod: Synchronization Method
     titleSynchronizationPreset: Synchronization Preset
     titleSyncSettings: Sync Settings
@@ -1469,8 +1438,8 @@ Replicator:
         InitialiseFatalError: No replicator is available, this is the fatal error.
         Pending: Some file events are pending. Replication has been cancelled.
         SomeModuleFailed: Replication has been cancelled by some module failure
-        VersionUpFlash: An update has been detected. Please open the Settings dialogue
-            and check the Change Log. Replication has been cancelled.
+        VersionUpFlash: Remote synchronisation is paused for compatibility review. Run the
+            'Review why synchronisation is paused' command for details and available actions.
 Requires restart of Obsidian: Requires restart of Obsidian
 Requires restart of Obsidian.: Requires restart of Obsidian.
 Rerun Onboarding Wizard: Rerun Onboarding Wizard
@@ -2340,6 +2309,29 @@ Ui:
             Fetch: Fetch
             Overwrite: Overwrite
     SetupWizard:
+        ApplySettingsInitialisation:
+            ApplyWithoutInitialisation: Apply without Initialisation
+            Back: Review another way to apply these settings
+            BypassGuidance: Applying these settings alone can make this device incompatible with its existing synchronisation data. Use this only when you have confirmed that reconstruction is unnecessary.
+            BypassTitle: Apply Settings without Initialisation?
+            ContinueFetch: Continue with Fetch
+            FetchOption: Reset Synchronisation on This Device
+            FetchOptionDesc: After restarting, rebuild this device's local database from the current remote synchronisation data. Files in the Vault will then be reconciled with that data.
+            FetchOptionP2PDesc: After restarting, select an online source device. This device's local LiveSync database will be rebuilt from that source.
+            Guidance: These setting changes alter how synchronisation data is interpreted. Apply them together with an initialisation operation after restart.
+            KeepEditing: Keep Editing
+            ProceedFetch: Restart and Fetch Synchronisation Data
+            ProceedFetchP2P: Restart and Select a Source Device
+            ProceedRebuild: Restart and Overwrite Server Data
+            ProceedRebuildP2P: Restart and Prepare This Device
+            Question: Which existing data should be used after restart?
+            RebuildOption: Overwrite Server Data with This Device's Files
+            RebuildOptionDesc: Rebuild the local and remote databases from the files currently in this Vault. Other synchronising devices must reset their local synchronisation afterwards.
+            RebuildOptionP2P: Prepare This Device from This Vault
+            RebuildOptionP2PDesc: Rebuild this device's local LiveSync database from the files currently in this Vault. This does not overwrite another device.
+            RemoteVerificationGuidance: The configured remote could not be verified with the current credentials and encryption settings. Continuing may make the Fetch fail after restart.
+            RemoteVerificationTitle: Remote Synchronisation Data Could Not Be Verified
+            Title: Apply Settings and Reinitialise Synchronisation
         Common:
             Back: No, please take me back
             Cancel: Cancel

src/common/messagesYAML/es.yaml

@@ -751,7 +751,6 @@ moduleLocalDatabase:
 moduleLog:
   showLog: Mostrar registro
 moduleMigration:
-  docUri: https://github.com/vrtmrz/obsidian-livesync/blob/main/README_ES.md#how-to-use
   logBulkSendCorrupted: El envío de fragmentos en bloque se ha habilitado, sin
     embargo, esta función se ha corrompido. Disculpe las molestias.
     Deshabilitado automáticamente.
@@ -782,30 +781,6 @@ moduleMigration:
 
     ___Nota2: Los fragmentos son completamente inmutables, solo podemos obtener
     los metadatos y diferencias.___
-  msgInitialSetup: >-
-    Tu dispositivo **aún no ha sido configurado**. Permíteme guiarte a través
-    del proceso de configuración.
-
-
-    Ten en cuenta que todo el contenido del diálogo se puede copiar al
-    portapapeles. Si necesitas consultarlo más tarde, puedes pegarlo en una nota
-    en Obsidian. También puedes traducirlo a tu idioma utilizando una
-    herramienta de traducción.
-
-
-    Primero, ¿tienes **URI de configuración**?
-
-
-    Nota: Si no sabes qué es, consulta la [documentación](${URI_DOC}).
-  msgRecommendSetupUri: >-
-    Te recomendamos encarecidamente que generes una URI de configuración y la
-    utilices.
-
-    Si no tienes conocimientos al respecto, consulta la
-    [documentación](${URI_DOC}) (Lo siento de nuevo, pero es importante).
-
-
-    ¿Cómo quieres configurarlo manualmente?
   msgSinceV02321: >-
     Desde la versión v0.23.21, Self-hosted LiveSync ha cambiado el
     comportamiento predeterminado y la estructura de la base de datos. Se han
@@ -838,9 +813,7 @@ moduleMigration:
   optionEnableBoth: Habilitar ambos
   optionEnableFilenameCaseInsensitive: "Habilitar solo #1"
   optionEnableFixedRevisionForChunks: "Habilitar solo #2"
-  optionHaveSetupUri: Sí, tengo
   optionKeepPreviousBehaviour: Mantener comportamiento anterior
-  optionManualSetup: Configurarlo todo manualmente
   optionNoAskAgain: No, por favor pregúntame de nuevo
   fix0256:
     buttons:
@@ -909,14 +882,8 @@ moduleMigration:
       Nota 2: reconstruir todo y obtener los datos consume algo de tiempo y de
       tráfico; hazlo en horas de poco uso y con una conexión de red estable.
     title: ¡Se han encontrado chunks no seguros!
-  optionNoSetupUri: No, no tengo
-  optionRemindNextLaunch: Recordármelo en el próximo inicio
-  optionSetupViaP2P: Usar %{short_p2p_sync} para configurarlo
-  optionSetupWizard: Llévame al asistente de configuración
   optionYesFetchAgain: Sí, obtener de nuevo
   titleCaseSensitivity: Distinción de mayúsculas y minúsculas
-  titleRecommendSetupUri: Recomendación de usar un Setup URI
-  titleWelcome: Bienvenido a Self-hosted LiveSync
 "Mostly Complete: Decision Required": "Casi terminado: se requiere una decisión"
 My remote server is already set up. I want to join this device.: Mi servidor remoto ya está configurado. Quiero añadir este dispositivo.
 Name: Nombre
@@ -1506,12 +1473,10 @@ obsidianLiveSyncSettingTab:
   btnEnable: Activar
   btnFix: Corregir
   btnGotItAndUpdated: Lo entendí y actualicé.
-  btnNext: Siguiente
   btnStart: Iniciar
   btnTest: Probar
   btnUse: Usar
   buttonFetch: Obtener
-  buttonNext: Siguiente
   defaultLanguage: Predeterminado
   descConnectSetupURI: Este es el método recomendado para configurar Self-hosted
     LiveSync con una URI de configuración.
@@ -1585,8 +1550,6 @@ obsidianLiveSyncSettingTab:
     a extremo y la obfuscación de ruta. ¿Estás seguro de querer continuar sin
     cifrado?
   msgFetchConfigFromRemote: ¿Quieres obtener la configuración del servidor remoto?
-  msgGenerateSetupURI: ¡Todo listo! ¿Quieres generar un URI de configuración para
-    configurar otros dispositivos?
   msgIfConfigNotPersistent: Si la configuración del servidor no es persistente
     (por ejemplo, ejecutándose en docker), los valores aquí pueden cambiar. Una
     vez que puedas conectarte, por favor actualiza las configuraciones en el
@@ -1670,8 +1633,6 @@ obsidianLiveSyncSettingTab:
 
     Almacena solo la configuración. **Precaución: esto puede provocar corrupción
     de datos**; generalmente es necesario reconstruir la base de datos.
-  msgSelectAndApplyPreset: Por favor, selecciona y aplica cualquier elemento
-    preestablecido para completar el asistente.
   msgSetCorsCredentials: Configurar cors.credentials
   msgSetCorsOrigins: Configurar cors.origins
   msgSetMaxDocSize: Configurar couchdb.max_document_size
@@ -1729,7 +1690,6 @@ obsidianLiveSyncSettingTab:
   panelSetup: Configuración
   titleAppearance: Apariencia
   titleConflictResolution: Resolución de conflictos
-  titleCongratulations: ¡Felicidades!
   titleCouchDB: Servidor CouchDB
   titleDeletionPropagation: Propagación de eliminación
   titleEncryptionNotEnabled: El cifrado no está habilitado

src/common/messagesYAML/fr.yaml

@@ -384,7 +384,6 @@ moduleLocalDatabase:
 moduleLog:
   showLog: Afficher le journal
 moduleMigration:
-  docUri: https://github.com/vrtmrz/obsidian-livesync/blob/main/README.md#how-to-use
   fix0256:
     buttons:
       checkItLater: Vérifier plus tard
@@ -482,31 +481,6 @@ moduleMigration:
 
     ___Note 2 : Les fragments sont complètement immuables, nous ne pouvons
     récupérer que les métadonnées et les différences.___
-  msgInitialSetup: >-
-    Votre appareil n'a **pas encore été configuré**. Laissez-moi vous guider
-    dans le processus de configuration.
-
-
-    Veuillez noter que chaque contenu de boîte de dialogue peut être copié
-    dans le presse-papiers. Si vous souhaitez vous y référer plus tard, vous
-    pouvez le coller dans une note d'Obsidian. Vous pouvez également le
-    traduire dans votre langue via un outil de traduction.
-
-
-    Tout d'abord, disposez-vous d'une **URI de configuration** ?
-
-
-    Note : Si vous ne savez pas ce que c'est, consultez la
-    [documentation](${URI_DOC}).
-  msgRecommendSetupUri: >-
-    Nous recommandons vivement de générer une URI de configuration et de
-    l'utiliser.
-
-    Si vous ne connaissez pas, veuillez consulter la
-    [documentation](${URI_DOC}) (Désolé encore, mais c'est important).
-
-
-    Comment souhaitez-vous effectuer la configuration manuellement ?
   msgSinceV02321: >-
     Depuis la v0.23.21, Self-hosted LiveSync a modifié son comportement par
     défaut et la structure de sa base. Les changements suivants ont été
@@ -539,18 +513,10 @@ moduleMigration:
   optionEnableBoth: Activer les deux
   optionEnableFilenameCaseInsensitive: "Activer seulement #1"
   optionEnableFixedRevisionForChunks: "Activer seulement #2"
-  optionHaveSetupUri: Oui, j'en ai une
   optionKeepPreviousBehaviour: Conserver le comportement précédent
-  optionManualSetup: Tout configurer manuellement
   optionNoAskAgain: Non, demandez à nouveau
-  optionNoSetupUri: Non, je n'en ai pas
-  optionRemindNextLaunch: Me rappeler au prochain lancement
-  optionSetupViaP2P: Utiliser %{short_p2p_sync} pour configurer
-  optionSetupWizard: Ouvrir l'assistant de configuration
   optionYesFetchAgain: Oui, récupérer à nouveau
   titleCaseSensitivity: Sensibilité à la casse
-  titleRecommendSetupUri: Recommandation d'utilisation de l'URI de configuration
-  titleWelcome: Bienvenue dans Self-hosted LiveSync
 moduleObsidianMenu:
   replicate: Répliquer
 Move remotely deleted files to the trash, instead of deleting.: Déplacer les fichiers supprimés à distance vers la corbeille, au lieu de les supprimer.
@@ -574,12 +540,10 @@ obsidianLiveSyncSettingTab:
   btnEnable: Activer
   btnFix: Corriger
   btnGotItAndUpdated: J'ai compris et mis à jour.
-  btnNext: Suivant
   btnStart: Démarrer
   btnTest: Tester
   btnUse: Utiliser
   buttonFetch: Récupérer
-  buttonNext: Suivant
   defaultLanguage: Par défaut
   descConnectSetupURI: Méthode recommandée pour configurer Self-hosted LiveSync
     avec une URI de configuration.
@@ -653,7 +617,6 @@ obsidianLiveSyncSettingTab:
     de bout en bout et l'obfuscation des chemins. Êtes-vous sûr de vouloir
     continuer sans chiffrement ?
   msgFetchConfigFromRemote: Voulez-vous récupérer la configuration depuis le serveur distant ?
-  msgGenerateSetupURI: Tout est prêt ! Voulez-vous générer une URI de configuration pour configurer d'autres appareils ?
   msgIfConfigNotPersistent: Si la configuration du serveur n'est pas persistante
     (par ex. fonctionnant sur Docker), les valeurs peuvent changer. Une fois la
     connexion établie, mettez à jour les paramètres dans le local.ini du
@@ -736,7 +699,6 @@ obsidianLiveSyncSettingTab:
     Ne stocker que les paramètres. **Attention : cela peut entraîner une
     corruption des données** ; une reconstruction de la base est généralement
     nécessaire.
-  msgSelectAndApplyPreset: Veuillez sélectionner et appliquer un préréglage pour terminer l'assistant.
   msgSetCorsCredentials: Définir cors.credentials
   msgSetCorsOrigins: Définir cors.origins
   msgSetMaxDocSize: Définir couchdb.max_document_size
@@ -797,7 +759,6 @@ obsidianLiveSyncSettingTab:
   titleActiveRemoteServer: Serveur distant actif
   titleAppearance: Apparence
   titleConflictResolution: Résolution des conflits
-  titleCongratulations: Félicitations !
   titleCouchDB: CouchDB
   titleDeletionPropagation: Propagation des suppressions
   titleEncryptionNotEnabled: Le chiffrement n'est pas activé

src/common/messagesYAML/he.yaml

@@ -344,7 +344,6 @@ moduleLocalDatabase:
 moduleLog:
   showLog: הצג יומן
 moduleMigration:
-  docUri: https://github.com/vrtmrz/obsidian-livesync/blob/main/README.md#how-to-use
   fix0256:
     buttons:
       checkItLater: בדוק מאוחר יותר
@@ -430,25 +429,6 @@ moduleMigration:
 
     ___הערה 2: הנתחים הם בלתי-ניתנים לשינוי לחלוטין, ניתן למשוך רק את המטה-נתונים
     וההפרש.___
-  msgInitialSetup: >-
-    המכשיר שלך **טרם הוגדר**. אנחנו כאן לעזור לך בתהליך ההגדרה.
-
-
-    שים לב שניתן להעתיק את תוכן כל דיאלוג ללוח. אם צריך לחזור אליו מאוחר יותר,
-    ניתן להדביק אותו כפתק ב-Obsidian. ניתן גם לתרגם לשפתך בעזרת כלי תרגום.
-
-
-    ראשית, האם יש לך **Setup URI**?
-
-
-    הערה: אם אינך יודע מהו, אנא עיין ב[תיעוד](${URI_DOC}).
-  msgRecommendSetupUri: >-
-    אנו ממליצים בחום לייצר Setup URI ולהשתמש בו.
-
-    אם אין לך ידע בנושא, אנא עיין ב[תיעוד](${URI_DOC}) (מתנצלים שוב, אך זה חשוב).
-
-
-    כיצד ברצונך להגדיר ידנית?
   msgSinceV02321: >-
     מאז גרסה 0.23.21, Self-hosted LiveSync שינה את התנהגות ברירת המחדל ומבנה מסד
     הנתונים. השינויים הבאים בוצעו:
@@ -478,18 +458,10 @@ moduleMigration:
   optionEnableBoth: הפעל את שניהם
   optionEnableFilenameCaseInsensitive: "הפעל רק #1"
   optionEnableFixedRevisionForChunks: "הפעל רק #2"
-  optionHaveSetupUri: כן, יש לי
   optionKeepPreviousBehaviour: שמור על התנהגות קודמת
-  optionManualSetup: הגדר הכל ידנית
   optionNoAskAgain: לא, אנא שאל שוב
-  optionNoSetupUri: לא, אין לי
-  optionRemindNextLaunch: הזכר לי בהפעלה הבאה
-  optionSetupViaP2P: השתמש ב-%{short_p2p_sync} להגדרה
-  optionSetupWizard: קח אותי לאשף ההגדרה
   optionYesFetchAgain: כן, משוך שוב
   titleCaseSensitivity: תלות רישיות
-  titleRecommendSetupUri: המלצה לשימוש ב-Setup URI
-  titleWelcome: ברוך הבא ל-Self-hosted LiveSync
 moduleObsidianMenu:
   replicate: שכפל
 Move remotely deleted files to the trash, instead of deleting.: העבר קבצים שנמחקו מרחוק לאשפה, במקום למחוק.
@@ -512,12 +484,10 @@ obsidianLiveSyncSettingTab:
   btnEnable: הפעל
   btnFix: תקן
   btnGotItAndUpdated: הבנתי ועדכנתי.
-  btnNext: הבא
   btnStart: התחל
   btnTest: בדוק
   btnUse: השתמש
   buttonFetch: משוך
-  buttonNext: הבא
   defaultLanguage: ברירת מחדל
   descConnectSetupURI: זוהי השיטה המומלצת להגדרת Self-hosted LiveSync עם Setup URI.
   descCopySetupURI: מושלם להגדרת מכשיר חדש!
@@ -586,7 +556,6 @@ obsidianLiveSyncSettingTab:
   msgEnableEncryptionRecommendation: אנו ממליצים להפעיל הצפנה מקצה לקצה ואת ערפול
     הנתיב. האם אתה בטוח שברצונך להמשיך ללא הצפנה?
   msgFetchConfigFromRemote: האם ברצונך למשוך את התצורה מהשרת המרוחד?
-  msgGenerateSetupURI: הכל מוכן! האם ברצונך לייצר Setup URI להגדרת מכשירים אחרים?
   msgIfConfigNotPersistent: אם תצורת השרת אינה קבועה (למשל, פועלת ב-docker), הערכים
     כאן עשויים להשתנות. לאחר שתצליח להתחבר, אנא עדכן את ההגדרות ב-local.ini של השרת.
   msgInvalidPassphrase: ביטוי הסיסמה להצפנה שלך עשוי להיות לא תקין. האם אתה בטוח
@@ -659,7 +628,6 @@ obsidianLiveSyncSettingTab:
 
     שמור רק את ההגדרות. **זהירות: עלול לגרום לפגיעה בנתונים**; בנייה מחדש של מסד
     הנתונים נדרשת בדרך כלל.
-  msgSelectAndApplyPreset: אנא בחר והחל פריט קבוע מראש כלשהו להשלמת האשף.
   msgSetCorsCredentials: הגדר cors.credentials
   msgSetCorsOrigins: הגדר cors.origins
   msgSetMaxDocSize: הגדר couchdb.max_document_size
@@ -718,7 +686,6 @@ obsidianLiveSyncSettingTab:
   titleActiveRemoteServer: שרת מרוחד פעיל
   titleAppearance: מראה
   titleConflictResolution: פתרון קונפליקטים
-  titleCongratulations: מזל טוב!
   titleCouchDB: CouchDB
   titleDeletionPropagation: הפצת מחיקות
   titleEncryptionNotEnabled: ההצפנה אינה מופעלת

src/common/messagesYAML/ja.yaml

@@ -356,7 +356,6 @@ moduleLocalDatabase:
 moduleLog:
   showLog: ログを表示
 moduleMigration:
-  docUri: https://github.com/vrtmrz/obsidian-livesync/blob/main/README.md#how-to-use
   fix0256:
     buttons:
       checkItLater: 後で確認する
@@ -416,19 +415,6 @@ moduleMigration:
 
     ___注意: 設定が変更され、データベースが再フェッチされるまで同期できません。___
     ___注意2: チャンクは完全に不変なので、メタデータと差分のみフェッチできます。___
-  msgInitialSetup: |-
-    このデバイスは**まだセットアップされていません**。セットアッププロセスをご案内します。
-
-    すべてのダイアログの内容はクリップボードにコピーできます。後で参照する必要があれば、Obsidianのノートに貼り付けてください。翻訳ツールを使ってお使いの言語に翻訳することもできます。
-
-    まず、**セットアップURI**をお持ちですか？
-
-    注意: それが何か分からない場合は、[documentation](${URI_DOC})を参照してください。
-  msgRecommendSetupUri: |-
-    セットアップURIを生成して使用することを強くお勧めします。
-    これについて知識がない場合は、[documentation](${URI_DOC})を参照してください（重要です）。
-
-    手動でセットアップしますか？
   msgSinceV02321: |-
     v0.23.21以降、self-hosted LiveSyncはデフォルトの動作とデータベース構造を変更しました。以下の変更が行われました：
 
@@ -449,18 +435,10 @@ moduleMigration:
   optionEnableBoth: 両方を有効にする
   optionEnableFilenameCaseInsensitive: "#1のみ有効にする"
   optionEnableFixedRevisionForChunks: "#2のみ有効にする"
-  optionHaveSetupUri: はい、持っています
   optionKeepPreviousBehaviour: 以前の動作を維持
-  optionManualSetup: すべて手動でセットアップ
   optionNoAskAgain: いいえ、後で確認する
-  optionNoSetupUri: いいえ、持っていません
-  optionRemindNextLaunch: 次回起動時にリマインド
-  optionSetupViaP2P: "%{short_p2p_sync}を使ってセットアップ"
-  optionSetupWizard: セットアップウィザードへ
   optionYesFetchAgain: はい、再フェッチする
   titleCaseSensitivity: 大文字小文字の区別
-  titleRecommendSetupUri: セットアップURIの使用を推奨
-  titleWelcome: Self-hosted LiveSyncへようこそ
 moduleObsidianMenu:
   replicate: レプリケート
 More actions: その他の操作
@@ -486,12 +464,10 @@ obsidianLiveSyncSettingTab:
   btnEnable: 有効化
   btnFix: 修正
   btnGotItAndUpdated: 理解しました、更新しました。
-  btnNext: 次へ
   btnStart: 開始
   btnTest: テスト
   btnUse: 使用
   buttonFetch: フェッチ
-  buttonNext: 次へ
   defaultLanguage: デフォルト
   descConnectSetupURI: セットアップURIを使用してSelf-hosted LiveSyncをセットアップする推奨方法です。
   descCopySetupURI: 新しいデバイスのセットアップにおすすめ！
@@ -556,7 +532,6 @@ obsidianLiveSyncSettingTab:
   msgEnableCorsChttpd: chttpd.enable_corsを設定
   msgEnableEncryptionRecommendation: エンドツーエンド暗号化とパス難読化を有効にすることをお勧めします。暗号化なしで続行してもよろしいですか？
   msgFetchConfigFromRemote: リモートサーバーから設定を取得しますか？
-  msgGenerateSetupURI: 完了！他のデバイスをセットアップするためのセットアップURIを生成しますか？
   msgIfConfigNotPersistent: "サーバー設定が永続的でない場合（例:
     Dockerで実行中）、ここの値は変更される可能性があります。接続できるようになったら、サーバーのlocal.iniの設定を更新してください。"
   msgInvalidPassphrase: 暗号化パスフレーズが無効かもしれません。続行してもよろしいですか？
@@ -599,7 +574,6 @@ obsidianLiveSyncSettingTab:
     リモートデータベースを再構築した場合も含まれます。
     ## ${OPTION_ONLY_SETTING}
     設定のみを保存します。**注意: データ破損につながる可能性があります**。通常、データベースの再構築が必要です。
-  msgSelectAndApplyPreset: ウィザードを完了するには、プリセット項目を選択して適用してください。
   msgSetCorsCredentials: cors.credentialsを設定
   msgSetCorsOrigins: cors.originsを設定
   msgSetMaxDocSize: couchdb.max_document_sizeを設定
@@ -656,7 +630,6 @@ obsidianLiveSyncSettingTab:
   titleActiveRemoteServer: アクティブなリモートサーバー
   titleAppearance: 外観
   titleConflictResolution: 競合解決
-  titleCongratulations: おめでとうございます！
   titleCouchDB: CouchDB サーバー
   titleDeletionPropagation: 削除の伝播
   titleEncryptionNotEnabled: 暗号化が有効になっていません

src/common/messagesYAML/ko.yaml

@@ -571,7 +571,6 @@ moduleLocalDatabase:
 moduleLog:
   showLog: 로그 표시
 moduleMigration:
-  docUri: https://github.com/vrtmrz/obsidian-livesync/blob/main/README.md#how-to-use
   fix0256:
     buttons:
       checkItLater: 나중에 확인
@@ -631,19 +630,6 @@ moduleMigration:
 
     ___참고: 설정이 변경되고 데이터베이스를 다시 불러오기 전까지는 동기화가 불가능합니다.___
     ___참고2: 청크는 변경이 불가능한 구조이므로, 메타데이터와 차이점만 가져올 수 있습니다.___
-  msgInitialSetup: |-
-    이 기기는 **아직 초기 설정이 완료되지 않았습니다**. 지금부터 설정 과정을 안내해 드리겠습니다.
-
-    모든 대화 내용은 클립보드에 복사할 수 있습니다. 나중에 참고하려면 Obsidian 노트에 붙여넣거나 번역 도구를 활용해 번역하셔도 됩니다.
-
-    먼저, **Setup URI**를 가지고 계신가요?
-
-    참고: Setup URI가 무엇인지 잘 모르시겠다면 [문서](${URI_DOC})를 참고해 주세요.
-  msgRecommendSetupUri: |-
-    Setup URI를 생성해 사용하는 것을 강력히 권장합니다.
-    Setup URI가 무엇인지 잘 모르시겠다면 [문서](${URI_DOC})를 참고해 주세요. 중요한 내용이니 꼭 확인하시기 바랍니다.
-
-    직접 수동 설정을 진행하시겠습니까?
   msgSinceV02321: |-
     v0.23.21부터 Self-hosted LiveSync의 기본 동작 방식과 데이터베이스 구조가 변경되었습니다. 변경 내용은 다음과 같습니다:
 
@@ -664,18 +650,10 @@ moduleMigration:
   optionEnableBoth: 둘 다 활성화
   optionEnableFilenameCaseInsensitive: "#1만 활성화"
   optionEnableFixedRevisionForChunks: "#2만 활성화"
-  optionHaveSetupUri: 예, 있습니다
   optionKeepPreviousBehaviour: 이전 동작 유지
-  optionManualSetup: 모든 것을 수동으로 설정
   optionNoAskAgain: 아니요 (나중에 다시 물어보기)
-  optionNoSetupUri: 아니요, 없습니다
-  optionRemindNextLaunch: 다음 시작 시 알림
-  optionSetupViaP2P: "%{short_p2p_sync}를 사용하여 설정"
-  optionSetupWizard: 설정 마법사로 안내
   optionYesFetchAgain: 예 (다시 가져오기)
   titleCaseSensitivity: 대소문자 구분
-  titleRecommendSetupUri: Setup URI 사용 권장
-  titleWelcome: Self-hosted LiveSync에 오신 것을 환영합니다
 moduleObsidianMenu:
   replicate: 복제
 More actions: 추가 작업
@@ -722,12 +700,10 @@ obsidianLiveSyncSettingTab:
   btnEnable: 활성화
   btnFix: 수정
   btnGotItAndUpdated: 알겠습니다. 업데이트했습니다.
-  btnNext: 다음
   btnStart: 시작
   btnTest: 테스트
   btnUse: 사용
   buttonFetch: 가져오기
-  buttonNext: 다음
   defaultLanguage: 기본값
   descConnectSetupURI: 이것은 Setup URI로 Self-hosted LiveSync를 설정하는 권장 방법입니다.
   descCopySetupURI: 새 기기 설정에 완벽합니다!
@@ -793,7 +769,6 @@ obsidianLiveSyncSettingTab:
   msgEnableCorsChttpd: chttpd.enable_cors 설정
   msgEnableEncryptionRecommendation: 종단 간 암호화와 경로 난독화를 활성화하는 것을 권장합니다. 정말로 암호화 없이 계속하시겠습니까?
   msgFetchConfigFromRemote: 원격 서버에서 구성을 가져오시겠습니까?
-  msgGenerateSetupURI: 모든 작업이 완료되었습니다! 다른 기기를 설정하기 위해 Setup URI를 생성하시겠습니까?
   msgIfConfigNotPersistent: "서버 설정이 영구적으로 저장되지 않는 환경(예: Docker에서 실행 중)에서는 이곳의 값들이 변경될 수 있습니다. 연결이 가능해지면 서버의 local.ini 파일에서 설정을 수동으로 업데이트해 주세요."
   msgInvalidPassphrase: 암호화 패스프레이즈가 유효하지 않을 수 있습니다. 정말로 계속하시겠습니까?
   msgNewVersionNote: 업그레이드 알림으로 여기에 오셨나요? 버전 기록을 검토해 주세요. 만족하신다면 버튼을 클릭하세요. 새로운 업데이트 시 다시 안내됩니다.
@@ -835,7 +810,6 @@ obsidianLiveSyncSettingTab:
     원격 데이터베이스를 이미 재구축한 경우도 여기에 해당합니다.
     ## ${OPTION_ONLY_SETTING}
     설정만 저장합니다. **주의: 데이터가 손상될 수 있습니다.** 일반적으로는 데이터베이스 재구축이 필요합니다.
-  msgSelectAndApplyPreset: 마법사를 완료하려면 프리셋 항목을 선택하고 적용해 주세요.
   msgSetCorsCredentials: cors.credentials 설정
   msgSetCorsOrigins: cors.origins 설정
   msgSetMaxDocSize: couchdb.max_document_size 설정
@@ -892,7 +866,6 @@ obsidianLiveSyncSettingTab:
   titleActiveRemoteServer: 활성 원격 서버
   titleAppearance: 모양
   titleConflictResolution: 충돌 해결
-  titleCongratulations: 축하합니다!
   titleCouchDB: CouchDB
   titleDeletionPropagation: 삭제 전파
   titleEncryptionNotEnabled: 암호화가 활성화되지 않음

src/common/messagesYAML/ru.yaml

@@ -413,7 +413,6 @@ moduleLocalDatabase:
 moduleLog:
   showLog: Показать лог
 moduleMigration:
-  docUri: https://github.com/vrtmrz/obsidian-livesync/blob/main/README.md#how-to-use
   fix0256:
     buttons:
       checkItLater: Проверить позже
@@ -441,8 +440,6 @@ moduleMigration:
   logSetupCancelled: Настройка отменена, Self-hosted LiveSync ожидает вашей настройки!
   msgFetchRemoteAgain: Удалённая база данных, похоже, уже была мигрирована.
     Конфигурация этого устройства несовместима.
-  msgInitialSetup: Ваше устройство ещё не настроено. У вас есть Setup URI?
-  msgRecommendSetupUri: Мы рекомендуем сгенерировать Setup URI.
   msgSinceV02321: Начиная с v0.23.21, self-hosted LiveSync изменил поведение и
     структуру базы данных.
   optionAdjustRemote: Настроить под удалённую
@@ -450,18 +447,10 @@ moduleMigration:
   optionEnableBoth: Включить оба
   optionEnableFilenameCaseInsensitive: "Включить только #1"
   optionEnableFixedRevisionForChunks: "Включить только #2"
-  optionHaveSetupUri: Да, есть
   optionKeepPreviousBehaviour: Сохранить предыдущее поведение
-  optionManualSetup: Настроить всё вручную
   optionNoAskAgain: Нет, спросить снова
-  optionNoSetupUri: Нет, нет
-  optionRemindNextLaunch: Напомнить при следующем запуске
-  optionSetupViaP2P: Использовать short_p2p_sync для настройки
-  optionSetupWizard: Перейти в мастер настройки
   optionYesFetchAgain: Да, загрузить снова
   titleCaseSensitivity: Чувствительность к регистру
-  titleRecommendSetupUri: Рекомендация использовать Setup URI
-  titleWelcome: Добро пожаловать в Self-hosted LiveSync
 moduleObsidianMenu:
   replicate: Реплицировать
 More actions: Другие действия
@@ -492,12 +481,10 @@ obsidianLiveSyncSettingTab:
   btnEnable: Включить
   btnFix: Исправить
   btnGotItAndUpdated: Понял и обновил.
-  btnNext: Далее
   btnStart: Старт
   btnTest: Тест
   btnUse: Использовать
   buttonFetch: Загрузить
-  buttonNext: Далее
   defaultLanguage: По умолчанию
   descConnectSetupURI: Это рекомендуемый способ настройки Self-hosted LiveSync с помощью Setup URI.
   descCopySetupURI: Идеально подходит для настройки нового устройства!
@@ -562,7 +549,6 @@ obsidianLiveSyncSettingTab:
   msgEnableEncryptionRecommendation: Мы рекомендуем включить сквозное шифрование.
     Вы уверены, что хотите продолжить без шифрования?
   msgFetchConfigFromRemote: Вы хотите загрузить конфигурацию с удалённого сервера?
-  msgGenerateSetupURI: Всё готово! Вы хотите сгенерировать Setup URI для настройки других устройств?
   msgIfConfigNotPersistent: Если конфигурация сервера непостоянна, значения здесь могут измениться.
   msgInvalidPassphrase: Ваша парольная фраза шифрования может быть недействительна.
   msgNewVersionNote: Вы пришли из-за уведомления об обновлении? Просмотрите историю версий.
@@ -572,7 +558,6 @@ obsidianLiveSyncSettingTab:
   msgObjectStorageWarning: "ПРЕДУПРЕЖДЕНИЕ: Эта функция в разработке."
   msgOriginCheck: "Проверка origin: org"
   msgRebuildRequired: Требуется перестроение баз данных для применения изменений.
-  msgSelectAndApplyPreset: Выберите и примените любой пресет для завершения мастера.
   msgSetCorsCredentials: Установить cors.credentials
   msgSetCorsOrigins: Установить cors.origins
   msgSetMaxDocSize: Установить couchdb.max_document_size
@@ -629,7 +614,6 @@ obsidianLiveSyncSettingTab:
   titleActiveRemoteServer: Активный удалённый сервер
   titleAppearance: Внешний вид
   titleConflictResolution: Разрешение конфликтов
-  titleCongratulations: Поздравляем!
   titleCouchDB: Сервер CouchDB
   titleDeletionPropagation: Распространение удалений
   titleEncryptionNotEnabled: Шифрование не включено

src/common/messagesYAML/zh.yaml

@@ -358,7 +358,6 @@ moduleLocalDatabase:
 moduleLog:
   showLog: 显示日志
 moduleMigration:
-  docUri: https://github.com/vrtmrz/obsidian-livesync/blob/main/docs/zh/README_zh.md#%E5%A6%82%E4%BD%95%E4%BD%BF%E7%94%A8
   fix0256:
     buttons:
       checkItLater: 稍后检查
@@ -420,19 +419,6 @@ moduleMigration:
 
     ___注意:在更改配置并再次获取数据库之前,我们无法进行同步。___
     ___注意2:chunks 是完全不可变的,我们只能获取元数据和差异
-  msgInitialSetup: |-
-    您的设备**尚未设置**。让我引导您完成设置过程。
-
-    请记住,每个对话框内容都可以复制到剪贴板。如果以后需要参考,可以将其粘贴到 Obsidian 的笔记中。您也可以使用翻译工具将其翻译成您的语言。
-
-    首先,您有**设置 URI** 吗？
-
-    注意:如果您不知道这是什么,请参阅[文档](${URI_DOC})
-  msgRecommendSetupUri: |-
-    我们强烈建议您生成一个设置 URI 并使用它。
-    如果您对此不了解,请参阅[文档](${URI_DOC})(再次抱歉,但这很重要)。
-
-    您想如何手动设置?
   msgSinceV02321: |-
     自 v0.23.21 起,Self-hosted LiveSync 更改了默认行为和数据库结构。进行了以下更改：
 
@@ -453,18 +439,10 @@ moduleMigration:
   optionEnableBoth: 启用两者
   optionEnableFilenameCaseInsensitive: "仅启用 #1"
   optionEnableFixedRevisionForChunks: "仅启用 #2"
-  optionHaveSetupUri: 是的,我有
   optionKeepPreviousBehaviour: 保持以前的行为
-  optionManualSetup: 全部手动设置
   optionNoAskAgain: 不,请稍后再次询问
-  optionNoSetupUri: 不,我没有
-  optionRemindNextLaunch: 下次启动时提醒我
-  optionSetupViaP2P: Use %{short_p2p_sync} to set up
-  optionSetupWizard: 带我进入设置向导
   optionYesFetchAgain: 是的,再次获取
   titleCaseSensitivity: 大小写敏感性
-  titleRecommendSetupUri: 推荐使用设置 URI
-  titleWelcome: 欢迎使用 Self-hosted LiveSync
 moduleObsidianMenu:
   replicate: 复制
 More actions: 更多操作
@@ -490,12 +468,10 @@ obsidianLiveSyncSettingTab:
   btnEnable: 启用
   btnFix: 修复
   btnGotItAndUpdated: 我明白了并且已更新
-  btnNext: 下一步
   btnStart: 开始
   btnTest: 测试
   btnUse: 使用
   buttonFetch: 获取
-  buttonNext: 下一步
   defaultLanguage: 默认语言
   descConnectSetupURI: 这是使用设置 URI 设置 Self-hosted LiveSync 的推荐方法
   descCopySetupURI: 非常适合设置新设备！
@@ -560,7 +536,6 @@ obsidianLiveSyncSettingTab:
   msgEnableCorsChttpd: 设置 chttpd.enable_cors
   msgEnableEncryptionRecommendation: 建议启用端到端加密和路径混淆。你确定要在未加密的情况下继续吗？
   msgFetchConfigFromRemote: 要从远端服务器获取配置吗？
-  msgGenerateSetupURI: 全部完成！要生成设置 URI 以便配置其他设备吗？
   msgIfConfigNotPersistent: 如果服务器配置不是持久的(例如,在 docker 上运行),此处的值可能会更改。一旦能够连接,请更新服务器 local.ini 中的设置
   msgInvalidPassphrase: 你的加密密码短语可能无效。你确定要继续吗？
   msgNewVersionNote: 因为升级通知来到这里？请查看版本历史。如果您满意,请点击按钮。新的更新将再次提示此信息
@@ -602,7 +577,6 @@ obsidianLiveSyncSettingTab:
     这种情况包括您已经重建了远程数据库的情况。
     ## ${OPTION_ONLY_SETTING}
     仅存储设置。**注意：这可能导致数据损坏**；通常需要重建数据库
-  msgSelectAndApplyPreset: 请选择并应用任一预设项以完成向导。
   msgSetCorsCredentials: 设置 cors.credentials
   msgSetCorsOrigins: 设置 cors.origins
   msgSetMaxDocSize: 设置 couchdb.max_document_size
@@ -659,7 +633,6 @@ obsidianLiveSyncSettingTab:
   titleActiveRemoteServer: 活动远程服务器
   titleAppearance: 外观
   titleConflictResolution: 冲突处理
-  titleCongratulations: 恭喜！
   titleCouchDB: CouchDB 服务器
   titleDeletionPropagation: 删除传播
   titleEncryptionNotEnabled: 尚未启用加密

src/common/translation.unit.spec.ts

@@ -27,6 +27,12 @@ describe("LiveSync-owned translation catalogue", () => {
         expect(translateLiveSyncMessage("Active Remote Type")).toBe(englishMessageTranslator("Active Remote Type"));
     });
 
+    it("directs a compatibility pause to the dedicated review workflow", () => {
+        expect(translateLiveSyncMessage("Replicator.Message.VersionUpFlash")).toBe(
+            "Remote synchronisation is paused for compatibility review. Run the 'Review why synchronisation is paused' command for details and available actions."
+        );
+    });
+
     it("uses LiveSync-owned provisional English without extending Commonlib's message contract", () => {
         expect($msg("This file has unresolved conflicts.")).toBe("This file has unresolved conflicts.");
         expect($msg("More actions for ${DEVICE}", { DEVICE: "phone" })).toBe("More actions for phone");

src/deps.ts

@@ -16,6 +16,7 @@ export {
     requestUrl,
     sanitizeHTMLToDom,
     Setting,
+    SettingPage,
     stringifyYaml,
     TAbstractFile,
     TextAreaComponent,

src/features/ConfigSync/CmdConfigSync.command.unit.spec.ts

@@ -4,7 +4,6 @@ vi.mock("@/deps.ts", () => ({
     addIcon: vi.fn(),
     diff_match_patch: class DiffMatchPatch {},
     normalizePath: vi.fn((path: string) => path),
-    Notice: class Notice {},
     parseYaml: vi.fn(),
     Platform: {},
 }));
@@ -30,13 +29,10 @@ vi.mock("@/common/types.ts", () => ({
     PERIODIC_PLUGIN_SWEEP: 60,
 }));
 vi.mock("@/common/utils.ts", () => ({
+    cancelTask: vi.fn(),
     EVEN: Symbol("even"),
-    disposeMemoObject: vi.fn(),
     isCustomisationSyncMetadata: vi.fn(),
     isPluginMetadata: vi.fn(),
-    memoIfNotExist: vi.fn(),
-    memoObject: vi.fn(),
-    retrieveMemoObject: vi.fn(),
     scheduleTask: vi.fn(),
 }));
 vi.mock("@/common/PeriodicProcessor.ts", () => ({
@@ -55,6 +51,7 @@ vi.mock("@/common/obsidianCommunityPlugins.ts", () => ({
     getObsidianCommunityPluginManager: vi.fn(),
 }));
 
+import { cancelTask } from "@/common/utils.ts";
 import { ConfigSync } from "./CmdConfigSync";
 
 describe("ConfigSync commands", () => {
@@ -93,4 +90,24 @@ describe("ConfigSync commands", () => {
         expect(command?.checkCallback?.(false)).toBe(true);
         expect(showPluginSyncModal).toHaveBeenCalledOnce();
     });
+
+    it("cancels the pending configuration Notice before releasing its owned UI", () => {
+        const notices = { hide: vi.fn() };
+        const periodicPluginSweepProcessor = { disable: vi.fn() };
+        const configSync = Object.create(ConfigSync.prototype) as ConfigSync;
+        Object.assign(configSync, {
+            core: {
+                services: {
+                    context: { notices },
+                },
+            },
+            periodicPluginSweepProcessor,
+        });
+
+        configSync.onunload();
+
+        expect(cancelTask).toHaveBeenCalledWith("config-sync:updated-configuration");
+        expect(notices.hide).toHaveBeenCalledWith("config-sync:updated-configuration");
+        expect(periodicPluginSweepProcessor.disable).toHaveBeenCalledOnce();
+    });
 });

src/features/ConfigSync/CmdConfigSync.ts

@@ -1,7 +1,6 @@
 import { writable } from "svelte/store";
 import type PouchDB from "pouchdb-core";
 import {
-    Notice,
     type PluginManifest,
     parseYaml,
     normalizePath,
@@ -53,21 +52,11 @@ import {
 import { serialized, shareRunningResult } from "octagonal-wheels/concurrency/lock";
 import { LiveSyncCommands } from "@/features/LiveSyncCommands.ts";
 import { stripAllPrefixes } from "@vrtmrz/livesync-commonlib/compat/string_and_binary/path";
-import {
-    EVEN,
-    disposeMemoObject,
-    isCustomisationSyncMetadata,
-    isPluginMetadata,
-    memoIfNotExist,
-    memoObject,
-    retrieveMemoObject,
-    scheduleTask,
-} from "@/common/utils.ts";
+import { cancelTask, EVEN, isCustomisationSyncMetadata, isPluginMetadata, scheduleTask } from "@/common/utils.ts";
 import { PeriodicProcessor } from "@/common/PeriodicProcessor.ts";
 import { JsonResolveModal } from "@/features/HiddenFileCommon/JsonResolveModal.ts";
 import { QueueProcessor } from "octagonal-wheels/concurrency/processor";
 import { pluginScanningCount } from "@vrtmrz/livesync-commonlib/compat/mock_and_interop/stores";
-import type ObsidianLiveSyncPlugin from "@/main.ts";
 import { base64ToArrayBuffer, base64ToString } from "octagonal-wheels/binary/base64";
 import { ConflictResolveModal } from "@/modules/features/InteractiveConflictResolving/ConflictResolveModal.ts";
 import { Semaphore } from "octagonal-wheels/concurrency/semaphore";
@@ -82,6 +71,7 @@ import { getObsidianCommunityPluginManager } from "@/common/obsidianCommunityPlu
 
 const d = "\u200b";
 const d2 = "\n";
+const UPDATED_CONFIGURATION_NOTICE_KEY = "config-sync:updated-configuration";
 
 function serialize(data: PluginDataEx): string {
     // For higher performance, create custom plug-in data strings.
@@ -393,8 +383,8 @@ export type PluginDataEx = {
 };
 
 export class ConfigSync extends LiveSyncCommands {
-    constructor(plugin: ObsidianLiveSyncPlugin, core: LiveSyncCore) {
-        super(plugin, core);
+    constructor(core: LiveSyncCore) {
+        super(core);
         pluginScanningCount.onChanged((e) => {
             const total = e.value;
             pluginIsEnumerating.set(total != 0);
@@ -428,7 +418,7 @@ export class ConfigSync extends LiveSyncCommands {
         if (this.pluginDialog) {
             this.pluginDialog.open();
         } else {
-            this.pluginDialog = new PluginDialogModal(this.app, this.plugin);
+            this.pluginDialog = new PluginDialogModal(this.app, this.services.context.liveSyncPlugin);
             this.pluginDialog.open();
         }
     }
@@ -440,8 +430,10 @@ export class ConfigSync extends LiveSyncCommands {
         }
     }
     onunload() {
+        cancelTask(UPDATED_CONFIGURATION_NOTICE_KEY);
         this.hidePluginSyncModal();
         this.periodicPluginSweepProcessor?.disable();
+        this.services.context.notices.hide(UPDATED_CONFIGURATION_NOTICE_KEY);
     }
     addRibbonIcon = this.services.API.addRibbonIcon.bind(this.services.API);
     onload() {
@@ -1196,22 +1188,9 @@ export class ConfigSync extends LiveSyncCommands {
                     });
                 });
 
-                const updatedPluginKey = "popupUpdated-plugins";
-                scheduleTask(updatedPluginKey, 1000, async () => {
-                    const popup = await memoIfNotExist(updatedPluginKey, () => new Notice(fragment, 0));
-                    //@ts-ignore -- retained for compatibility with Obsidian versions before Notice.messageEl.
-                    const isShown = popup?.noticeEl?.isShown();
-                    if (!isShown) {
-                        memoObject(updatedPluginKey, new Notice(fragment, 0));
-                    }
-                    scheduleTask(updatedPluginKey + "-close", 20000, () => {
-                        const popup = retrieveMemoObject<Notice>(updatedPluginKey);
-                        if (!popup) return;
-                        //@ts-ignore -- retained for compatibility with Obsidian versions before Notice.messageEl.
-                        if (popup?.noticeEl?.isShown()) {
-                            popup.hide();
-                        }
-                        disposeMemoObject(updatedPluginKey);
+                scheduleTask(UPDATED_CONFIGURATION_NOTICE_KEY, 1000, () => {
+                    this.services.context.notices.show(UPDATED_CONFIGURATION_NOTICE_KEY, fragment, {
+                        durationMs: 20_000,
                     });
                 });
             }
@@ -1716,8 +1695,6 @@ export class ConfigSync extends LiveSyncCommands {
     }
     async configureHiddenFileSync(mode: OptionalSyncFeatureMode) {
         if (mode == "DISABLE") {
-            // this.plugin.settings.usePluginSync = false;
-            // await this.plugin.saveSettings();
             await this.core.services.setting.applyPartial(
                 {
                     usePluginSync: false,
@@ -1758,9 +1735,6 @@ export class ConfigSync extends LiveSyncCommands {
                 }
                 this.services.setting.setDeviceAndVaultName(name);
             }
-            // this.core.settings.usePluginSync = true;
-            // this.core.settings.useAdvancedMode = true;
-            // await this.core.saveSettings();
             await this.core.services.setting.applyPartial(
                 {
                     usePluginSync: true,

src/features/LiveSyncCommands.ts

@@ -8,7 +8,6 @@ import {
     type FilePathWithPrefix,
     type LOG_LEVEL,
 } from "@vrtmrz/livesync-commonlib/compat/common/types";
-import type ObsidianLiveSyncPlugin from "@/main.ts";
 import { MARK_DONE } from "@/modules/features/ModuleLog.ts";
 import type { LiveSyncCore } from "@/main.ts";
 // import { __$checkInstanceBinding } from "@vrtmrz/livesync-commonlib/compat/dev/checks";
@@ -16,13 +15,9 @@ import { createInstanceLogFunction } from "@vrtmrz/livesync-commonlib/compat/ser
 
 let noticeIndex = 0;
 export abstract class LiveSyncCommands {
-    /**
-     * @deprecated This class is deprecated. Please use core
-     */
-    plugin: ObsidianLiveSyncPlugin;
     core: LiveSyncCore;
     get app() {
-        return this.plugin.app;
+        return this.services.context.app;
     }
     get settings() {
         return this.core.settings;
@@ -34,9 +29,6 @@ export abstract class LiveSyncCommands {
         return this.core.services;
     }
 
-    // id2path(id: DocumentID, entry?: EntryHasPath, stripPrefix?: boolean): FilePathWithPrefix {
-    //     return this.plugin.$$id2path(id, entry, stripPrefix);
-    // }
     async path2id(filename: FilePathWithPrefix | FilePath, prefix?: string): Promise<DocumentID> {
         return await this.services.path.path2id(filename, prefix);
     }
@@ -45,8 +37,7 @@ export abstract class LiveSyncCommands {
         return this.services.path.getPath(entry);
     }
 
-    constructor(plugin: ObsidianLiveSyncPlugin, core: LiveSyncCore) {
-        this.plugin = plugin;
+    constructor(core: LiveSyncCore) {
         this.core = core;
         this.onBindFunction(this.core, this.core.services);
         this._log = createInstanceLogFunction(this.constructor.name, this.services.API);

src/features/LocalDatabaseMainte/CmdLocalDatabaseMainte.integration.spec.ts

@@ -95,18 +95,19 @@ function requiredEnvironment(name: "hostname" | "username" | "password"): string
 describe("LocalDatabaseMaintenance Garbage Collection V3 with CouchDB", () => {
     it("propagates collection safely, completes compaction, and permits content-addressed chunk recreation", async () => {
         const databaseName = `livesync-gcv3-${crypto.randomUUID()}`;
-        const local = new PouchDB<FixtureContent>(`${databaseName}-source`, { adapter: "memory" });
-        const replica = new PouchDB<FixtureContent>(`${databaseName}-replica`, { adapter: "memory" });
-        const remote = new PouchDB<FixtureContent>(
-            `${requiredEnvironment("hostname").replace(/\/+$/u, "")}/${databaseName}`,
-            {
+        const createRemote = () =>
+            new PouchDB<FixtureContent>(`${requiredEnvironment("hostname").replace(/\/+$/u, "")}/${databaseName}`, {
                 adapter: "http",
                 auth: {
                     username: requiredEnvironment("username"),
                     password: requiredEnvironment("password"),
                 },
-            }
-        );
+            });
+        const local = new PouchDB<FixtureContent>(`${databaseName}-source`, { adapter: "memory" });
+        const replica = new PouchDB<FixtureContent>(`${databaseName}-replica`, { adapter: "memory" });
+        const remote = createRemote();
+        const maintenanceRemote = createRemote();
+        const closeMaintenanceRemote = vi.spyOn(maintenanceRemote, "close");
 
         try {
             await remote.info();
@@ -178,7 +179,7 @@ describe("LocalDatabaseMaintenance Garbage Collection V3 with CouchDB", () => {
                         },
                     })
                 ),
-                connectRemoteCouchDBWithSetting: vi.fn(() => Promise.resolve({ db: remote })),
+                connectRemoteCouchDBWithSetting: vi.fn(() => Promise.resolve({ db: maintenanceRemote })),
             };
             const notice = vi.fn();
             const maintenance = Object.create(LocalDatabaseMaintenance.prototype) as LocalDatabaseMaintenance;
@@ -201,6 +202,7 @@ describe("LocalDatabaseMaintenance Garbage Collection V3 with CouchDB", () => {
 
             await maintenance.gcv3();
 
+            expect(closeMaintenanceRemote).toHaveBeenCalledOnce();
             expect(replicationModes).toEqual(["sync", "pushOnly"]);
             expect(clearHash).toHaveBeenCalledOnce();
             expect(notice).toHaveBeenCalledWith("Compaction on remote database completed successfully.", "gc-compact");
@@ -251,6 +253,9 @@ describe("LocalDatabaseMaintenance Garbage Collection V3 with CouchDB", () => {
                 data: "recreated",
             });
         } finally {
+            if (closeMaintenanceRemote.mock.calls.length === 0) {
+                await maintenanceRemote.close();
+            }
             await Promise.all([local.destroy(), replica.destroy(), remote.destroy()]);
         }
     }, 30_000);

src/features/LocalDatabaseMainte/CmdLocalDatabaseMainte.ts

@@ -35,7 +35,7 @@ export class LocalDatabaseMaintenance extends LiveSyncCommands {
     }
     onload(): void | Promise<void> {
         // NO OP.
-        this.plugin.addCommand({
+        this.services.API.addCommand({
             id: "analyse-database",
             name: "Analyse Database Usage (advanced)",
             icon: "database-search",
@@ -47,7 +47,7 @@ export class LocalDatabaseMaintenance extends LiveSyncCommands {
                 return true;
             },
         });
-        this.plugin.addCommand({
+        this.services.API.addCommand({
             id: "gc-v3",
             name: "Garbage Collection V3 (advanced, beta)",
             icon: "trash-2",
@@ -747,29 +747,33 @@ Success: ${successCount}, Errored: ${errored}`;
             this._notice(`Failed to connect to remote for compaction. ${remote}`, "gc-compact");
             return;
         }
-        const compactResult = await remote.db.compact({
-            interval: 1000,
-        });
-        // Probably no need to wait, but just in case.
-        let timeout = 2 * 60 * 1000; // 2 minutes
-        for (;;) {
-            const status = await remote.db.info();
-            if ("compact_running" in status && status?.compact_running) {
-                this._notice("Compaction in progress on remote database...", "gc-compact");
-                await delay(2000);
-                timeout -= 2000;
-                if (timeout <= 0) {
-                    this._notice("Compaction on remote database timed out.", "gc-compact");
-                    return;
+        try {
+            const compactResult = await remote.db.compact({
+                interval: 1000,
+            });
+            // Probably no need to wait, but just in case.
+            let timeout = 2 * 60 * 1000; // 2 minutes
+            for (;;) {
+                const status = await remote.db.info();
+                if ("compact_running" in status && status?.compact_running) {
+                    this._notice("Compaction in progress on remote database...", "gc-compact");
+                    await delay(2000);
+                    timeout -= 2000;
+                    if (timeout <= 0) {
+                        this._notice("Compaction on remote database timed out.", "gc-compact");
+                        return;
+                    }
+                } else {
+                    break;
                 }
-            } else {
-                break;
             }
-        }
-        if (compactResult && "ok" in compactResult) {
-            this._notice("Compaction on remote database completed successfully.", "gc-compact");
-        } else {
-            this._notice("Compaction on remote database failed.", "gc-compact");
+            if (compactResult && "ok" in compactResult) {
+                this._notice("Compaction on remote database completed successfully.", "gc-compact");
+            } else {
+                this._notice("Compaction on remote database failed.", "gc-compact");
+            }
+        } finally {
+            await remote.db.close();
         }
     }
 

src/features/LocalDatabaseMainte/CmdLocalDatabaseMainte.unit.spec.ts

@@ -18,10 +18,13 @@ vi.mock("@vrtmrz/livesync-commonlib/compat/common/utils", async (importOriginal)
 });
 vi.mock("@/features/LiveSyncCommands", () => ({
     LiveSyncCommands: class LiveSyncCommands {
-        core!: { settings: unknown };
+        core!: { settings: unknown; services: unknown };
         get settings() {
             return this.core.settings;
         }
+        get services() {
+            return this.core.services;
+        }
     },
 }));
 vi.mock("@/common/events", () => ({
@@ -76,11 +79,13 @@ describe("LocalDatabaseMaintenance prerequisites", () => {
         };
         const maintenance = Object.create(LocalDatabaseMaintenance.prototype) as LocalDatabaseMaintenance;
         Object.assign(maintenance, {
-            plugin: {
-                addCommand: vi.fn((command) => commands.push(command)),
-            },
             core: {
                 settings,
+                services: {
+                    API: {
+                        addCommand: vi.fn((command) => commands.push(command)),
+                    },
+                },
             },
             _isDatabaseReady: vi.fn(() => true),
         });
@@ -222,6 +227,7 @@ describe("LocalDatabaseMaintenance Garbage Collection V3", () => {
         const remoteDatabase = {
             compact: vi.fn(async () => ({ ok: true })),
             info: vi.fn(async () => ({ compact_running: true })),
+            close: vi.fn(async () => undefined),
         };
         Object.assign(maintenance, {
             core: {
@@ -243,6 +249,7 @@ describe("LocalDatabaseMaintenance Garbage Collection V3", () => {
             "Compaction on remote database completed successfully.",
             "gc-compact"
         );
+        expect(remoteDatabase.close).toHaveBeenCalledOnce();
     });
 
     it.each([

src/main.ts

@@ -120,6 +120,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
             UI: services.UI,
             vault: services.vault,
             fileHandler: fileHandler,
+            fileProcessing: services.fileProcessing,
             storageAccess: storageAccess,
             control: services.control,
         });
@@ -169,11 +170,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
                 return extraModules;
             },
             (core) => {
-                const addOns = [
-                    new ConfigSync(this, core),
-                    new HiddenFileSync(this, core),
-                    new LocalDatabaseMaintenance(this, core),
-                ];
+                const addOns = [new ConfigSync(core), new HiddenFileSync(core), new LocalDatabaseMaintenance(core)];
                 return addOns;
             },
             (core) => {

src/modules/AbstractObsidianModule.ts

@@ -2,7 +2,11 @@ import type { LiveSyncCore } from "@/main";
 import type ObsidianLiveSyncPlugin from "@/main";
 import { AbstractModule } from "./AbstractModule.ts";
 
-export abstract class AbstractObsidianModule extends AbstractModule {
+export abstract class AbstractObsidianModule extends AbstractModule<LiveSyncCore> {
+    override get services() {
+        return this.core.services;
+    }
+
     get app() {
         return this.plugin.app;
     }

src/modules/core/ModuleReplicator.ts

@@ -22,6 +22,7 @@ import { UnresolvedErrorManager } from "@vrtmrz/livesync-commonlib/compat/servic
 import { clearHandlers } from "@vrtmrz/livesync-commonlib/compat/replication/SyncParamsHandler";
 import type { NecessaryServices } from "@vrtmrz/livesync-commonlib/compat/interfaces/ServiceModule";
 import { MARK_LOG_NETWORK_ERROR } from "@vrtmrz/livesync-commonlib/compat/services/lib/logUtils";
+import { usesLegacyIndexedDBAdapter } from "@/common/compatibilitySettings.ts";
 
 function isOnlineAndCanReplicate(
     errorManager: UnresolvedErrorManager,
@@ -145,10 +146,12 @@ export class ModuleReplicator extends AbstractModule {
     }
 
     /**
-     * Reconciles local chunks when an older IndexedDB client reports that the remote database was cleaned.
-     * This compatibility path remains reachable while those clients can still set `remoteCleaned`.
-     * @deprecated v0.24.17
-     * @param showMessage If true, show message to the user.
+     * Reconciles an IndexedDB-backed local database after replication reports that the remote was cleaned.
+     *
+     * The remote milestone remains a supported compatibility signal. The user can either fetch the remote
+     * database again, or purge unreferenced local chunks before accepting this device again.
+     *
+     * @param showMessage Whether to show the recovery choices as user-facing notices.
      */
     async cleaned(showMessage: boolean) {
         Logger(`The remote database has been cleaned.`, showMessage ? LOG_LEVEL_NOTICE : LOG_LEVEL_INFO);
@@ -187,27 +190,31 @@ Even if you choose to clean up, you will see this option again if you exit Obsid
                             return false;
                         }
 
-                        await purgeUnreferencedChunks(this.localDatabase.localDatabase, false);
-                        this.localDatabase.clearCaches();
-                        // Perform the synchronisation once.
-                        const replicated = await this.services.replicator.runFiniteReplicationActivity(
-                            () => this.core.replicator.openReplication(this.settings, false, showMessage, true),
-                            { label: "replication" }
-                        );
-                        if (replicated) {
-                            await balanceChunkPurgedDBs(this.localDatabase.localDatabase, remoteDB.db);
+                        try {
                             await purgeUnreferencedChunks(this.localDatabase.localDatabase, false);
                             this.localDatabase.clearCaches();
-                            await this.services.replicator.getActiveReplicator()?.markRemoteResolved(this.settings);
-                            Logger(
-                                "The local database has been cleaned up.",
-                                showMessage ? LOG_LEVEL_NOTICE : LOG_LEVEL_INFO
-                            );
-                        } else {
-                            Logger(
-                                "Replication has been cancelled. Please try it again.",
-                                showMessage ? LOG_LEVEL_NOTICE : LOG_LEVEL_INFO
+                            // Perform the synchronisation once.
+                            const replicated = await this.services.replicator.runFiniteReplicationActivity(
+                                () => this.core.replicator.openReplication(this.settings, false, showMessage, true),
+                                { label: "replication" }
                             );
+                            if (replicated) {
+                                await balanceChunkPurgedDBs(this.localDatabase.localDatabase, remoteDB.db);
+                                await purgeUnreferencedChunks(this.localDatabase.localDatabase, false);
+                                this.localDatabase.clearCaches();
+                                await this.services.replicator.getActiveReplicator()?.markRemoteResolved(this.settings);
+                                Logger(
+                                    "The local database has been cleaned up.",
+                                    showMessage ? LOG_LEVEL_NOTICE : LOG_LEVEL_INFO
+                                );
+                            } else {
+                                Logger(
+                                    "Replication has been cancelled. Please try it again.",
+                                    showMessage ? LOG_LEVEL_NOTICE : LOG_LEVEL_INFO
+                                );
+                            }
+                        } finally {
+                            await remoteDB.db.close();
                         }
                     },
                     { label: "database-cleanup" }
@@ -226,7 +233,7 @@ Even if you choose to clean up, you will see this option again if you exit Obsid
             await this.services.tweakValue.askResolvingMismatched(activeReplicator.preferredTweakValue);
         } else {
             if (activeReplicator.remoteLockedAndDeviceNotAccepted) {
-                if (activeReplicator.remoteCleaned && this.settings.useIndexedDBAdapter) {
+                if (activeReplicator.remoteCleaned && usesLegacyIndexedDBAdapter(this.settings)) {
                     await this.cleaned(showMessage);
                 } else {
                     const message = $msg("Replicator.Dialogue.Locked.Message");

src/modules/core/ModuleReplicator.unit.spec.ts

@@ -128,8 +128,11 @@ describe("compatibility: cleaned-remote reconciliation for IndexedDB clients", (
         });
         const runFiniteReplicationActivity = vi.fn(async (task: () => unknown) => await task());
         const openReplication = vi.fn(async () => true);
+        const remoteDatabase = {
+            close: vi.fn(async () => undefined),
+        };
         const activeReplicator = Object.assign(new LiveSyncCouchDBReplicator({} as any), {
-            connectRemoteCouchDBWithSetting: vi.fn(async () => ({ db: {} })),
+            connectRemoteCouchDBWithSetting: vi.fn(async () => ({ db: remoteDatabase })),
             markRemoteResolved: vi.fn(async () => undefined),
         });
         const services = {
@@ -177,5 +180,9 @@ describe("compatibility: cleaned-remote reconciliation for IndexedDB clients", (
         expect(openReplication).toHaveBeenCalledOnce();
         expect(openReplication.mock.invocationCallOrder[0]).toBeLessThan(activityFinished.mock.invocationCallOrder[0]);
         expect(chunkMocks.balanceChunkPurgedDBs).toHaveBeenCalledOnce();
+        expect(remoteDatabase.close).toHaveBeenCalledOnce();
+        expect(remoteDatabase.close.mock.invocationCallOrder[0]).toBeLessThan(
+            activityFinished.mock.invocationCallOrder[0]
+        );
     });
 });

src/modules/coreFeatures/ModuleResolveMismatchedTweaks.ts

@@ -4,7 +4,8 @@ import {
     TweakValuesShouldMatchedTemplate,
     TweakValuesTemplate,
     IncompatibleChanges,
-    confName,
+    configurationNames,
+    statusDisplay,
     type TweakValues,
     type ObsidianLiveSyncSettings,
     type RemoteDBSettings,
@@ -15,11 +16,21 @@ import {
 } from "@vrtmrz/livesync-commonlib/compat/common/types";
 import { escapeMarkdownValue } from "@vrtmrz/livesync-commonlib/compat/common/utils";
 import { AbstractModule } from "@/modules/AbstractModule.ts";
-import { $msg } from "@/common/translation";
+import { $msg, translateIfAvailable } from "@/common/translation";
 import type { InjectableServiceHub } from "@vrtmrz/livesync-commonlib/compat/services/implements/injectable/InjectableServiceHub";
 import type { LiveSyncCore } from "@/main.ts";
 import { REMOTE_P2P } from "@vrtmrz/livesync-commonlib/compat/common/models/setting.const";
 
+/**
+ * Localised counterpart of Commonlib's `confName()`, which takes no translator.
+ * Same shape: label plus status suffix, and an empty string for an unknown key.
+ */
+function localisedConfName(key: keyof ObsidianLiveSyncSettings): string {
+    const info = configurationNames[key];
+    if (!info) return "";
+    return `${translateIfAvailable(info.name)}${statusDisplay(info.status)}`;
+}
+
 function valueToString(value: string | number | boolean | object | undefined): string {
     if (typeof value === "boolean") {
         return value ? "true" : "false";
@@ -158,7 +169,7 @@ export class ModuleResolvingMismatchedTweaks extends AbstractModule {
             // table += `| ${confName(key)} | ${valueMine} | ${valuePreferred} | \n`;
             tableRows.push(
                 $msg("TweakMismatchResolve.Table.Row", {
-                    name: confName(key),
+                    name: localisedConfName(key),
                     self: valueToString(valueMine),
                     remote: valueToString(valuePreferred),
                 })
@@ -342,7 +353,7 @@ export class ModuleResolvingMismatchedTweaks extends AbstractModule {
             }
             tableRows.push(
                 $msg("TweakMismatchResolve.Table.Row", {
-                    name: confName(key),
+                    name: localisedConfName(key),
                     self: currentValueForDisplay,
                     remote: remoteValueForDisplay,
                 })

src/modules/coreFeatures/ModuleResolveMismatchedTweaks.unit.spec.ts

@@ -1,4 +1,4 @@
-import { describe, expect, it, vi } from "vitest";
+import { afterEach, describe, expect, it, vi } from "vitest";
 import {
     DEFAULT_SETTINGS,
     REMOTE_COUCHDB,
@@ -6,6 +6,7 @@ import {
     type TweakValues,
 } from "@vrtmrz/livesync-commonlib/compat/common/types";
 import { ModuleResolvingMismatchedTweaks } from "./ModuleResolveMismatchedTweaks";
+import { setLang } from "@/common/translation";
 
 function createModule(settingsOverride: Partial<typeof DEFAULT_SETTINGS> = {}) {
     const askSelectStringDialogue = vi.fn(async (..._args: unknown[]): Promise<string | undefined> => undefined);
@@ -255,3 +256,43 @@ describe("ModuleResolvingMismatchedTweaks", () => {
         expect(calls).toEqual(["save", "reinitialise", "set-preferred"]);
     });
 });
+
+describe("ModuleResolvingMismatchedTweaks setting labels", () => {
+    afterEach(() => setLang("def"));
+
+    async function renderMismatchTable() {
+        const { module, askSelectStringDialogue } = createModule({
+            autoAcceptCompatibleTweak: true,
+            hashAlg: "xxhash64",
+            encrypt: false,
+            tweakModified: 100,
+        });
+        const preferred = {
+            ...(DEFAULT_SETTINGS as unknown as TweakValues),
+            hashAlg: "xxhash32",
+            encrypt: true,
+            tweakModified: 200,
+        } as Partial<TweakValues>;
+
+        await module._checkAndAskResolvingMismatchedTweaks(preferred);
+
+        return String(askSelectStringDialogue.mock.calls[0]?.[0] ?? "");
+    }
+
+    it("localises the setting names and keeps the status suffix", async () => {
+        setLang("zh-tw");
+
+        const message = await renderMismatchTable();
+
+        expect(message).toContain("chunk ID 的雜湊演算法 (Experimental)");
+        expect(message).toContain("端對端加密");
+        expect(message).not.toContain("The Hash algorithm for chunk IDs");
+    });
+
+    it("leaves English unchanged", async () => {
+        const message = await renderMismatchTable();
+
+        expect(message).toContain("The Hash algorithm for chunk IDs (Experimental)");
+        expect(message).toContain("End-to-End Encryption");
+    });
+});

src/modules/essential/ModuleMigration.ts

@@ -4,14 +4,7 @@ import {
     LOG_LEVEL_VERBOSE,
     Logger,
 } from "@vrtmrz/livesync-commonlib/compat/common/logger";
-import {
-    EVENT_REQUEST_OPEN_P2P,
-    EVENT_REQUEST_OPEN_SETTING_WIZARD,
-    EVENT_REQUEST_OPEN_SETTINGS,
-    EVENT_REQUEST_RUN_DOCTOR,
-    EVENT_REQUEST_RUN_FIX_INCOMPLETE,
-    eventHub,
-} from "@/common/events.ts";
+import { EVENT_REQUEST_RUN_DOCTOR, EVENT_REQUEST_RUN_FIX_INCOMPLETE, eventHub } from "@/common/events.ts";
 import { AbstractModule } from "@/modules/AbstractModule.ts";
 import { $msg } from "@/common/translation";
 import { performDoctorConsultation, RebuildOptions } from "@vrtmrz/livesync-commonlib/compat/common/configForDoc";
@@ -31,6 +24,7 @@ import {
     runConfiguredStartupLifecycle,
     runStartupEntryLifecycle,
 } from "@/serviceFeatures/configuredStartupLifecycle.ts";
+import { disableLegacyBulkChunkPreSend } from "@/common/compatibilitySettings.ts";
 
 type ErrorInfo = {
     path: string;
@@ -84,10 +78,8 @@ export class ModuleMigration extends AbstractModule<LiveSyncCore> {
     }
 
     async migrateDisableBulkSend() {
-        if (this.settings.sendChunksBulk) {
+        if (disableLegacyBulkChunkPreSend(this.settings)) {
             this._log($msg("moduleMigration.logBulkSendCorrupted"), LOG_LEVEL_NOTICE);
-            this.settings.sendChunksBulk = false;
-            this.settings.sendChunksBulkMaxSize = 1;
             await this.saveSettings();
         }
     }
@@ -95,53 +87,6 @@ export class ModuleMigration extends AbstractModule<LiveSyncCore> {
     initialMessage() {
         const manager = this.core.getModule(SetupManager);
         showOnboardingInvitation(this.core, manager);
-        /*
-        const message = $msg("moduleMigration.msgInitialSetup", {
-            URI_DOC: $msg("moduleMigration.docUri"),
-        });
-        const USE_SETUP = $msg("moduleMigration.optionHaveSetupUri");
-        const NEXT = $msg("moduleMigration.optionNoSetupUri");
-
-        const ret = await this.core.confirm.askSelectStringDialogue(message, [USE_SETUP, NEXT], {
-            title: $msg("moduleMigration.titleWelcome"),
-            defaultAction: USE_SETUP,
-        });
-        if (ret === USE_SETUP) {
-            eventHub.emitEvent(EVENT_REQUEST_OPEN_SETUP_URI);
-            return false;
-        } else if (ret == NEXT) {
-            return true;
-        }
-        return false;
-        */
-    }
-
-    async askAgainForSetupURI() {
-        const message = $msg("moduleMigration.msgRecommendSetupUri", { URI_DOC: $msg("moduleMigration.docUri") });
-        const USE_MINIMAL = $msg("moduleMigration.optionSetupWizard");
-        const USE_P2P = $msg("moduleMigration.optionSetupViaP2P");
-        const USE_SETUP = $msg("moduleMigration.optionManualSetup");
-        const NEXT = $msg("moduleMigration.optionRemindNextLaunch");
-
-        const ret = await this.core.confirm.askSelectStringDialogue(message, [USE_MINIMAL, USE_SETUP, USE_P2P, NEXT], {
-            title: $msg("moduleMigration.titleRecommendSetupUri"),
-            defaultAction: USE_MINIMAL,
-        });
-        if (ret === USE_MINIMAL) {
-            eventHub.emitEvent(EVENT_REQUEST_OPEN_SETTING_WIZARD);
-            return false;
-        }
-        if (ret === USE_P2P) {
-            eventHub.emitEvent(EVENT_REQUEST_OPEN_P2P);
-            return false;
-        }
-        if (ret === USE_SETUP) {
-            eventHub.emitEvent(EVENT_REQUEST_OPEN_SETTINGS);
-            return false;
-        } else if (ret == NEXT) {
-            return false;
-        }
-        return false;
     }
 
     async hasIncompleteDocs(force: boolean = false): Promise<boolean> {

src/modules/essential/ModuleMigration.unit.spec.ts

@@ -18,7 +18,10 @@ async function* failedDocumentScan() {
     throw new Error("scan failed");
 }
 
-function createMigration(findAllNormalDocs: typeof noDocuments | typeof failedDocumentScan = noDocuments) {
+function createMigration(
+    findAllNormalDocs: typeof noDocuments | typeof failedDocumentScan = noDocuments,
+    settings = { sendChunksBulk: false, sendChunksBulkMaxSize: 1 }
+) {
     const noticeGroups = {
         setItem: vi.fn(),
         finish: vi.fn(() => true),
@@ -32,6 +35,7 @@ function createMigration(findAllNormalDocs: typeof noDocuments | typeof failedDo
             registerProtocolHandler: vi.fn(),
         },
         context: { noticeGroups },
+        setting: { saveSettingData: vi.fn(async () => undefined) },
         vault: { isTargetFile: vi.fn(async () => true) },
         path: { getPath: vi.fn() },
     };
@@ -44,13 +48,37 @@ function createMigration(findAllNormalDocs: typeof noDocuments | typeof failedDo
         },
         localDatabase: { findAllNormalDocs },
         storageAccess: {},
+        settings,
     };
     return {
         migration: new ModuleMigration(core as never),
         noticeGroups,
+        saveSettingData: services.setting.saveSettingData,
     };
 }
 
+describe("ModuleMigration obsolete-setting migration", () => {
+    it("persists the removal of an enabled automatic bulk chunk pre-send setting", async () => {
+        const settings = { sendChunksBulk: true, sendChunksBulkMaxSize: 16 };
+        const { migration, saveSettingData } = createMigration(noDocuments, settings);
+
+        await migration.migrateDisableBulkSend();
+
+        expect(settings).toEqual({ sendChunksBulk: false, sendChunksBulkMaxSize: 1 });
+        expect(saveSettingData).toHaveBeenCalledOnce();
+    });
+
+    it("does not persist an already disabled automatic bulk chunk pre-send setting", async () => {
+        const settings = { sendChunksBulk: false, sendChunksBulkMaxSize: 16 };
+        const { migration, saveSettingData } = createMigration(noDocuments, settings);
+
+        await migration.migrateDisableBulkSend();
+
+        expect(settings).toEqual({ sendChunksBulk: false, sendChunksBulkMaxSize: 16 });
+        expect(saveSettingData).not.toHaveBeenCalled();
+    });
+});
+
 describe("ModuleMigration incomplete-document notice", () => {
     it("keeps the check and its result in one persistent named group", async () => {
         const { migration, noticeGroups } = createMigration();

src/modules/essentialObsidian/APILib/ObsHttpHandler.ts

@@ -4,7 +4,8 @@
 // Original Implementation is here: https://github.com/remotely-save/remotely-save/blob/28b99557a864ef59c19d2ad96101196e401718f0/src/remoteForS3.ts
 
 import { FetchHttpHandler, type FetchHttpHandlerOptions } from "@smithy/fetch-http-handler";
-import { HttpRequest, HttpResponse, type HttpHandlerOptions } from "@smithy/protocol-http";
+import { HttpRequest, HttpResponse } from "@smithy/protocol-http";
+import type { HttpHandlerOptions } from "@smithy/types";
 import { buildQueryString } from "@smithy/querystring-builder";
 import { requestUrl, type RequestUrlParam } from "@/deps.ts";
 import { compatGlobal } from "@vrtmrz/livesync-commonlib/compat/common/coreEnvFunctions";

src/modules/extras/ModuleDev.ts

@@ -2,12 +2,9 @@ import { delay } from "octagonal-wheels/promises";
 import { __onMissingTranslation } from "@/common/translation";
 import { AbstractObsidianModule } from "@/modules/AbstractObsidianModule.ts";
 import { LOG_LEVEL_VERBOSE } from "octagonal-wheels/common/logger";
-// import { enableTestFunction } from "./devUtil/testUtils.ts";
-import { TestPaneView, VIEW_TYPE_TEST } from "./devUtil/TestPaneView.ts";
 import { writable } from "svelte/store";
 import type { FilePathWithPrefix } from "@vrtmrz/livesync-commonlib/compat/common/types";
 import type { LiveSyncCore } from "@/main.ts";
-import type { WorkspaceLeaf } from "@/deps.ts";
 export class ModuleDev extends AbstractObsidianModule {
     _everyOnloadStart(): Promise<boolean> {
         __onMissingTranslation(() => {});
@@ -35,25 +32,8 @@ export class ModuleDev extends AbstractObsidianModule {
         }
     }
 
-    private _everyOnloadAfterLoadSettings(): Promise<boolean> {
-        if (!this.settings.enableDebugTools) return Promise.resolve(true);
-        this.registerView(VIEW_TYPE_TEST, (leaf: WorkspaceLeaf) => new TestPaneView(leaf, this.plugin, this));
-        this.addCommand({
-            id: "view-test",
-            name: "Open Test dialogue",
-            callback: () => {
-                void this.services.API.showWindow(VIEW_TYPE_TEST);
-            },
-        });
-        return Promise.resolve(true);
-    }
-
     async _everyOnLayoutReady(): Promise<boolean> {
         if (!this.settings.enableDebugTools) return Promise.resolve(true);
-        // if (await this.core.storageAccess.isExistsIncludeHidden("_SHOWDIALOGAUTO.md")) {
-        //     void this.core.$$showView(VIEW_TYPE_TEST);
-        // }
-
         this.addCommand({
             id: "test-create-conflict",
             name: "Create conflict",
@@ -110,7 +90,6 @@ export class ModuleDev extends AbstractObsidianModule {
     override onBindFunction(core: LiveSyncCore, services: typeof core.services): void {
         services.appLifecycle.onLayoutReady.addHandler(this._everyOnLayoutReady.bind(this));
         services.appLifecycle.onInitialise.addHandler(this._everyOnloadStart.bind(this));
-        services.appLifecycle.onSettingLoaded.addHandler(this._everyOnloadAfterLoadSettings.bind(this));
         services.test.test.addHandler(this._everyModuleTest.bind(this));
         services.test.addTestResult.setHandler(this._addTestResult.bind(this));
     }

src/modules/extras/devUtil/TestPane.svelte

@@ -1,118 +0,0 @@
-<script lang="ts">
-    import { onMount } from "svelte";
-    import type ObsidianLiveSyncPlugin from "@/main.ts";
-    import { perf_trench } from "./tests.ts";
-    import { MarkdownRenderer, Notice } from "@/deps.ts";
-    import type { ModuleDev } from "@/modules/extras/ModuleDev.ts";
-    import { fireAndForget } from "octagonal-wheels/promises";
-    import { EVENT_LAYOUT_READY, eventHub } from "@/common/events.ts";
-    export let plugin: ObsidianLiveSyncPlugin;
-    export let moduleDev: ModuleDev;
-    $: core = plugin.core;
-    let performanceTestResult = "";
-    let testRunning = false;
-    let prefTestResultEl: HTMLDivElement;
-    let isReady = false;
-    $: {
-        if (performanceTestResult != "" && isReady) {
-            MarkdownRenderer.render(plugin.app, performanceTestResult, prefTestResultEl, "/", plugin);
-        }
-    }
-
-    async function performTest() {
-        try {
-            testRunning = true;
-            performanceTestResult = await perf_trench(plugin);
-        } finally {
-            testRunning = false;
-        }
-    }
-    function clearResult() {
-        moduleDev.testResults.update((v) => {
-            v = [];
-            return v;
-        });
-    }
-    function clearPerfTestResult() {
-        prefTestResultEl.empty();
-    }
-    onMount(async () => {
-        isReady = true;
-        // performTest();
-
-        eventHub.onceEvent(EVENT_LAYOUT_READY, async () => {
-            if (await core.storageAccess.isExistsIncludeHidden("_AUTO_TEST.md")) {
-                new Notice("Auto test file found, running tests...");
-                fireAndForget(async () => {
-                    await allTest();
-                });
-            } else {
-                // new Notice("No auto test file found, skipping tests...");
-            }
-        });
-    });
-
-    let moduleTesting = false;
-    function moduleMultiDeviceTest() {
-        if (moduleTesting) return;
-        moduleTesting = true;
-        core.services.test.testMultiDevice().finally(() => {
-            moduleTesting = false;
-        });
-    }
-    function moduleSingleDeviceTest() {
-        if (moduleTesting) return;
-        moduleTesting = true;
-        core.services.test.test().finally(() => {
-            moduleTesting = false;
-        });
-    }
-    async function allTest() {
-        if (moduleTesting) return;
-        moduleTesting = true;
-        try {
-            await core.services.test.test();
-            await core.services.test.testMultiDevice();
-        } finally {
-            moduleTesting = false;
-        }
-    }
-
-    const results = moduleDev.testResults;
-    $: resultLines = $results;
-
-    let syncStatus = [] as string[];
-    eventHub.onEvent("debug-sync-status", (status) => {
-        syncStatus = [...status];
-    });
-</script>
-
-<h2>TESTING BENCH: Self-hosted LiveSync</h2>
-
-<h3>Module Checks</h3>
-<button on:click={() => moduleMultiDeviceTest()} disabled={moduleTesting}>MultiDevice Test</button>
-<button on:click={() => moduleSingleDeviceTest()} disabled={moduleTesting}>SingleDevice Test</button>
-<button on:click={() => allTest()} disabled={moduleTesting}>All Test</button>
-<button on:click={() => clearResult()}>Clear</button>
-
-{#each resultLines as [result, line, message]}
-    <details open={!result}>
-        <summary>[{result ? "PASS" : "FAILED"}] {line}</summary>
-        <pre>{message}</pre>
-    </details>
-{/each}
-
-<h3>Synchronisation Result Status</h3>
-<pre>{syncStatus.join("\n")}</pre>
-
-<h3>Performance test</h3>
-<button on:click={() => performTest()} disabled={testRunning}>Test!</button>
-<button on:click={() => clearPerfTestResult()}>Clear</button>
-
-<div bind:this={prefTestResultEl}></div>
-
-<style>
-    * {
-        box-sizing: border-box;
-    }
-</style>

src/modules/extras/devUtil/TestPaneView.ts

@@ -1,53 +0,0 @@
-import { ItemView, WorkspaceLeaf } from "@/deps.ts";
-import TestPaneComponent from "./TestPane.svelte";
-import type ObsidianLiveSyncPlugin from "@/main.ts";
-import type { ModuleDev } from "@/modules/extras/ModuleDev.ts";
-export const VIEW_TYPE_TEST = "ols-pane-test";
-declare global {
-    interface LSEvents {
-        "debug-sync-status": string[];
-    }
-}
-//Log view
-export class TestPaneView extends ItemView {
-    component?: TestPaneComponent;
-    plugin: ObsidianLiveSyncPlugin;
-    moduleDev: ModuleDev;
-    override icon = "view-log";
-    title: string = "Self-hosted LiveSync Test and Results";
-    override navigation = true;
-
-    override getIcon(): string {
-        return "view-log";
-    }
-
-    constructor(leaf: WorkspaceLeaf, plugin: ObsidianLiveSyncPlugin, moduleDev: ModuleDev) {
-        super(leaf);
-        this.plugin = plugin;
-        this.moduleDev = moduleDev;
-    }
-
-    getViewType() {
-        return VIEW_TYPE_TEST;
-    }
-
-    getDisplayText() {
-        return "Self-hosted LiveSync Test and Results";
-    }
-
-    override async onOpen() {
-        this.component = new TestPaneComponent({
-            target: this.contentEl,
-            props: {
-                plugin: this.plugin,
-                moduleDev: this.moduleDev,
-            },
-        });
-        await Promise.resolve();
-    }
-
-    override async onClose() {
-        this.component?.$destroy();
-        await Promise.resolve();
-    }
-}

src/modules/extras/devUtil/tests.ts

@@ -1,89 +0,0 @@
-import { Trench } from "octagonal-wheels/memory/memutil";
-import type ObsidianLiveSyncPlugin from "@/main.ts";
-type MeasureResult = [times: number, spent: number];
-type NamedMeasureResult = [name: string, result: MeasureResult];
-const measures = new Map<string, MeasureResult>();
-
-function clearResult(name: string) {
-    measures.set(name, [0, 0]);
-}
-async function measureEach(name: string, proc: () => void | Promise<void>) {
-    const [times, spent] = measures.get(name) ?? [0, 0];
-
-    const start = performance.now();
-    const result = proc();
-    if (result instanceof Promise) await result;
-    const end = performance.now();
-    measures.set(name, [times + 1, spent + (end - start)]);
-}
-function formatNumber(num: number) {
-    return num.toLocaleString("en-US", { maximumFractionDigits: 2 });
-}
-async function measure(
-    name: string,
-    proc: () => void | Promise<void>,
-    times: number = 10000,
-    duration: number = 1000
-): Promise<NamedMeasureResult> {
-    const from = Date.now();
-    let last = times;
-    clearResult(name);
-    do {
-        await measureEach(name, proc);
-    } while (last-- > 0 && Date.now() - from < duration);
-    return [name, measures.get(name) as MeasureResult];
-}
-
-function formatPerfResults(items: NamedMeasureResult[]) {
-    return (
-        `| Name | Runs | Each | Total |\n| --- | --- | --- | --- | \n` +
-        items
-            .map(
-                (e) =>
-                    `| ${e[0]} | ${e[1][0]} | ${e[1][0] != 0 ? formatNumber(e[1][1] / e[1][0]) : "-"} | ${formatNumber(e[1][0])} |`
-            )
-            .join("\n")
-    );
-}
-export async function perf_trench(plugin: ObsidianLiveSyncPlugin) {
-    clearResult("trench");
-    const trench = new Trench(plugin.core.simpleStore);
-    const result = [] as NamedMeasureResult[];
-    result.push(
-        await measure("trench-short-string", async () => {
-            const p = trench.evacuate("string");
-            await p();
-        })
-    );
-    {
-        const testBinary = await plugin.core.storageAccess.readHiddenFileBinary("testdata/10kb.png");
-        const uint8Array = new Uint8Array(testBinary);
-        result.push(
-            await measure("trench-binary-10kb", async () => {
-                const p = trench.evacuate(uint8Array);
-                await p();
-            })
-        );
-    }
-    {
-        const testBinary = await plugin.core.storageAccess.readHiddenFileBinary("testdata/100kb.jpeg");
-        const uint8Array = new Uint8Array(testBinary);
-        result.push(
-            await measure("trench-binary-100kb", async () => {
-                const p = trench.evacuate(uint8Array);
-                await p();
-            })
-        );
-    }
-    {
-        const testBinary = await plugin.core.storageAccess.readHiddenFileBinary("testdata/1mb.png");
-        const uint8Array = new Uint8Array(testBinary);
-        result.push(
-            await measure("trench-binary-1mb", async () => {
-                const p = trench.evacuate(uint8Array);
-                await p();
-            })
-        );
-    }
-    return formatPerfResults(result);
-}

src/modules/features/DocumentHistory/DocumentHistoryModal.ts

@@ -12,7 +12,7 @@ import {
 } from "@vrtmrz/livesync-commonlib/compat/common/types";
 import { Logger } from "@vrtmrz/livesync-commonlib/compat/common/logger";
 import { isErrorOfMissingDoc } from "@vrtmrz/livesync-commonlib/compat/pouchdb/utils_couchdb";
-import { fireAndForget, getDocData, readContent } from "@vrtmrz/livesync-commonlib/compat/common/utils";
+import { fireAndForget, getDocData } from "@vrtmrz/livesync-commonlib/compat/common/utils";
 import { isPlainText, stripPrefix } from "@vrtmrz/livesync-commonlib/compat/string_and_binary/path";
 import { scheduleOnceIfDuplicated } from "octagonal-wheels/concurrency/lock";
 import type { LiveSyncBaseCore } from "@/LiveSyncBaseCore.ts";
@@ -23,6 +23,10 @@ import {
     saveDocumentHistoryPreference,
 } from "./documentHistoryPreferences.ts";
 import type PouchDB from "pouchdb-core";
+import {
+    restoreDocumentHistoryRevision,
+    type DocumentHistoryRestorationResult,
+} from "@/serviceFeatures/documentHistoryRestoration";
 
 function isImage(path: string) {
     const ext = path.split(".").splice(-1)[0].toLowerCase();
@@ -277,6 +281,7 @@ export class DocumentHistoryModal extends Modal {
 
     async showExactRev(rev: string) {
         const db = this.core.localDatabase;
+        this.currentDoc = undefined;
         const w = await db.getDBEntry(this.file, { rev: rev }, false, false, true);
         this.currentText = "";
         this.currentDeleted = false;
@@ -702,7 +707,6 @@ export class DocumentHistoryModal extends Modal {
             e.addClass("mod-cta");
             e.addEventListener("click", () => {
                 fireAndForget(async () => {
-                    // const pathToWrite = this.plugin.id2path(this.id, true);
                     const pathToWrite = stripPrefix(this.file);
                     if (!isValidPath(pathToWrite)) {
                         Logger("Path is not valid to write content.", LOG_LEVEL_INFO);
@@ -712,9 +716,94 @@ export class DocumentHistoryModal extends Modal {
                         Logger("No active file loaded.", LOG_LEVEL_INFO);
                         return;
                     }
-                    const d = readContent(this.currentDoc);
-                    await this.core.storageAccess.writeHiddenFileAuto(pathToWrite, d);
-                    await focusFile(pathToWrite);
+                    const sourceRevision = this.currentDoc._rev;
+                    if (!sourceRevision) {
+                        Logger("The selected revision does not have a revision identifier.", LOG_LEVEL_NOTICE);
+                        return;
+                    }
+
+                    e.disabled = true;
+                    let result: DocumentHistoryRestorationResult;
+                    try {
+                        result = await restoreDocumentHistoryRevision(this.core, this.file, sourceRevision, {
+                            isPathValid: isValidPath,
+                        });
+                    } catch (ex) {
+                        Logger(
+                            "Restoring the selected revision failed before Vault reflection completed. Review the file with 'Inspect conflicts and file/database differences' before retrying.",
+                            LOG_LEVEL_NOTICE
+                        );
+                        Logger(ex, LOG_LEVEL_VERBOSE);
+                        e.disabled = false;
+                        return;
+                    }
+
+                    if (result.status === "source-unavailable") {
+                        Logger(
+                            "The selected revision could not be restored because its content is no longer available.",
+                            LOG_LEVEL_NOTICE
+                        );
+                        e.disabled = false;
+                        return;
+                    }
+                    if (result.status === "current-unavailable") {
+                        Logger(
+                            "The current database revision could not be read. The Vault was not changed.",
+                            LOG_LEVEL_NOTICE
+                        );
+                        e.disabled = false;
+                        return;
+                    }
+                    if (result.status === "unsupported-path") {
+                        Logger(
+                            "Only an ordinary valid Vault path can be restored from Document History.",
+                            LOG_LEVEL_NOTICE
+                        );
+                        e.disabled = false;
+                        return;
+                    }
+                    if (result.status === "database-write-refused") {
+                        Logger(
+                            "The restored revision could not be created. The file may have changed during the operation, and the Vault was not changed.",
+                            LOG_LEVEL_NOTICE
+                        );
+                        e.disabled = false;
+                        return;
+                    }
+                    if (result.status === "stored-not-reflected") {
+                        Logger(
+                            "The restored revision was saved in the local database, but it could not be reflected to the Vault. Use 'Inspect conflicts and file/database differences' to review and apply it.",
+                            LOG_LEVEL_NOTICE
+                        );
+                        if (result.cause) {
+                            Logger(result.cause, LOG_LEVEL_VERBOSE);
+                        }
+                        this.close();
+                        return;
+                    }
+
+                    if (result.conflictCheckError) {
+                        Logger(result.conflictCheckError, LOG_LEVEL_VERBOSE);
+                    }
+                    if (result.conflictsRemain === true) {
+                        Logger(
+                            "The selected content was restored as a new revision. Other versions remain unresolved; use 'Inspect conflicts and file/database differences' to review them.",
+                            LOG_LEVEL_NOTICE
+                        );
+                    } else if (result.conflictsRemain === false) {
+                        Logger("The selected content was restored as a new revision.", LOG_LEVEL_NOTICE);
+                    } else {
+                        Logger(
+                            "The selected content was restored as a new revision. LiveSync could not confirm whether other versions remain; use 'Inspect conflicts and file/database differences' to review the file.",
+                            LOG_LEVEL_NOTICE
+                        );
+                    }
+                    try {
+                        await focusFile(result.path);
+                    } catch (ex) {
+                        Logger("The restored file could not be opened in the editor.", LOG_LEVEL_NOTICE);
+                        Logger(ex, LOG_LEVEL_VERBOSE);
+                    }
                     this.close();
                 });
             });

src/modules/features/ModuleLog.ts

@@ -7,7 +7,7 @@ import {
     type DatabaseConnectingStatus,
     type LOG_LEVEL,
 } from "@vrtmrz/livesync-commonlib/compat/common/types";
-import { cancelTask, scheduleTask } from "octagonal-wheels/concurrency/task";
+import { scheduleTask } from "octagonal-wheels/concurrency/task";
 import { fireAndForget, isDirty, throttle } from "@vrtmrz/livesync-commonlib/compat/common/utils";
 import {
     collectingChunks,
@@ -119,7 +119,7 @@ export class ModuleLog extends AbstractObsidianModule {
     statusBarLabels!: ReactiveValue<{ message: string; status: string }>;
     statusLog = reactiveSource("");
     activeFileStatus = reactiveSource("");
-    notifies: { [key: string]: { notice: Notice; count: number } } = {};
+    notifies: { [key: string]: { count: number } } = {};
     p2pLogCollector = new P2PLogCollector(this.services.context.events);
 
     observeForLogs() {
@@ -407,6 +407,10 @@ export class ModuleLog extends AbstractObsidianModule {
     }
 
     private _allStartOnUnload(): Promise<boolean> {
+        for (const key of Object.keys(this.notifies)) {
+            this.services.context.notices.hide(`log:${key}`);
+        }
+        this.notifies = {};
         if (this.statusDiv) {
             this.statusDiv.remove();
         }
@@ -559,35 +563,26 @@ ${stringifyYaml(info)}
         if (level >= LOG_LEVEL_NOTICE) {
             if (!key) key = messageContent;
             if (key in this.notifies) {
-                // @ts-ignore
-                const isShown = this.notifies[key].notice.noticeEl?.isShown();
-                if (!isShown) {
-                    this.notifies[key].notice = new Notice(messageContent, 0);
-                }
-                cancelTask(`notify-${key}`);
                 if (key == messageContent) {
                     this.notifies[key].count++;
-                    this.notifies[key].notice.setMessage(`(${this.notifies[key].count}):${messageContent}`);
-                } else {
-                    this.notifies[key].notice.setMessage(`${messageContent}`);
                 }
             } else {
-                const notify = new Notice(messageContent, 0);
                 this.notifies[key] = {
                     count: 0,
-                    notice: notify,
                 };
             }
             const timeout = 5000;
-            if (!key.startsWith("keepalive-") || messageContent.indexOf(MARK_DONE) !== -1) {
+            const shouldExpire = !key.startsWith("keepalive-") || messageContent.indexOf(MARK_DONE) !== -1;
+            const noticeMessage =
+                key == messageContent && this.notifies[key].count > 0
+                    ? `(${this.notifies[key].count}):${messageContent}`
+                    : messageContent;
+            this.services.context.notices.show(`log:${key}`, noticeMessage, {
+                durationMs: shouldExpire ? timeout : false,
+            });
+            if (shouldExpire) {
                 scheduleTask(`notify-${key}`, timeout, () => {
-                    const notify = this.notifies[key].notice;
                     delete this.notifies[key];
-                    try {
-                        notify.hide();
-                    } catch {
-                        // NO OP
-                    }
                 });
             }
         }

src/modules/features/ModuleObsidianSettingTab.ts

@@ -1,21 +1,18 @@
 import { ObsidianLiveSyncSettingTab } from "./SettingDialogue/ObsidianLiveSyncSettingTab.ts";
 import { AbstractObsidianModule } from "@/modules/AbstractObsidianModule.ts";
 // import { PouchDB } from "../../lib/src/pouchdb/pouchdb-browser";
-import { EVENT_REQUEST_OPEN_SETTING_WIZARD, EVENT_REQUEST_OPEN_SETTINGS, eventHub } from "@/common/events.ts";
+import { EVENT_REQUEST_OPEN_SETTINGS, eventHub } from "@/common/events.ts";
 import type { LiveSyncCore } from "@/main.ts";
 import { openObsidianSettings } from "@/common/obsidianSettings.ts";
 
 export class ModuleObsidianSettingDialogue extends AbstractObsidianModule {
     settingTab!: ObsidianLiveSyncSettingTab;
 
-    _everyOnloadStart(): Promise<boolean> {
+    _everyOnloadAfterLoadSettings(): Promise<boolean> {
         this.settingTab = new ObsidianLiveSyncSettingTab(this.app, this.plugin);
+        this.settingTab.reloadAllSettings(true);
         this.plugin.addSettingTab(this.settingTab);
         eventHub.onEvent(EVENT_REQUEST_OPEN_SETTINGS, () => this.openSetting());
-        eventHub.onEvent(EVENT_REQUEST_OPEN_SETTING_WIZARD, () => {
-            this.openSetting();
-            void this.settingTab.enableMinimalSetup();
-        });
 
         return Promise.resolve(true);
     }
@@ -28,6 +25,6 @@ export class ModuleObsidianSettingDialogue extends AbstractObsidianModule {
         return `${"appId" in this.app ? this.app.appId : ""}`;
     }
     override onBindFunction(core: LiveSyncCore, services: typeof core.services): void {
-        services.appLifecycle.onInitialise.addHandler(this._everyOnloadStart.bind(this));
+        services.appLifecycle.onSettingLoaded.addHandler(this._everyOnloadAfterLoadSettings.bind(this));
     }
 }

src/modules/features/ModuleObsidianSettingTab.unit.spec.ts

@@ -0,0 +1,91 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+const settingTabState = vi.hoisted(() => ({
+    callOrder: [] as string[],
+    reloadAllSettings: vi.fn<(skipUpdate?: boolean) => void>(),
+}));
+
+const eventHubState = vi.hoisted(() => ({
+    onEvent: vi.fn(),
+}));
+
+vi.mock("./SettingDialogue/ObsidianLiveSyncSettingTab.ts", () => ({
+    ObsidianLiveSyncSettingTab: class ObsidianLiveSyncSettingTab {
+        reloadAllSettings(skipUpdate?: boolean) {
+            settingTabState.callOrder.push(`reload:${String(skipUpdate)}`);
+            settingTabState.reloadAllSettings(skipUpdate);
+        }
+    },
+}));
+
+vi.mock("@/common/events.ts", () => ({
+    EVENT_REQUEST_OPEN_SETTINGS: "request-open-settings",
+    eventHub: eventHubState,
+}));
+
+import { ModuleObsidianSettingDialogue } from "./ModuleObsidianSettingTab.ts";
+
+function createModuleHarness() {
+    let initialisationHandler: (() => Promise<boolean>) | undefined;
+    let settingsLoadedHandler: (() => Promise<boolean>) | undefined;
+    const plugin = {
+        app: {},
+        addSettingTab: vi.fn(() => settingTabState.callOrder.push("add-setting-tab")),
+    };
+    const services = {
+        appLifecycle: {
+            onInitialise: {
+                addHandler: vi.fn((handler: () => Promise<boolean>) => {
+                    initialisationHandler = handler;
+                }),
+            },
+            onSettingLoaded: {
+                addHandler: vi.fn((handler: () => Promise<boolean>) => {
+                    settingsLoadedHandler = handler;
+                }),
+            },
+        },
+    };
+    const module = Object.assign(Object.create(ModuleObsidianSettingDialogue.prototype), {
+        plugin,
+        core: { services },
+    }) as ModuleObsidianSettingDialogue;
+
+    module.onBindFunction(module.core as never, services as never);
+
+    return {
+        initialisationHandler: () => initialisationHandler,
+        module,
+        plugin,
+        services,
+        settingsLoadedHandler: () => settingsLoadedHandler,
+    };
+}
+
+describe("ModuleObsidianSettingDialogue startup lifecycle", () => {
+    beforeEach(() => {
+        settingTabState.callOrder.length = 0;
+        settingTabState.reloadAllSettings.mockClear();
+        eventHubState.onEvent.mockClear();
+    });
+
+    it("registers the setting tab after persisted settings have loaded", () => {
+        const { initialisationHandler, services, settingsLoadedHandler } = createModuleHarness();
+
+        expect(services.appLifecycle.onInitialise.addHandler).not.toHaveBeenCalled();
+        expect(services.appLifecycle.onSettingLoaded.addHandler).toHaveBeenCalledOnce();
+        expect(initialisationHandler()).toBeUndefined();
+        expect(settingsLoadedHandler()).toBeTypeOf("function");
+    });
+
+    it("seeds the setting editor without requesting a render before registration", async () => {
+        const { initialisationHandler, settingsLoadedHandler } = createModuleHarness();
+        const handler = settingsLoadedHandler() ?? initialisationHandler();
+
+        expect(handler).toBeTypeOf("function");
+        await handler!();
+
+        expect(settingTabState.reloadAllSettings).toHaveBeenCalledWith(true);
+        expect(settingTabState.callOrder).toEqual(["reload:true", "add-setting-tab"]);
+    });
+});

src/modules/features/SettingDialogue/AdvancedSettingSpecs.ts

@@ -0,0 +1,50 @@
+import { ChunkAlgorithmNames } from "@vrtmrz/livesync-commonlib/compat/common/types";
+import type { SettingSpecGroup } from "./SettingSpec.ts";
+
+export type AdvancedSettingSpecContext = {
+    isCouchDB: () => boolean;
+};
+
+/** Build the explicitly exposed standard controls for the existing Advanced page. */
+export function createAdvancedSettingSpecGroups({
+    isCouchDB,
+}: AdvancedSettingSpecContext): readonly SettingSpecGroup[] {
+    return [
+        {
+            heading: "Memory cache",
+            items: [{ key: "hashCacheMaxCount", control: { type: "number", min: 10 } }],
+        },
+        {
+            heading: "Local Database Tweak",
+            items: [
+                {
+                    key: "chunkSplitterVersion",
+                    control: { type: "dropdown", options: () => ChunkAlgorithmNames },
+                },
+                { key: "customChunkSize", control: { type: "number", min: 0, allowZero: true } },
+            ],
+        },
+        {
+            heading: "Transfer Tweak",
+            items: [
+                { key: "readChunksOnline", control: { type: "toggle" }, visible: isCouchDB },
+                { key: "useOnlyLocalChunk", control: { type: "toggle" }, visible: isCouchDB },
+                {
+                    key: "concurrencyOfReadChunksOnline",
+                    control: { type: "number", min: 10 },
+                    visible: isCouchDB,
+                },
+                {
+                    key: "minimumIntervalOfReadChunksOnline",
+                    control: { type: "number", min: 10 },
+                    visible: isCouchDB,
+                },
+                { key: "autoAcceptCompatibleTweak", control: { type: "toggle", defaultValue: true } },
+            ],
+        },
+        {
+            heading: "Remote Database Tweak",
+            items: [{ key: "enableCompression", control: { type: "toggle" } }],
+        },
+    ];
+}

src/modules/features/SettingDialogue/GeneralSettingSpecs.ts

@@ -0,0 +1,75 @@
+import { $msg, $t } from "@/common/translation";
+import { SUPPORTED_I18N_LANGS } from "@/common/rosetta";
+import { NetworkWarningStyles } from "@vrtmrz/livesync-commonlib/compat/common/models/setting.const";
+import type { SettingSpecGroup } from "./SettingSpec.ts";
+
+export type GeneralSettingSpecContext = {
+    showEditorStatusDetails: () => boolean;
+    showVerboseLog: () => boolean;
+};
+
+/** Build the shared Appearance and Logging controls. */
+export function createGeneralSettingSpecGroups({
+    showEditorStatusDetails,
+    showVerboseLog,
+}: GeneralSettingSpecContext): readonly SettingSpecGroup[] {
+    return [
+        {
+            heading: $msg("obsidianLiveSyncSettingTab.titleAppearance"),
+            items: [
+                {
+                    key: "displayLanguage",
+                    control: {
+                        type: "dropdown",
+                        options: () =>
+                            Object.fromEntries(
+                                SUPPORTED_I18N_LANGS.map((language) => [language, $t(`lang-${language}`)])
+                            ),
+                    },
+                },
+                { key: "showStatusOnEditor", control: { type: "toggle" } },
+                {
+                    key: "showOnlyIconsOnEditor",
+                    control: { type: "toggle" },
+                    visible: showEditorStatusDetails,
+                },
+                { key: "showStatusOnStatusbar", control: { type: "toggle" } },
+                { key: "hideFileWarningNotice", control: { type: "toggle" } },
+                {
+                    key: "networkWarningStyle",
+                    control: {
+                        type: "dropdown",
+                        options: () => ({
+                            [NetworkWarningStyles.BANNER]: "Show full banner",
+                            [NetworkWarningStyles.ICON]: "Show icon only",
+                            [NetworkWarningStyles.HIDDEN]: "Hide completely",
+                        }),
+                    },
+                },
+            ],
+        },
+        {
+            heading: $msg("obsidianLiveSyncSettingTab.titleLogging"),
+            items: [
+                { key: "lessInformationInLog", control: { type: "toggle" } },
+                {
+                    key: "showVerboseLog",
+                    control: { type: "toggle" },
+                    visible: showVerboseLog,
+                },
+            ],
+        },
+    ];
+}
+
+/** Build the feature-level controls shown in General Settings under Extra menus. */
+export function createExtraMenuSettingSpecGroup(): SettingSpecGroup {
+    return {
+        heading: $msg("obsidianLiveSyncSettingTab.titleExtraMenus"),
+        items: [
+            { key: "useAdvancedMode", control: { type: "toggle" } },
+            { key: "usePowerUserMode", control: { type: "toggle" } },
+            { key: "useEdgeCaseMode", control: { type: "toggle" } },
+        ],
+    };
+}

src/modules/features/SettingDialogue/LiveSyncSetting.ts

@@ -8,7 +8,12 @@ import {
     type ValueComponent,
 } from "@/deps.ts";
 import { unique } from "octagonal-wheels/collection";
-import { LEVEL_ADVANCED, LEVEL_POWER_USER, statusDisplay, type ConfigurationItem } from "@vrtmrz/livesync-commonlib/compat/common/types";
+import {
+    LEVEL_ADVANCED,
+    LEVEL_POWER_USER,
+    statusDisplay,
+    type ConfigurationItem,
+} from "@vrtmrz/livesync-commonlib/compat/common/types";
 import { type ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts";
 import {
     type AllSettingItemKey,
@@ -19,7 +24,7 @@ import {
     type AllBooleanItemKey,
 } from "./settingConstants.ts";
 import { $msg } from "@/common/translation";
-import { wrapMemo, type AutoWireOption, type OnUpdateResult } from "./SettingPane.ts";
+import { setButtonDestructiveState, wrapMemo, type AutoWireOption, type OnUpdateResult } from "./SettingPane.ts";
 
 export class LiveSyncSetting extends Setting {
     autoWiredComponent?: TextComponent | ToggleComponent | DropdownComponent | ButtonComponent | TextAreaComponent;
@@ -307,12 +312,7 @@ export class LiveSyncSetting extends Setting {
                         {
                             const component = this.autoWiredComponent;
                             if (component instanceof ButtonComponent) {
-                                if (newConf[k]) {
-                                    component.setWarning();
-                                } else {
-                                    //TODO:IMPLEMENT
-                                    // component.removeCta();
-                                }
+                                setButtonDestructiveState(component, newConf[k] ?? false);
                             }
                             this.prevStatus[k] = newConf[k];
                         }

src/modules/features/SettingDialogue/ObsidianLiveSyncSettingTab.declarative.unit.spec.ts

@@ -0,0 +1,558 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { DEFAULT_SETTINGS } from "@vrtmrz/livesync-commonlib/compat/common/types";
+import type { SettingDefinitionGroup, SettingDefinitionItem, SettingDefinitionPage } from "obsidian";
+import type { PageFunctions } from "./SettingPane.ts";
+
+const runtime = vi.hoisted(() => ({
+    components: [] as Array<{
+        load: ReturnType<typeof vi.fn>;
+        unload: ReturnType<typeof vi.fn>;
+        callbacks: Array<() => unknown>;
+    }>,
+    paneChangeLog: vi.fn(),
+    pageCleanup: vi.fn(),
+    savedEffect: vi.fn(),
+    superHide: vi.fn(),
+}));
+
+function createElement(): HTMLElement {
+    const element = {
+        empty: vi.fn(),
+        addClass: vi.fn(),
+        removeClass: vi.fn(),
+        toggleClass: vi.fn(),
+        createEl: vi.fn(() => createElement()),
+        createDiv: vi.fn(() => createElement()),
+        querySelectorAll: vi.fn(() => []),
+    };
+    return element as unknown as HTMLElement;
+}
+
+vi.mock("@/deps.ts", () => ({
+    App: class {},
+    Component: class {
+        callbacks: Array<() => unknown> = [];
+        load = vi.fn();
+        unload = vi.fn(() => {
+            for (const callback of this.callbacks.splice(0)) callback();
+        });
+        register = vi.fn((callback: () => unknown) => this.callbacks.push(callback));
+        constructor() {
+            runtime.components.push(this);
+        }
+    },
+    PluginSettingTab: class {
+        app: unknown;
+        plugin: unknown;
+        refreshDomState = vi.fn();
+        update = vi.fn();
+        constructor(app: unknown, plugin: unknown) {
+            this.app = app;
+            this.plugin = plugin;
+        }
+        hide() {}
+    },
+    SettingPage: class {
+        containerEl = createElement();
+        title = "";
+        display() {}
+        hide() {
+            runtime.superHide();
+        }
+    },
+    requireApiVersion: vi.fn(() => true),
+}));
+vi.mock("@/main.ts", () => ({ default: class {} }));
+vi.mock("@vrtmrz/livesync-commonlib/compat/common/coreEnvFunctions", () => ({
+    getLanguage: vi.fn(() => "en"),
+    compatGlobal: {
+        localStorage: {
+            getItem: vi.fn(() => null),
+            setItem: vi.fn(),
+        },
+    },
+}));
+vi.mock("@/common/events.ts", () => ({
+    EVENT_ON_UNRESOLVED_ERROR: "on-unresolved-error",
+    EVENT_REQUEST_COPY_SETUP_URI: "request-copy-setup-uri",
+    EVENT_REQUEST_OPEN_SETUP_URI: "request-open-setup-uri",
+    EVENT_REQUEST_RELOAD_SETTING_TAB: "request-reload-setting-tab",
+    EVENT_REQUEST_SHOW_SETUP_QR: "request-show-setup-qr",
+    eventHub: { emitEvent: vi.fn(), onEvent: vi.fn() },
+}));
+vi.mock("@/modules/features/SetupManager.ts", () => ({ SetupManager: class {} }));
+vi.mock("@vrtmrz/livesync-commonlib/compat/pouchdb/negotiation", () => ({ checkSyncInfo: vi.fn() }));
+vi.mock("@vrtmrz/livesync-commonlib/compat/replication/couchdb/LiveSyncReplicator", () => ({
+    LiveSyncCouchDBReplicator: class {},
+}));
+vi.mock("./LiveSyncSetting.ts", () => ({
+    LiveSyncSetting: class {
+        static env: unknown;
+    },
+}));
+vi.mock("./SettingPane.ts", () => ({
+    enableOnly: vi.fn((condition: () => boolean) => () => ({ disabled: !condition() })),
+    setLevelClass: vi.fn(),
+    setStyle: vi.fn(),
+    visibleOnly: vi.fn((condition: () => boolean) => () => ({ visibility: condition() })),
+}));
+vi.mock("./PaneChangeLog.ts", () => ({ paneChangeLog: runtime.paneChangeLog }));
+vi.mock("./PaneQuickSetup.ts", () => ({ paneQuickSetup: vi.fn() }));
+vi.mock("./PaneHelp.ts", () => ({ paneHelp: vi.fn() }));
+vi.mock("./PaneGeneral.ts", () => ({ paneGeneral: vi.fn() }));
+vi.mock("./PaneRemoteConfig.ts", () => ({ paneRemoteConfig: vi.fn() }));
+vi.mock("./PaneSelector.ts", () => ({ paneSelector: vi.fn() }));
+vi.mock("./PaneSyncSettings.ts", () => ({ paneSyncSettings: vi.fn() }));
+vi.mock("./PaneCustomisationSync.ts", () => ({ paneCustomisationSync: vi.fn() }));
+vi.mock("./PaneHatch.ts", () => ({ paneHatch: vi.fn() }));
+vi.mock("./PaneAdvanced.ts", () => ({ paneAdvanced: vi.fn() }));
+vi.mock("./PanePowerUsers.ts", () => ({ panePowerUsers: vi.fn() }));
+vi.mock("./PanePatches.ts", () => ({ panePatches: vi.fn() }));
+vi.mock("./PaneMaintenance.ts", () => ({ paneMaintenance: vi.fn() }));
+
+import { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts";
+import { createSettingsPageCatalogue } from "./SettingsPageCatalogue.ts";
+
+function isPage(item: SettingDefinitionItem): item is SettingDefinitionPage {
+    return "type" in item && item.type === "page";
+}
+
+function isGroup(item: SettingDefinitionItem): item is SettingDefinitionGroup {
+    return "type" in item && item.type === "group";
+}
+
+function isAction(item: SettingDefinitionItem): item is Extract<SettingDefinitionItem, { action: unknown }> {
+    return "action" in item && typeof item.action === "function";
+}
+
+function itemLabel(item: SettingDefinitionItem): string {
+    if (isPage(item)) return item.name;
+    if (isGroup(item)) return item.heading ?? "";
+    return item.name;
+}
+
+function collectPages(items: readonly SettingDefinitionItem[]): SettingDefinitionPage[] {
+    return items.flatMap((item) => {
+        if (isPage(item)) return [item, ...collectPages(item.items ?? [])];
+        if (isGroup(item)) return collectPages(item.items ?? []);
+        return [];
+    });
+}
+
+function findPage(tab: ObsidianLiveSyncSettingTab, name: string): SettingDefinitionPage {
+    const page = collectPages(tab.getSettingDefinitions()).find((candidate) => candidate.name.endsWith(` ${name}`));
+    if (!page) throw new Error(`${name} custom page is unavailable`);
+    return page;
+}
+
+type SettingsTabOptions = {
+    activeReplicatorGetter?: () => { syncStatus: "CONNECTED" | "PAUSED" } | undefined;
+    replicationStatus?: "CLOSED" | "CONNECTED" | "PAUSED";
+};
+
+function createSettingsTab(options: SettingsTabOptions = {}): ObsidianLiveSyncSettingTab {
+    const core = {
+        settings: { ...DEFAULT_SETTINGS, useAdvancedMode: true },
+        confirm: {
+            askInPopup: vi.fn(),
+        },
+        services: {
+            setting: {
+                getDeviceAndVaultName: vi.fn(() => ""),
+                saveSettingData: vi.fn(async () => undefined),
+            },
+            replicator: {
+                replicationStatics: {
+                    value: { syncStatus: options.replicationStatus ?? "CLOSED" },
+                },
+            },
+        },
+    };
+    Object.defineProperty(core, "replicator", {
+        get: options.activeReplicatorGetter ?? (() => undefined),
+    });
+    const plugin = {
+        app: {},
+        core,
+    };
+    const tab = new ObsidianLiveSyncSettingTab({} as never, plugin as never);
+    Object.assign(tab, {
+        _editingSettings: { ...DEFAULT_SETTINGS, useAdvancedMode: true },
+        initialSettings: { ...DEFAULT_SETTINGS, useAdvancedMode: true },
+    });
+    return tab;
+}
+
+beforeEach(() => {
+    runtime.components.length = 0;
+    runtime.paneChangeLog.mockClear();
+    runtime.paneChangeLog.mockImplementation(function (this: ObsidianLiveSyncSettingTab) {
+        this.lifetimeComponent.register(runtime.pageCleanup);
+    });
+    runtime.pageCleanup.mockClear();
+    runtime.savedEffect.mockClear();
+    runtime.superHide.mockClear();
+});
+
+describe("ObsidianLiveSyncSettingTab native page lifecycle", () => {
+    it("builds definitions before database readiness without requesting the active replicator", () => {
+        const activeReplicatorGetter = vi.fn(() => {
+            throw new Error("The active replicator is not ready");
+        });
+        const tab = createSettingsTab({ activeReplicatorGetter });
+
+        expect(() => tab.getSettingDefinitions()).not.toThrow();
+        expect(activeReplicatorGetter).not.toHaveBeenCalled();
+    });
+
+    it("keeps Quick Setup first while LiveSync is not configured, regardless of transient replication status", () => {
+        const tab = createSettingsTab({ replicationStatus: "CONNECTED" });
+        tab.editingSettings.isConfigured = false;
+        const definitions = tab.getSettingDefinitions().filter(isGroup);
+
+        expect(definitions[0]?.heading).toBe("🧙‍♂️ Quick Setup");
+    });
+
+    it("keeps Quick Setup first while LiveSync is not configured and separates synchronisation pages from it", () => {
+        const tab = createSettingsTab();
+        tab.editingSettings.isConfigured = false;
+        const definitions = tab.getSettingDefinitions().filter(isGroup);
+
+        expect(definitions.slice(0, 3).map(itemLabel)).toEqual([
+            "🧙‍♂️ Quick Setup",
+            "🔄 Synchronisation",
+            "⚙️ General Settings",
+        ]);
+    });
+
+    it("keeps the synchronisation group first for a configured device with automatic triggers disabled", () => {
+        const tab = createSettingsTab();
+        tab.editingSettings.isConfigured = true;
+        const definitions = tab.getSettingDefinitions().filter(isGroup);
+
+        expect(definitions.slice(0, 4).map(itemLabel)).toEqual([
+            "🔄 Synchronisation",
+            "⚙️ General Settings",
+            "📲 Set up other devices",
+            "🧙‍♂️ Quick Setup",
+        ]);
+    });
+
+    it("keeps the pending initialisation action visible on the root settings page", () => {
+        const tab = createSettingsTab();
+        tab.editingSettings.handleFilenameCaseSensitive = !tab.initialSettings!.handleFilenameCaseSensitive;
+
+        const action = tab.getSettingDefinitions().find(isAction);
+
+        expect(action?.name).toBe("Apply");
+        expect(typeof action?.visible === "function" ? action.visible() : action?.visible).toBe(true);
+    });
+
+    it("keeps Remote Configuration and Sync Settings as native pages inside the Synchronisation group", () => {
+        const tab = createSettingsTab();
+        const definitions = tab.getSettingDefinitions();
+        const synchronisation = definitions.find(
+            (item): item is SettingDefinitionGroup => isGroup(item) && item.heading === "🔄 Synchronisation"
+        );
+
+        expect(synchronisation?.items?.filter(isPage).map(({ name }) => name)).toEqual([
+            "🛰️ Remote Configuration",
+            "🔄 Sync Settings",
+        ]);
+        expect(
+            definitions
+                .filter(isPage)
+                .map(({ name }) => name)
+                .filter((name) => name.endsWith(" Remote Configuration") || name.endsWith(" Sync Settings"))
+        ).toEqual([]);
+    });
+
+    it("groups secondary pages by purpose instead of exposing a flat Detailed settings list", () => {
+        const tab = createSettingsTab();
+        const definitions = tab.getSettingDefinitions();
+        const groups = definitions.filter(isGroup);
+
+        expect(groups.map(({ heading }) => heading)).toEqual([
+            "🧙‍♂️ Quick Setup",
+            "🔄 Synchronisation",
+            "⚙️ General Settings",
+            "📲 Set up other devices",
+            "🛠️ Maintenance and recovery",
+            "🧩 Extra features",
+            "🔧 Advanced settings",
+            "ℹ️ Help and information",
+        ]);
+        expect(
+            groups
+                .find(({ heading }) => heading === "🛠️ Maintenance and recovery")
+                ?.items?.filter(isPage)
+                .map(({ name }) => name)
+        ).toEqual(["🎛️ Maintenance", "🧰 Hatch"]);
+        expect(
+            groups
+                .find(({ heading }) => heading === "🧩 Extra features")
+                ?.items?.filter(isPage)
+                .map(({ name }) => name)
+        ).toEqual(["🚦 Selector", "🔌 Customisation sync"]);
+        expect(
+            groups
+                .find(({ heading }) => heading === "🔧 Advanced settings")
+                ?.items?.filter(isPage)
+                .map(({ name }) => name)
+        ).toEqual(["🔧 Advanced", "💪 Power users", "🩹 Patches"]);
+        expect(
+            groups
+                .find(({ heading }) => heading === "ℹ️ Help and information")
+                ?.items?.filter(isPage)
+                .map(({ name }) => name)
+        ).toEqual(["❓ Help and troubleshooting", "💬 Change Log"]);
+        expect(
+            groups.find(({ heading }) => heading === "📲 Set up other devices")?.items?.map(({ name }) => name)
+        ).toEqual(["Copy the current settings to a Setup URI", "Show QR code"]);
+    });
+
+    it("keeps Appearance, Logging, and Extra menus inside General Settings", () => {
+        const tab = createSettingsTab();
+        const definitions = tab.getSettingDefinitions();
+        const general = definitions.find(
+            (item): item is SettingDefinitionGroup => isGroup(item) && item.heading === "⚙️ General Settings"
+        );
+        const generalPages = general?.items?.filter(isPage);
+        const appearance = generalPages?.find(({ name }) => name === "🎨 Appearance");
+        const logging = generalPages?.find(({ name }) => name === "📝 Logging");
+        const extraMenus = general?.items?.find(
+            (item): item is SettingDefinitionPage => isPage(item) && item.name === "🎚️ Extra menus"
+        );
+
+        expect(generalPages?.map(({ name }) => name)).toEqual(["🎨 Appearance", "📝 Logging", "🎚️ Extra menus"]);
+        expect(
+            appearance?.items?.flatMap((item) => ("control" in item && item.control ? [item.control.key] : []))
+        ).toEqual([
+            "displayLanguage",
+            "showStatusOnEditor",
+            "showOnlyIconsOnEditor",
+            "showStatusOnStatusbar",
+            "hideFileWarningNotice",
+            "networkWarningStyle",
+        ]);
+        expect(
+            logging?.items?.flatMap((item) => ("control" in item && item.control ? [item.control.key] : []))
+        ).toEqual(["lessInformationInLog", "showVerboseLog"]);
+        expect(
+            extraMenus?.items?.flatMap((item) => ("control" in item && item.control ? [item.control.key] : []))
+        ).toEqual(["useAdvancedMode", "usePowerUserMode", "useEdgeCaseMode"]);
+    });
+
+    it("omits the old Setup child page and keeps standard General and Advanced pages native", () => {
+        const tab = createSettingsTab();
+        const pages = collectPages(tab.getSettingDefinitions());
+
+        expect(pages).toHaveLength(14);
+        expect(pages.map(({ name }) => name)).toEqual(
+            expect.arrayContaining(
+                createSettingsPageCatalogue()
+                    .filter(({ id }) => id !== "general" && id !== "quick-setup")
+                    .map((entry) => `${entry.icon} ${entry.name()}`)
+            )
+        );
+        expect(pages.some(({ name }) => name.endsWith(" General Settings"))).toBe(false);
+        expect(pages.some(({ name }) => name.endsWith(" Setup"))).toBe(false);
+        const advanced = pages.find(({ name }) => name.endsWith(" Advanced"));
+        expect(advanced?.items?.filter((item) => "type" in item && item.type === "group")).toHaveLength(4);
+        expect(advanced?.items?.filter((item) => "action" in item && typeof item.action === "function")).toHaveLength(
+            1
+        );
+        expect(advanced?.page).toBeUndefined();
+        expect(pages.filter(({ page }) => page !== undefined)).toHaveLength(10);
+    });
+
+    it("keeps simple setup actions on the landing page without a second Setup destination", () => {
+        const tab = createSettingsTab();
+        const definitions = tab.getSettingDefinitions();
+        const quickSetup = definitions.find(
+            (item): item is SettingDefinitionGroup => isGroup(item) && item.heading === "🧙‍♂️ Quick Setup"
+        );
+
+        expect(quickSetup?.items?.map(({ name }) => name)).toEqual([
+            "Connect with Setup URI",
+            "Rerun Onboarding Wizard",
+            "Enable LiveSync",
+        ]);
+        expect(collectPages(definitions).some(({ name }) => name.endsWith(" Setup"))).toBe(false);
+    });
+
+    it("constructs custom page state only when opened and disposes each rendered scope", () => {
+        const tab = createSettingsTab();
+        const changeLog = findPage(tab, "Change Log");
+        if (!changeLog.page) {
+            throw new Error("Change Log custom page is unavailable");
+        }
+
+        expect(runtime.components).toHaveLength(0);
+        const page = changeLog.page();
+        expect(runtime.components).toHaveLength(0);
+
+        page.display();
+        expect(runtime.paneChangeLog).toHaveBeenCalledOnce();
+        expect(runtime.components).toHaveLength(1);
+        expect(runtime.components[0].load).toHaveBeenCalledOnce();
+
+        page.display();
+        expect(runtime.components[0].unload).toHaveBeenCalledOnce();
+        expect(runtime.pageCleanup).toHaveBeenCalledOnce();
+        expect(runtime.components).toHaveLength(2);
+
+        page.hide();
+        expect(runtime.components[1].unload).toHaveBeenCalledOnce();
+        expect(runtime.pageCleanup).toHaveBeenCalledTimes(2);
+        expect(runtime.superHide).toHaveBeenCalledOnce();
+    });
+
+    it("does not run delayed pane work after its page scope has been disposed", async () => {
+        runtime.paneChangeLog.mockImplementation(function (
+            this: ObsidianLiveSyncSettingTab,
+            _paneEl: HTMLElement,
+            { addPanel }: Pick<PageFunctions, "addPanel">
+        ) {
+            void addPanel(createElement(), "Delayed panel").then(() => {
+                this.lifetimeComponent.register(runtime.pageCleanup);
+            });
+        });
+        const tab = createSettingsTab();
+        const changeLog = findPage(tab, "Change Log");
+        if (!changeLog.page) {
+            throw new Error("Change Log custom page is unavailable");
+        }
+
+        const page = changeLog.page();
+        page.display();
+        page.hide();
+        await Promise.resolve();
+
+        expect(runtime.pageCleanup).not.toHaveBeenCalled();
+    });
+
+    it("runs a delayed pane callback inside its active scope before a queued hide", async () => {
+        runtime.paneChangeLog.mockImplementation(function (
+            this: ObsidianLiveSyncSettingTab,
+            _paneEl: HTMLElement,
+            { addPanel }: Pick<PageFunctions, "addPanel">
+        ) {
+            void addPanel(createElement(), "Delayed panel").then(() => {
+                this.lifetimeComponent.register(runtime.pageCleanup);
+            });
+        });
+        const tab = createSettingsTab();
+        const changeLog = findPage(tab, "Change Log");
+        if (!changeLog.page) {
+            throw new Error("Change Log custom page is unavailable");
+        }
+
+        const page = changeLog.page();
+        page.display();
+        queueMicrotask(() => page.hide());
+        await Promise.resolve();
+        await Promise.resolve();
+
+        expect(runtime.pageCleanup).toHaveBeenCalledOnce();
+    });
+
+    it("rebuilds the catalogue when an externally loaded setting changes page visibility", () => {
+        const tab = createSettingsTab();
+        const changeLog = findPage(tab, "Change Log");
+        if (!changeLog.page) {
+            throw new Error("Change Log custom page is unavailable");
+        }
+        changeLog.page().display();
+        tab.core.settings.usePowerUserMode = !tab.editingSettings.usePowerUserMode;
+
+        tab.requestReload();
+
+        expect(tab.update).toHaveBeenCalledOnce();
+    });
+
+    it("rebuilds the catalogue after an Extra menus feature level is saved", async () => {
+        const tab = createSettingsTab();
+        tab.editingSettings.usePowerUserMode = true;
+
+        await tab.saveSettings(["usePowerUserMode"]);
+
+        expect(tab.update).toHaveBeenCalledOnce();
+    });
+
+    it("rebuilds translated catalogue names when the display language changes externally", () => {
+        const tab = createSettingsTab();
+        const changeLog = findPage(tab, "Change Log");
+        if (!changeLog.page) {
+            throw new Error("Change Log custom page is unavailable");
+        }
+        changeLog.page().display();
+        tab.core.settings.displayLanguage = "ja";
+
+        tab.requestReload();
+
+        expect(tab.update).toHaveBeenCalledOnce();
+    });
+
+    it("rebuilds the catalogue after accepting an external page-visibility setting over a dirty value", () => {
+        const tab = createSettingsTab();
+        const changeLog = findPage(tab, "Change Log");
+        if (!changeLog.page) {
+            throw new Error("Change Log custom page is unavailable");
+        }
+        changeLog.page().display();
+        tab.initialSettings!.usePowerUserMode = false;
+        tab.editingSettings.usePowerUserMode = true;
+        tab.core.settings.usePowerUserMode = true;
+
+        tab.requestReload();
+        const configureAnchor = vi.mocked(tab.core.confirm.askInPopup).mock.calls[0]?.[2];
+        expect(configureAnchor).toBeTypeOf("function");
+        let acceptExternalSetting: (() => void) | undefined;
+        configureAnchor?.({
+            text: "",
+            addEventListener: vi.fn((_event: string, callback: () => void) => {
+                acceptExternalSetting = callback;
+            }),
+        } as unknown as HTMLAnchorElement);
+        expect(acceptExternalSetting).toBeTypeOf("function");
+        vi.mocked(tab.update).mockClear();
+        acceptExternalSetting!();
+
+        expect(tab.update).toHaveBeenCalledOnce();
+    });
+
+    it("does not reopen a custom page when a catalogue update has already hidden it", () => {
+        const tab = createSettingsTab();
+        const changeLog = findPage(tab, "Change Log");
+        if (!changeLog.page) {
+            throw new Error("Change Log custom page is unavailable");
+        }
+        const page = changeLog.page();
+        page.display();
+        vi.mocked(tab.update).mockImplementation(() => page.hide());
+
+        tab.requestCatalogueRefresh();
+
+        expect(runtime.paneChangeLog).toHaveBeenCalledOnce();
+    });
+
+    it("keeps saved-setting effects owned by the tab after a custom page closes", async () => {
+        runtime.paneChangeLog.mockImplementation(function (this: ObsidianLiveSyncSettingTab) {
+            this.addOnSaved("displayLanguage", runtime.savedEffect);
+        });
+        const tab = createSettingsTab();
+        const changeLog = findPage(tab, "Change Log");
+        if (!changeLog.page) {
+            throw new Error("Change Log custom page is unavailable");
+        }
+
+        const page = changeLog.page();
+        page.display();
+        page.hide();
+        tab.editingSettings.displayLanguage = "ja";
+        await tab.saveSettings(["displayLanguage"]);
+
+        expect(runtime.savedEffect).toHaveBeenCalledOnce();
+    });
+});

src/modules/features/SettingDialogue/ObsidianLiveSyncSettingTab.ts

@@ -1,10 +1,8 @@
-import { App, Component, PluginSettingTab } from "@/deps.ts";
+import { App, Component, PluginSettingTab, requireApiVersion, SettingPage } from "@/deps.ts";
 import {
     type ObsidianLiveSyncSettings,
     type RemoteDBSettings,
     LOG_LEVEL_NOTICE,
-    FLAGMD_REDFLAG2_HR,
-    FLAGMD_REDFLAG3_HR,
     REMOTE_COUCHDB,
     REMOTE_MINIO,
     type ConfigLevel,
@@ -33,10 +31,15 @@ import {
 import { $msg } from "@/common/translation";
 import { LiveSyncSetting as Setting } from "./LiveSyncSetting.ts";
 import { fireAndForget, yieldNextAnimationFrame } from "octagonal-wheels/promises";
-import { EVENT_REQUEST_RELOAD_SETTING_TAB, eventHub } from "@/common/events.ts";
-import { paneChangeLog } from "./PaneChangeLog.ts";
 import {
-    enableOnly,
+    EVENT_ON_UNRESOLVED_ERROR,
+    EVENT_REQUEST_COPY_SETUP_URI,
+    EVENT_REQUEST_OPEN_SETUP_URI,
+    EVENT_REQUEST_RELOAD_SETTING_TAB,
+    EVENT_REQUEST_SHOW_SETUP_QR,
+    eventHub,
+} from "@/common/events.ts";
+import {
     // findAttrFromParent,
     // getLevelStr,
     setLevelClass,
@@ -46,32 +49,47 @@ import {
     type OnSavedHandlerFunc,
     type OnUpdateFunc,
     type OnUpdateResult,
+    type DeferredPageElement,
     type PageFunctions,
     type UpdateFunction,
 } from "./SettingPane.ts";
-import { paneSetup } from "./PaneSetup.ts";
-import { paneGeneral } from "./PaneGeneral.ts";
-import { paneRemoteConfig } from "./PaneRemoteConfig.ts";
-import { paneSelector } from "./PaneSelector.ts";
-import { paneSyncSettings } from "./PaneSyncSettings.ts";
-import { paneCustomisationSync } from "./PaneCustomisationSync.ts";
-import { paneHatch } from "./PaneHatch.ts";
-import { paneAdvanced } from "./PaneAdvanced.ts";
-import { panePowerUsers } from "./PanePowerUsers.ts";
-import { panePatches } from "./PanePatches.ts";
-import { paneMaintenance } from "./PaneMaintenance.ts";
 import { compatGlobal } from "@vrtmrz/livesync-commonlib/compat/common/coreEnvFunctions";
 import { JournalSyncCore } from "@vrtmrz/livesync-commonlib/compat/replication/journal/JournalSyncCore";
 import { MinioStorageAdapter } from "@vrtmrz/livesync-commonlib/compat/replication/journal/objectstore/MinioStorageAdapter";
 import { closeObsidianSettings } from "@/common/obsidianSettings.ts";
+import {
+    createAdvancedSettingDefinitionGroups,
+    createExtraMenuSettingDefinitions,
+    createGeneralSettingDefinitionGroups,
+    createSettingsPageCatalogue,
+    getSettingsRootGroupEntry,
+    type SettingsPageEntry,
+    type SettingsRootGroupId,
+} from "./SettingsPageCatalogue.ts";
+import { createAdvancedSettingSpecGroups } from "./AdvancedSettingSpecs.ts";
+import { isValidSettingSpecValue, type SettingSpec } from "./SettingSpec.ts";
+import type {
+    SettingDefinitionAction,
+    SettingDefinitionGroup,
+    SettingDefinitionItem,
+    SettingDefinitionPage,
+    SettingGroupItem,
+} from "obsidian";
+import { createExtraMenuSettingSpecGroup, createGeneralSettingSpecGroups } from "./GeneralSettingSpecs.ts";
+import { SetupManager } from "@/modules/features/SetupManager.ts";
+import { isP2PMainRemote } from "@/common/remoteConfiguration.ts";
 
 // For creating a document
 // const toc = new Set<string>();
 
 export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
     plugin: ObsidianLiveSyncPlugin;
-    private _lifetimeComponent: Component = new Component();
+    private _lifetimeComponent?: Component;
+    private activePageRefresh?: () => void;
     get lifetimeComponent(): Component {
+        if (!this._lifetimeComponent) {
+            throw new Error("The settings page render scope has not been initialised");
+        }
         return this._lifetimeComponent;
     }
     get core() {
@@ -200,9 +218,39 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
             for (const func of this.controlledElementFunc) {
                 func();
             }
+            if (requireApiVersion("1.13.0") && typeof this.refreshDomState === "function") {
+                this.refreshDomState();
+            }
         });
     }
 
+    /** Re-render the active imperative page without assuming which settings renderer owns it. */
+    requestPageRefresh() {
+        if (this.activePageRefresh) {
+            this.activePageRefresh();
+            return;
+        }
+        if (requireApiVersion("1.13.0") && typeof SettingPage === "function" && typeof this.update === "function") {
+            this.update();
+            return;
+        }
+        this.displayImperative();
+    }
+
+    /** Rebuild the native page catalogue and preserve the current imperative page where possible. */
+    requestCatalogueRefresh() {
+        if (requireApiVersion("1.13.0") && typeof SettingPage === "function" && typeof this.update === "function") {
+            const refreshPage = this.activePageRefresh;
+            const owner = this._lifetimeComponent;
+            this.update();
+            if (owner && this._lifetimeComponent === owner) {
+                refreshPage?.();
+            }
+        } else {
+            this.displayImperative();
+        }
+    }
+
     reloadAllLocalSettings() {
         const ret = { ...OnDialogSettingsDefault };
         ret.configPassphrase = compatGlobal.localStorage.getItem("ls-setting-passphrase") || "";
@@ -275,8 +323,6 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
     controlledElementFunc = [] as UpdateFunction[];
     onSavedHandlers = [] as OnSavedHandler<AllSettingItemKey>[];
 
-    inWizard: boolean = false;
-
     constructor(app: App, plugin: ObsidianLiveSyncPlugin) {
         super(app, plugin);
         this.plugin = plugin;
@@ -284,6 +330,12 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
         eventHub.onEvent(EVENT_REQUEST_RELOAD_SETTING_TAB, () => {
             this.requestReload();
         });
+        this.addOnSaved("displayLanguage", () => this.requestCatalogueRefresh());
+        this.addOnSaved("showStatusOnEditor", () => eventHub.emitEvent(EVENT_ON_UNRESOLVED_ERROR));
+        this.addOnSaved("networkWarningStyle", () => eventHub.emitEvent(EVENT_ON_UNRESOLVED_ERROR));
+        this.addOnSaved("useAdvancedMode", () => this.requestCatalogueRefresh());
+        this.addOnSaved("usePowerUserMode", () => this.requestCatalogueRefresh());
+        this.addOnSaved("useEdgeCaseMode", () => this.requestCatalogueRefresh());
     }
 
     async testConnection(settingOverride: Partial<ObsidianLiveSyncSettings> = {}): Promise<void> {
@@ -311,6 +363,29 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
         closeObsidianSettings(this.plugin.app);
     }
 
+    requestOpenSetupURI(): void {
+        this.closeSetting();
+        eventHub.emitEvent(EVENT_REQUEST_OPEN_SETUP_URI);
+    }
+
+    async rerunOnboardingWizard(): Promise<void> {
+        await this.core.getModule(SetupManager).startOnBoarding();
+    }
+
+    async enableLiveSyncFromSettings(): Promise<void> {
+        this.editingSettings.isConfigured = true;
+        await this.saveAllDirtySettings();
+        this.services.appLifecycle.askRestart();
+    }
+
+    requestCopySetupURI(): void {
+        eventHub.emitEvent(EVENT_REQUEST_COPY_SETUP_URI);
+    }
+
+    requestShowSetupQRCode(): void {
+        eventHub.emitEvent(EVENT_REQUEST_SHOW_SETUP_QR);
+    }
+
     handleElement(element: HTMLElement, func: OnUpdateFunc) {
         const updateFunc = ((element, func) => {
             const prev = {} as OnUpdateResult;
@@ -357,7 +432,12 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
 
     addOnSaved<T extends AllSettingItemKey>(key: T, func: OnSavedHandlerFunc<T>) {
         const newHandler = { key, handler: func } as OnSavedHandler<AllSettingItemKey>;
-        this.onSavedHandlers.push(newHandler);
+        const existing = this.onSavedHandlers.findIndex((handler) => handler.key === key);
+        if (existing === -1) {
+            this.onSavedHandlers.push(newHandler);
+        } else {
+            this.onSavedHandlers.splice(existing, 1, newHandler);
+        }
     }
     resetEditingSettings() {
         this._editingSettings = undefined;
@@ -365,17 +445,37 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
     }
 
     override hide() {
+        this.disposeRenderScope();
         super.hide();
-        this._lifetimeComponent.unload();
         this.isShown = false;
     }
     isShown: boolean = false;
 
+    private changesPageCatalogue(key: AllSettingItemKey): boolean {
+        return (
+            key === "displayLanguage" ||
+            key === "useAdvancedMode" ||
+            key === "usePowerUserMode" ||
+            key === "useEdgeCaseMode" ||
+            key === "isConfigured" ||
+            key === "liveSync" ||
+            key === "periodicReplication" ||
+            key === "syncOnSave" ||
+            key === "syncOnEditorSave" ||
+            key === "syncOnStart" ||
+            key === "syncOnFileOpen" ||
+            key === "syncAfterMerge"
+        );
+    }
+
     requestReload() {
-        if (this.isShown) {
+        const nativeTabIsShown =
+            this.supportsDeclarativeSettings() && this.containerEl !== undefined && this.containerEl.isShown();
+        if (this.isShown || nativeTabIsShown) {
             const newConf = this.core.settings;
             const keys = Object.keys(newConf) as (keyof ObsidianLiveSyncSettings)[];
             let hasLoaded = false;
+            let catalogueVisibilityChanged = false;
             for (const k of keys) {
                 if (isObjectDifferent(newConf[k], this.initialSettings?.[k])) {
                     // Something has changed
@@ -390,7 +490,11 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                                 anchor.text = $msg("obsidianLiveSyncSettingTab.optionHere");
                                 anchor.addEventListener("click", () => {
                                     this.refreshSetting(k as AllSettingItemKey);
-                                    this.display();
+                                    if (this.changesPageCatalogue(k as AllSettingItemKey)) {
+                                        this.requestCatalogueRefresh();
+                                    } else {
+                                        this.requestPageRefresh();
+                                    }
                                 });
                             }
                         );
@@ -401,11 +505,18 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                             continue;
                         }
                         hasLoaded = true;
+                        if (this.changesPageCatalogue(k as AllSettingItemKey)) {
+                            catalogueVisibilityChanged = true;
+                        }
                     }
                 }
             }
             if (hasLoaded) {
-                this.display();
+                if (catalogueVisibilityChanged) {
+                    this.requestCatalogueRefresh();
+                } else {
+                    this.requestPageRefresh();
+                }
             } else {
                 this.requestUpdate();
             }
@@ -436,20 +547,6 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
         }
         this.selectedScreen = screen;
     }
-    async enableMinimalSetup() {
-        this.editingSettings.liveSync = false;
-        this.editingSettings.periodicReplication = false;
-        this.editingSettings.syncOnSave = false;
-        this.editingSettings.syncOnEditorSave = false;
-        this.editingSettings.syncOnStart = false;
-        this.editingSettings.syncOnFileOpen = false;
-        this.editingSettings.syncAfterMerge = false;
-        this.core.replicator.closeReplication();
-        await this.saveAllDirtySettings();
-        this.containerEl.addClass("isWizard");
-        this.inWizard = true;
-        this.changeDisplay("20");
-    }
     menuEl?: HTMLElement;
 
     addScreenElement(key: string, element: HTMLElement) {
@@ -489,22 +586,350 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
             "encrypt",
         ]);
     }
-    isAnySyncEnabled() {
-        if (this.isConfiguredAs("isConfigured", false)) return false;
-        if (this.isConfiguredAs("liveSync", true)) return true;
-        if (this.isConfiguredAs("periodicReplication", true)) return true;
-        if (this.isConfiguredAs("syncOnFileOpen", true)) return true;
-        if (this.isConfiguredAs("syncOnSave", true)) return true;
-        if (this.isConfiguredAs("syncOnEditorSave", true)) return true;
-        if (this.isConfiguredAs("syncOnStart", true)) return true;
-        if (this.isConfiguredAs("syncAfterMerge", true)) return true;
-        if (this.isConfiguredAs("syncOnFileOpen", true)) return true;
-        if (this.core?.replicator?.syncStatus == "CONNECTED") return true;
-        if (this.core?.replicator?.syncStatus == "PAUSED") return true;
-        return false;
+    isLiveSyncConfigured() {
+        return this.isConfiguredAs("isConfigured", true);
     }
 
-    enableOnlySyncDisabled = enableOnly(() => !this.isAnySyncEnabled());
+    private supportsDeclarativeSettings(): boolean {
+        return requireApiVersion("1.13.0") && typeof SettingPage === "function";
+    }
+
+    private isPageVisible(level?: ConfigLevel): boolean {
+        if (level === LEVEL_ADVANCED) {
+            return this.isConfiguredAs("useAdvancedMode", true);
+        }
+        if (level === LEVEL_POWER_USER) {
+            return this.isConfiguredAs("usePowerUserMode", true);
+        }
+        if (level === LEVEL_EDGE_CASE) {
+            return this.isConfiguredAs("useEdgeCaseMode", true);
+        }
+        return true;
+    }
+
+    private getDeclarativeSettingSpec(key: string): SettingSpec {
+        const spec = [
+            ...createGeneralSettingSpecGroups({
+                showEditorStatusDetails: () => this.isConfiguredAs("showStatusOnEditor", true),
+                showVerboseLog: () => this.isConfiguredAs("lessInformationInLog", false),
+            }),
+            createExtraMenuSettingSpecGroup(),
+            ...createAdvancedSettingSpecGroups({
+                isCouchDB: () => this.isConfiguredAs("remoteType", REMOTE_COUCHDB),
+            }),
+        ]
+            .flatMap((group) => group.items)
+            .find((candidate) => candidate.key === key);
+        if (!spec) {
+            throw new Error(`Unknown declarative setting key: ${key}`);
+        }
+        return spec;
+    }
+
+    override getControlValue(key: string): unknown {
+        const spec = this.getDeclarativeSettingSpec(key);
+        return this.editingSettings[spec.key];
+    }
+
+    override async setControlValue(key: string, value: unknown): Promise<void> {
+        const spec = this.getDeclarativeSettingSpec(key);
+        if (!isValidSettingSpecValue(spec, value)) {
+            throw new TypeError(`Invalid value for declarative setting ${key}`);
+        }
+        Reflect.set(this.editingSettings, spec.key, value);
+        await this.saveSettings([spec.key]);
+    }
+
+    private createRebuildRequiredAction(): SettingDefinitionAction {
+        return {
+            name: $msg("obsidianLiveSyncSettingTab.optionApply"),
+            desc: $msg("obsidianLiveSyncSettingTab.msgChangesNeedToBeApplied"),
+            visible: () => this.isNeedRebuildLocal() || this.isNeedRebuildRemote(),
+            action: () => fireAndForget(async () => await this.confirmRebuild()),
+        };
+    }
+
+    private renderRebuildRequiredAction(parentEl: HTMLElement): void {
+        this.createEl(
+            parentEl,
+            "div",
+            { cls: "sls-setting-menu-buttons" },
+            (el) => {
+                el.createEl("label", { text: $msg("obsidianLiveSyncSettingTab.msgChangesNeedToBeApplied") });
+                void this.addEl(
+                    el,
+                    "button",
+                    { text: $msg("obsidianLiveSyncSettingTab.optionApply"), cls: "mod-warning" },
+                    (buttonEl) => {
+                        buttonEl.addEventListener("click", () =>
+                            fireAndForget(async () => await this.confirmRebuild())
+                        );
+                    }
+                );
+            },
+            visibleOnly(() => this.isNeedRebuildLocal() || this.isNeedRebuildRemote())
+        );
+    }
+
+    private addPanel(
+        parentEl: HTMLElement,
+        title: string,
+        callback?: (el: HTMLDivElement) => void,
+        func?: OnUpdateFunc,
+        level?: ConfigLevel
+    ): DeferredPageElement {
+        const owner = this.lifetimeComponent;
+        const el = this.createEl(parentEl, "div", { text: "" }, callback, func);
+        setLevelClass(el, level);
+        this.createEl(el, "h4", { text: title, cls: "sls-setting-panel-title" });
+        return this.resolveWithinRenderScope(el, owner);
+    }
+
+    /** Run delayed pane construction only while the requesting page still owns the render scope. */
+    private resolveWithinRenderScope<T extends HTMLElement>(value: T, owner: Component): DeferredPageElement<T> {
+        return {
+            then: (callback) => {
+                queueMicrotask(() => {
+                    if (this._lifetimeComponent === owner) {
+                        callback(value);
+                    }
+                });
+            },
+        };
+    }
+
+    private renderCustomPage(page: SettingPage, entry: SettingsPageEntry): Component {
+        if (requireApiVersion("1.13.0")) {
+            const component = this.beginRenderScope(() => page.display());
+            this.isShown = true;
+            page.title = entry.name();
+            page.containerEl.empty();
+            page.containerEl.addClass("sls-setting");
+            setStyle(page.containerEl, "menu-setting-poweruser", () => this.isConfiguredAs("usePowerUserMode", true));
+            setStyle(page.containerEl, "menu-setting-advanced", () => this.isConfiguredAs("useAdvancedMode", true));
+            setStyle(page.containerEl, "menu-setting-edgecase", () => this.isConfiguredAs("useEdgeCaseMode", true));
+            this.renderRebuildRequiredAction(page.containerEl);
+
+            const addPane: PageFunctions["addPane"] = (parentEl, title, _icon, _order, level) => {
+                const paneEl = this.createEl(parentEl, "div", { text: "" });
+                setLevelClass(paneEl, level);
+                new Setting(paneEl).setName(title).setHeading().setClass("sls-setting-pane-title");
+                return this.resolveWithinRenderScope(paneEl, component);
+            };
+            entry.legacy.call(this, page.containerEl, {
+                addPane,
+                addPanel: this.addPanel.bind(this),
+            });
+            this.requestUpdate();
+            return component;
+        }
+        throw new Error("Custom settings pages require Obsidian 1.13.0 or later");
+    }
+
+    private createCustomSettingPage(entry: SettingsPageEntry): SettingPage {
+        if (requireApiVersion("1.13.0") && typeof SettingPage === "function") {
+            const renderCustomPage = this.renderCustomPage.bind(this);
+            const disposeRenderScope = this.disposeRenderScope.bind(this);
+            return new (class extends SettingPage {
+                private scope?: Component;
+                override title = entry.name();
+
+                override display(): void {
+                    this.scope = renderCustomPage(this, entry);
+                }
+
+                override hide(): void {
+                    disposeRenderScope(this.scope);
+                    this.scope = undefined;
+                    super.hide();
+                }
+            })();
+        }
+        throw new Error("Custom settings pages require Obsidian 1.13.0 or later");
+    }
+
+    private createDeclarativePage(entry: SettingsPageEntry): SettingDefinitionPage {
+        const page: SettingDefinitionPage = {
+            type: "page",
+            name: `${entry.icon} ${entry.name()}`,
+            visible: () => this.isPageVisible(entry.level),
+        };
+        if (entry.content === "native") {
+            page.items = [
+                this.createRebuildRequiredAction(),
+                ...createAdvancedSettingDefinitionGroups({
+                    isCouchDB: () => this.isConfiguredAs("remoteType", REMOTE_COUCHDB),
+                }),
+            ];
+        } else {
+            page.page = () => this.createCustomSettingPage(entry);
+        }
+        return page;
+    }
+
+    private createGeneralSettingsGroup(): SettingDefinitionGroup {
+        const groups = createGeneralSettingDefinitionGroups({
+            showEditorStatusDetails: () => this.isConfiguredAs("showStatusOnEditor", true),
+            showVerboseLog: () => this.isConfiguredAs("lessInformationInLog", false),
+        });
+        const [appearance, logging] = groups;
+        if (!appearance || !logging) {
+            throw new Error("General settings must define Appearance and Logging groups");
+        }
+        return this.createRootGroup("general-settings", [
+            {
+                type: "page",
+                name: `🎨 ${appearance.heading}`,
+                items: appearance.items,
+            },
+            {
+                type: "page",
+                name: `📝 ${logging.heading}`,
+                items: logging.items,
+            },
+            this.createExtraMenusPage(),
+        ]);
+    }
+
+    private createExtraMenusPage(): SettingDefinitionPage {
+        return {
+            type: "page",
+            name: `🎚️ ${$msg("obsidianLiveSyncSettingTab.titleExtraMenus")}`,
+            items: createExtraMenuSettingDefinitions(),
+        };
+    }
+
+    private createQuickSetupGroup(): SettingDefinitionGroup {
+        return this.createRootGroup("quick-setup", [
+            {
+                name: $msg("obsidianLiveSyncSettingTab.nameConnectSetupURI"),
+                desc: $msg("obsidianLiveSyncSettingTab.descConnectSetupURI"),
+                action: () => this.requestOpenSetupURI(),
+            },
+            {
+                name: $msg("Rerun Onboarding Wizard"),
+                desc: $msg("Rerun the onboarding wizard to set up Self-hosted LiveSync again."),
+                action: () => fireAndForget(async () => await this.rerunOnboardingWizard()),
+            },
+            {
+                name: $msg("obsidianLiveSyncSettingTab.nameEnableLiveSync"),
+                desc: $msg("obsidianLiveSyncSettingTab.descEnableLiveSync"),
+                visible: () => !this.isConfiguredAs("isConfigured", true),
+                action: () => fireAndForget(async () => await this.enableLiveSyncFromSettings()),
+            },
+        ]);
+    }
+
+    private createRootGroup(
+        id: SettingsRootGroupId,
+        items: SettingGroupItem[],
+        visible?: () => boolean
+    ): SettingDefinitionGroup {
+        const { icon, name } = getSettingsRootGroupEntry(id);
+        return {
+            type: "group",
+            heading: `${icon} ${name()}`,
+            items,
+            ...(visible ? { visible } : {}),
+        };
+    }
+
+    private createSetupOtherDevicesGroup(): SettingDefinitionGroup {
+        return this.createRootGroup(
+            "setup-other-devices",
+            [
+                {
+                    name: $msg("obsidianLiveSyncSettingTab.nameCopySetupURI"),
+                    desc: $msg("obsidianLiveSyncSettingTab.descCopySetupURI"),
+                    action: () => this.requestCopySetupURI(),
+                },
+                {
+                    name: $msg("Setup.ShowQRCode"),
+                    desc: $msg("Setup.ShowQRCode.Desc"),
+                    action: () => this.requestShowSetupQRCode(),
+                },
+            ],
+            () => this.isConfiguredAs("isConfigured", true)
+        );
+    }
+
+    override getSettingDefinitions(): SettingDefinitionItem[] {
+        if (!this.supportsDeclarativeSettings()) {
+            return [];
+        }
+        const catalogue = createSettingsPageCatalogue();
+        const getPage = (id: string): SettingDefinitionPage => {
+            const entry = catalogue.find((candidate) => candidate.id === id);
+            if (!entry) {
+                throw new Error(`Unknown settings page: ${id}`);
+            }
+            return this.createDeclarativePage(entry);
+        };
+        const synchronisation = this.createRootGroup("synchronisation", [
+            getPage("remote-configuration"),
+            getPage("synchronisation"),
+        ]);
+        const generalSettings = this.createGeneralSettingsGroup();
+        const quickSetup = this.createQuickSetupGroup();
+        const setupOtherDevices = this.createSetupOtherDevicesGroup();
+        const maintenance = this.createRootGroup("maintenance-and-recovery", [
+            getPage("maintenance"),
+            getPage("hatch"),
+        ]);
+        const extraFeatures = this.createRootGroup(
+            "extra-features",
+            [getPage("selector"), getPage("customisation-sync")],
+            () => this.isPageVisible(LEVEL_ADVANCED)
+        );
+        const advancedSettings = this.createRootGroup(
+            "advanced-settings",
+            [getPage("advanced"), getPage("power-users"), getPage("patches")],
+            () =>
+                this.isPageVisible(LEVEL_ADVANCED) ||
+                this.isPageVisible(LEVEL_POWER_USER) ||
+                this.isPageVisible(LEVEL_EDGE_CASE)
+        );
+        const helpAndInformation = this.createRootGroup("help-and-information", [
+            getPage("help"),
+            getPage("change-log"),
+        ]);
+        const laterGroups = [maintenance, extraFeatures, advancedSettings, helpAndInformation];
+
+        const pendingInitialisation = this.createRebuildRequiredAction();
+        if (this.isLiveSyncConfigured()) {
+            return [
+                pendingInitialisation,
+                synchronisation,
+                generalSettings,
+                setupOtherDevices,
+                quickSetup,
+                ...laterGroups,
+            ];
+        }
+        return [pendingInitialisation, quickSetup, synchronisation, generalSettings, setupOtherDevices, ...laterGroups];
+    }
+
+    private beginRenderScope(refresh: () => void): Component {
+        this.disposeRenderScope();
+        const component = new Component();
+        this._lifetimeComponent = component;
+        this.activePageRefresh = refresh;
+        this.settingComponents.length = 0;
+        this.controlledElementFunc.length = 0;
+        component.load();
+        return component;
+    }
+
+    private disposeRenderScope(owner?: Component): void {
+        if (owner && this._lifetimeComponent !== owner) {
+            return;
+        }
+        this._lifetimeComponent?.unload();
+        this._lifetimeComponent = undefined;
+        this.activePageRefresh = undefined;
+        this.settingComponents.length = 0;
+        this.controlledElementFunc.length = 0;
+    }
 
     onlyOnP2POrCouchDB = () =>
         ({
@@ -547,7 +972,8 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
         if (typeof db === "string") {
             Logger($msg("obsidianLiveSyncSettingTab.logCheckPassphraseFailed", { db }), LOG_LEVEL_NOTICE);
             return false;
-        } else {
+        }
+        try {
             if (await checkSyncInfo(db.db)) {
                 // Logger($msg("obsidianLiveSyncSettingTab.logDatabaseConnected"), LOG_LEVEL_NOTICE);
                 return true;
@@ -555,6 +981,8 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                 Logger($msg("obsidianLiveSyncSettingTab.logPassphraseNotCompatible"), LOG_LEVEL_NOTICE);
                 return false;
             }
+        } finally {
+            await db.db.close();
         }
     };
     isPassphraseValid = async () => {
@@ -597,61 +1025,66 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
             Logger(`Passphrase is not valid, please fix it.`, LOG_LEVEL_NOTICE);
             return;
         }
-        const OPTION_FETCH = $msg("obsidianLiveSyncSettingTab.optionFetchFromRemote");
-        const OPTION_REBUILD_BOTH = $msg("obsidianLiveSyncSettingTab.optionRebuildBoth");
-        const OPTION_ONLY_SETTING = $msg("obsidianLiveSyncSettingTab.optionSaveOnlySettings");
-        const OPTION_CANCEL = $msg("obsidianLiveSyncSettingTab.optionCancel");
-        const title = $msg("obsidianLiveSyncSettingTab.titleRebuildRequired");
-        const note = $msg("obsidianLiveSyncSettingTab.msgRebuildRequired", {
-            OPTION_REBUILD_BOTH,
-            OPTION_FETCH,
-            OPTION_ONLY_SETTING,
+        const keepEditing = $msg("Ui.SetupWizard.ApplySettingsInitialisation.KeepEditing");
+        const setupManager = this.core.getModule(SetupManager);
+        const result = await setupManager.applySettingsWithInitialisationChoice({
+            isP2P: isP2PMainRemote(this.editingSettings),
+            validateChoice: async (mode) => {
+                if (mode !== "fetch" || (await this.checkWorkingPassphrase())) {
+                    return true;
+                }
+                const continueFetch = $msg("Ui.SetupWizard.ApplySettingsInitialisation.ContinueFetch");
+                return (
+                    (await this.core.confirm.confirmWithMessage(
+                        $msg("Ui.SetupWizard.ApplySettingsInitialisation.RemoteVerificationTitle"),
+                        $msg("Ui.SetupWizard.ApplySettingsInitialisation.RemoteVerificationGuidance"),
+                        [continueFetch, keepEditing],
+                        keepEditing
+                    )) === continueFetch
+                );
+            },
+            applySettings: async () => {
+                if (!this.editingSettings.encrypt) {
+                    this.editingSettings.passphrase = "";
+                }
+                await this.saveAllDirtySettings();
+            },
         });
-        const buttons = [
-            OPTION_FETCH,
-            OPTION_REBUILD_BOTH, // OPTION_REBUILD_REMOTE,
-            OPTION_ONLY_SETTING,
-            OPTION_CANCEL,
-        ];
-        const result = await this.core.confirm.confirmWithMessage(title, note, buttons, OPTION_CANCEL);
-        if (result == OPTION_CANCEL) return;
-        if (result == OPTION_FETCH) {
-            if (!(await this.checkWorkingPassphrase())) {
-                if (
-                    (await this.core.confirm.askYesNoDialog($msg("obsidianLiveSyncSettingTab.msgAreYouSureProceed"), {
-                        defaultOption: "No",
-                    })) != "yes"
-                )
-                    return;
+        if (result.result === "scheduled") {
+            this.closeSetting();
+            return;
+        }
+        if (result.result === "failed") {
+            return;
+        }
+
+        const applyWithoutInitialisation = $msg(
+            "Ui.SetupWizard.ApplySettingsInitialisation.ApplyWithoutInitialisation"
+        );
+        const fallback = await this.core.confirm.confirmWithMessage(
+            $msg("Ui.SetupWizard.ApplySettingsInitialisation.BypassTitle"),
+            $msg("Ui.SetupWizard.ApplySettingsInitialisation.BypassGuidance"),
+            [applyWithoutInitialisation, keepEditing],
+            keepEditing
+        );
+        if (fallback === applyWithoutInitialisation) {
+            if (!this.editingSettings.encrypt) {
+                this.editingSettings.passphrase = "";
             }
-        }
-        if (!this.editingSettings.encrypt) {
-            this.editingSettings.passphrase = "";
-        }
-        await this.saveAllDirtySettings();
-        await Promise.resolve(this.applyAllSettings());
-        if (result == OPTION_FETCH) {
-            await this.core.storageAccess.writeFileAuto(FLAGMD_REDFLAG3_HR, "");
-            this.services.appLifecycle.scheduleRestart();
-            this.closeSetting();
-            // await rebuildDB("localOnly");
-        } else if (result == OPTION_REBUILD_BOTH) {
-            await this.core.storageAccess.writeFileAuto(FLAGMD_REDFLAG2_HR, "");
-            this.services.appLifecycle.scheduleRestart();
-            this.closeSetting();
-        } else if (result == OPTION_ONLY_SETTING) {
-            await this.services.setting.saveSettingData();
+            await this.saveAllDirtySettings();
         }
     }
 
+    // The imperative renderer remains required by the declared Obsidian 1.7.2 minimum version.
     override display(): void {
+        this.displayImperative();
+    }
+
+    private displayImperative(): void {
         const changeDisplay = this.changeDisplay.bind(this);
-        // Make sure lifetime component is loaded for markdown rendering in panes.
-        this._lifetimeComponent.load();
+        // Make sure the page-owned component is loaded for markdown rendering in panes.
+        this.beginRenderScope(() => this.displayImperative());
         const { containerEl } = this;
-        this.settingComponents.length = 0;
-        this.controlledElementFunc.length = 0;
-        this.onSavedHandlers.length = 0;
         this.screenElements = {};
         if (this._editingSettings == undefined || this.initialSettings == undefined) {
             this.reloadAllSettings();
@@ -664,7 +1097,6 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
         containerEl.empty();
 
         containerEl.addClass("sls-setting");
-        containerEl.removeClass("isWizard");
 
         setStyle(containerEl, "menu-setting-poweruser", () => this.isConfiguredAs("usePowerUserMode", true));
         setStyle(containerEl, "menu-setting-advanced", () => this.isConfiguredAs("useAdvancedMode", true));
@@ -680,87 +1112,38 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
         this.menuEl.addClass("sls-setting-menu");
         const menuTabs = this.menuEl.querySelectorAll(".sls-setting-label");
 
-        this.createEl(
-            menuWrapper,
-            "div",
-            { cls: "sls-setting-menu-buttons" },
-            (el) => {
-                el.addClass("wizardHidden");
-                el.createEl("label", { text: $msg("obsidianLiveSyncSettingTab.msgChangesNeedToBeApplied") });
-                void this.addEl(
-                    el,
-                    "button",
-                    { text: $msg("obsidianLiveSyncSettingTab.optionApply"), cls: "mod-warning" },
-                    (buttonEl) => {
-                        buttonEl.addEventListener("click", () =>
-                            fireAndForget(async () => await this.confirmRebuild())
-                        );
-                    }
-                );
-            },
-            visibleOnly(() => this.isNeedRebuildLocal() || this.isNeedRebuildRemote())
-        );
+        this.renderRebuildRequiredAction(menuWrapper);
 
         // let paneNo = 0;
-        const addPane = (
-            parentEl: HTMLElement,
-            title: string,
-            icon: string,
-            order: number,
-            wizardHidden: boolean,
-            level?: ConfigLevel
-        ) => {
+        const addPane = (parentEl: HTMLElement, title: string, icon: string, order: number, level?: ConfigLevel) => {
+            const owner = this.lifetimeComponent;
             const el = this.createEl(parentEl, "div", { text: "" });
 
             setLevelClass(el, level);
             new Setting(el).setName(title).setHeading().setClass("sls-setting-pane-title");
             if (this.menuEl) {
-                this.menuEl.createEl(
-                    "label",
-                    { cls: `sls-setting-label c-${order} ${wizardHidden ? "wizardHidden" : ""}` },
-                    (el) => {
-                        setLevelClass(el, level);
-                        const inputEl = el.createEl("input", {
-                            type: "radio",
-                            name: "disp",
-                            value: `${order}`,
-                            cls: "sls-setting-tab",
-                        } as DomElementInfo);
-                        el.createDiv({
-                            cls: "sls-setting-menu-btn",
-                            text: icon,
-                            title: title,
-                        });
-                        inputEl.addEventListener("change", (evt) => this.selectPane(evt));
-                        inputEl.addEventListener("click", (evt) => this.selectPane(evt));
-                    }
-                );
+                this.menuEl.createEl("label", { cls: `sls-setting-label c-${order}` }, (el) => {
+                    setLevelClass(el, level);
+                    const inputEl = el.createEl("input", {
+                        type: "radio",
+                        name: "disp",
+                        value: `${order}`,
+                        cls: "sls-setting-tab",
+                    } as DomElementInfo);
+                    el.createDiv({
+                        cls: "sls-setting-menu-btn",
+                        text: icon,
+                        title: title,
+                    });
+                    inputEl.addEventListener("change", (evt) => this.selectPane(evt));
+                    inputEl.addEventListener("click", (evt) => this.selectPane(evt));
+                });
             }
             this.addScreenElement(`${order}`, el);
-            const p = Promise.resolve(el);
-            // fireAndForget
-            // p.finally(() => {
-            //     // Recap at the end.
-            // });
-            return p;
+            return this.resolveWithinRenderScope(el, owner);
         };
         // const panelNoMap = {} as { [key: string]: number };
-        const addPanel = (
-            parentEl: HTMLElement,
-            title: string,
-            callback?: (el: HTMLDivElement) => void,
-            func?: OnUpdateFunc,
-            level?: ConfigLevel
-        ) => {
-            const el = this.createEl(parentEl, "div", { text: "" }, callback, func);
-            setLevelClass(el, level);
-            this.createEl(el, "h4", { text: title, cls: "sls-setting-panel-title" });
-            const p = Promise.resolve(el);
-            // p.finally(() => {
-            //     // Recap at the end.
-            // })
-            return p;
-        };
+        const addPanel = this.addPanel.bind(this);
 
         menuTabs.forEach((element) => {
             const e = element.querySelector(".sls-setting-tab");
@@ -788,38 +1171,13 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
 
         // Add panes
 
-        // TODO: Refactor to new API style.
-        void addPane(containerEl, $msg("obsidianLiveSyncSettingTab.panelChangeLog"), "💬", 100, false).then(
-            bindPane(paneChangeLog)
-        );
-        void addPane(containerEl, $msg("obsidianLiveSyncSettingTab.panelSetup"), "🧙‍♂️", 110, false).then(
-            bindPane(paneSetup)
-        );
-        void addPane(containerEl, $msg("obsidianLiveSyncSettingTab.panelGeneralSettings"), "⚙️", 20, false).then(
-            bindPane(paneGeneral)
-        );
-        void addPane(containerEl, $msg("obsidianLiveSyncSettingTab.panelRemoteConfiguration"), "🛰️", 0, false).then(
-            bindPane(paneRemoteConfig)
-        );
-        void addPane(containerEl, $msg("obsidianLiveSyncSettingTab.titleSyncSettings"), "🔄", 30, false).then(
-            bindPane(paneSyncSettings)
-        );
-        void addPane(containerEl, "Selector", "🚦", 33, false, LEVEL_ADVANCED).then(bindPane(paneSelector));
-        void addPane(containerEl, "Customization sync", "🔌", 60, false, LEVEL_ADVANCED).then(
-            bindPane(paneCustomisationSync)
-        );
-
-        void addPane(containerEl, "Hatch", "🧰", 50, true).then(bindPane(paneHatch));
-        void addPane(containerEl, "Advanced", "🔧", 46, false, LEVEL_ADVANCED).then(bindPane(paneAdvanced));
-        void addPane(containerEl, "Power users", "💪", 47, true, LEVEL_POWER_USER).then(bindPane(panePowerUsers));
-
-        void addPane(containerEl, "Patches", "🩹", 51, false, LEVEL_EDGE_CASE).then(bindPane(panePatches));
-
-        void addPane(containerEl, "Maintenance", "🎛️", 70, true).then(bindPane(paneMaintenance));
+        for (const entry of createSettingsPageCatalogue()) {
+            void addPane(containerEl, entry.name(), entry.icon, entry.order, entry.level).then(bindPane(entry.legacy));
+        }
 
         void yieldNextAnimationFrame().then(() => {
             if (this.selectedScreen == "") {
-                if (this.isAnySyncEnabled()) {
+                if (this.isLiveSyncConfigured()) {
                     changeDisplay("20");
                 } else {
                     changeDisplay("110");

src/modules/features/SettingDialogue/ObsidianLiveSyncSettingTab.unit.spec.ts

@@ -0,0 +1,311 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { DEFAULT_SETTINGS, REMOTE_COUCHDB } from "@vrtmrz/livesync-commonlib/compat/common/types";
+
+const negotiationMocks = vi.hoisted(() => ({
+    checkSyncInfo: vi.fn(async () => true),
+}));
+const settingsInitialisationMocks = vi.hoisted(() => ({
+    applySettingsWithInitialisationChoice: vi.fn(),
+}));
+
+vi.mock("@/deps.ts", () => ({
+    App: class {},
+    Component: class {
+        load = vi.fn();
+        unload = vi.fn();
+        register = vi.fn();
+    },
+    PluginSettingTab: class {},
+    SettingPage: undefined,
+    requireApiVersion: vi.fn(() => false),
+}));
+vi.mock("@/main.ts", () => ({ default: class {} }));
+vi.mock("@vrtmrz/livesync-commonlib/compat/common/coreEnvFunctions", () => ({
+    getLanguage: vi.fn(() => "en"),
+    compatGlobal: {
+        localStorage: {
+            getItem: vi.fn(() => null),
+            setItem: vi.fn(),
+        },
+    },
+}));
+vi.mock("@/common/events.ts", () => ({
+    EVENT_ON_UNRESOLVED_ERROR: "on-unresolved-error",
+    EVENT_REQUEST_COPY_SETUP_URI: "request-copy-setup-uri",
+    EVENT_REQUEST_OPEN_SETUP_URI: "request-open-setup-uri",
+    EVENT_REQUEST_RELOAD_SETTING_TAB: "request-reload-setting-tab",
+    EVENT_REQUEST_SHOW_SETUP_QR: "request-show-setup-qr",
+    eventHub: { emitEvent: vi.fn(), onEvent: vi.fn() },
+}));
+vi.mock("@/modules/features/SetupManager.ts", () => ({ SetupManager: class {} }));
+vi.mock("@vrtmrz/livesync-commonlib/compat/pouchdb/negotiation", () => negotiationMocks);
+vi.mock("@vrtmrz/livesync-commonlib/compat/replication/couchdb/LiveSyncReplicator", () => ({
+    LiveSyncCouchDBReplicator: class {},
+}));
+vi.mock("./LiveSyncSetting.ts", () => ({ LiveSyncSetting: class {} }));
+vi.mock("./SettingPane.ts", () => ({
+    enableOnly: vi.fn(() => vi.fn()),
+    setLevelClass: vi.fn(),
+    setStyle: vi.fn(),
+    visibleOnly: vi.fn(() => vi.fn()),
+}));
+vi.mock("./PaneChangeLog.ts", () => ({ paneChangeLog: vi.fn() }));
+vi.mock("./PaneQuickSetup.ts", () => ({ paneQuickSetup: vi.fn() }));
+vi.mock("./PaneHelp.ts", () => ({ paneHelp: vi.fn() }));
+vi.mock("./PaneGeneral.ts", () => ({ paneGeneral: vi.fn() }));
+vi.mock("./PaneRemoteConfig.ts", () => ({ paneRemoteConfig: vi.fn() }));
+vi.mock("./PaneSelector.ts", () => ({ paneSelector: vi.fn() }));
+vi.mock("./PaneSyncSettings.ts", () => ({ paneSyncSettings: vi.fn() }));
+vi.mock("./PaneCustomisationSync.ts", () => ({ paneCustomisationSync: vi.fn() }));
+vi.mock("./PaneHatch.ts", () => ({ paneHatch: vi.fn() }));
+vi.mock("./PaneAdvanced.ts", () => ({ paneAdvanced: vi.fn() }));
+vi.mock("./PanePowerUsers.ts", () => ({ panePowerUsers: vi.fn() }));
+vi.mock("./PanePatches.ts", () => ({ panePatches: vi.fn() }));
+vi.mock("./PaneMaintenance.ts", () => ({ paneMaintenance: vi.fn() }));
+
+import { LiveSyncCouchDBReplicator } from "@vrtmrz/livesync-commonlib/compat/replication/couchdb/LiveSyncReplicator";
+import { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab";
+
+beforeEach(() => {
+    settingsInitialisationMocks.applySettingsWithInitialisationChoice.mockReset();
+});
+
+describe("ObsidianLiveSyncSettingTab passphrase verification", () => {
+    it("closes the finite remote connection after checking synchronisation information", async () => {
+        const remoteDatabase = {
+            close: vi.fn(async () => undefined),
+        };
+        const replicator = Object.assign(new LiveSyncCouchDBReplicator({} as never), {
+            connectRemoteCouchDBWithSetting: vi.fn(async () => ({ db: remoteDatabase })),
+        });
+        const plugin = {
+            app: {},
+            core: {
+                services: {
+                    API: { isMobile: vi.fn(() => false) },
+                    replicator: { getNewReplicator: vi.fn(() => replicator) },
+                },
+            },
+        };
+        const tab = new ObsidianLiveSyncSettingTab({} as never, plugin as never);
+        Object.assign(tab, {
+            _editingSettings: {
+                ...DEFAULT_SETTINGS,
+                remoteType: REMOTE_COUCHDB,
+            },
+        });
+
+        await expect(tab.checkWorkingPassphrase()).resolves.toBe(true);
+
+        expect(negotiationMocks.checkSyncInfo).toHaveBeenCalledWith(remoteDatabase);
+        expect(remoteDatabase.close).toHaveBeenCalledOnce();
+    });
+});
+
+describe("ObsidianLiveSyncSettingTab pending-setting initialisation", () => {
+    function createSettingsTab() {
+        const saveSettingData = vi.fn(async () => undefined);
+        const confirmWithMessage = vi.fn();
+        const plugin = {
+            app: {},
+            core: {
+                settings: {
+                    ...DEFAULT_SETTINGS,
+                    handleFilenameCaseSensitive: false,
+                },
+                getModule: vi.fn(() => settingsInitialisationMocks),
+                confirm: {
+                    confirmWithMessage,
+                },
+                services: {
+                    setting: {
+                        saveSettingData,
+                        getDeviceAndVaultName: vi.fn(() => ""),
+                    },
+                },
+            },
+        };
+        const tab = new ObsidianLiveSyncSettingTab({} as never, plugin as never);
+        Object.assign(tab, {
+            _editingSettings: {
+                ...DEFAULT_SETTINGS,
+                handleFilenameCaseSensitive: true,
+            },
+            initialSettings: {
+                ...DEFAULT_SETTINGS,
+                handleFilenameCaseSensitive: false,
+            },
+        });
+        vi.spyOn(tab, "isPassphraseValid").mockResolvedValue(true);
+        vi.spyOn(tab, "checkWorkingPassphrase").mockResolvedValue(true);
+        const closeSetting = vi.spyOn(tab, "closeSetting").mockImplementation(() => undefined);
+        return { tab, saveSettingData, confirmWithMessage, closeSetting };
+    }
+
+    it("keeps pending settings in the editing buffer when initialisation and the fallback are cancelled", async () => {
+        const { tab, saveSettingData, confirmWithMessage, closeSetting } = createSettingsTab();
+        settingsInitialisationMocks.applySettingsWithInitialisationChoice.mockResolvedValueOnce({
+            result: "cancelled",
+        });
+        confirmWithMessage.mockResolvedValueOnce("Keep Editing");
+
+        await tab.confirmRebuild();
+
+        expect(settingsInitialisationMocks.applySettingsWithInitialisationChoice).toHaveBeenCalledOnce();
+        expect(confirmWithMessage).toHaveBeenCalledWith(
+            "Apply Settings without Initialisation?",
+            expect.any(String),
+            ["Apply without Initialisation", "Keep Editing"],
+            "Keep Editing"
+        );
+        expect(saveSettingData).not.toHaveBeenCalled();
+        expect(tab.editingSettings.handleFilenameCaseSensitive).toBe(true);
+        expect(tab.core.settings.handleFilenameCaseSensitive).toBe(false);
+        expect(closeSetting).not.toHaveBeenCalled();
+    });
+
+    it("applies pending settings only after a separately confirmed initialisation bypass", async () => {
+        const { tab, saveSettingData, confirmWithMessage, closeSetting } = createSettingsTab();
+        settingsInitialisationMocks.applySettingsWithInitialisationChoice.mockResolvedValueOnce({
+            result: "cancelled",
+        });
+        confirmWithMessage.mockResolvedValueOnce("Apply without Initialisation");
+
+        await tab.confirmRebuild();
+
+        expect(settingsInitialisationMocks.applySettingsWithInitialisationChoice).toHaveBeenCalledOnce();
+        expect(saveSettingData).toHaveBeenCalledOnce();
+        expect(tab.core.settings.handleFilenameCaseSensitive).toBe(true);
+        expect(closeSetting).not.toHaveBeenCalled();
+    });
+
+    it("closes settings only after initialisation has been scheduled", async () => {
+        const { tab, saveSettingData, confirmWithMessage, closeSetting } = createSettingsTab();
+        settingsInitialisationMocks.applySettingsWithInitialisationChoice.mockImplementationOnce(
+            async ({ applySettings }: { applySettings: () => Promise<void> }) => {
+                await applySettings();
+                return { result: "scheduled", mode: "rebuild" };
+            }
+        );
+
+        await tab.confirmRebuild();
+
+        expect(saveSettingData).toHaveBeenCalledOnce();
+        expect(confirmWithMessage).not.toHaveBeenCalled();
+        expect(closeSetting).toHaveBeenCalledOnce();
+    });
+
+    it("does not offer the settings-only fallback after an initialisation failure", async () => {
+        const { tab, saveSettingData, confirmWithMessage, closeSetting } = createSettingsTab();
+        settingsInitialisationMocks.applySettingsWithInitialisationChoice.mockResolvedValueOnce({
+            result: "failed",
+            mode: "fetch",
+        });
+
+        await tab.confirmRebuild();
+
+        expect(saveSettingData).not.toHaveBeenCalled();
+        expect(confirmWithMessage).not.toHaveBeenCalled();
+        expect(tab.editingSettings.handleFilenameCaseSensitive).toBe(true);
+        expect(tab.core.settings.handleFilenameCaseSensitive).toBe(false);
+        expect(closeSetting).not.toHaveBeenCalled();
+    });
+});
+
+describe("ObsidianLiveSyncSettingTab declarative settings boundary", () => {
+    function createSettingsTab() {
+        const saveSettingData = vi.fn(async () => undefined);
+        const plugin = {
+            app: {},
+            core: {
+                settings: {
+                    ...DEFAULT_SETTINGS,
+                    hashCacheMaxCount: 300,
+                    displayLanguage: "",
+                },
+                services: {
+                    setting: {
+                        saveSettingData,
+                        getDeviceAndVaultName: vi.fn(() => ""),
+                    },
+                },
+            },
+        };
+        Object.defineProperty(plugin, "settings", {
+            get: () => {
+                throw new Error("The declarative adapter must not use plugin.settings");
+            },
+        });
+        const tab = new ObsidianLiveSyncSettingTab({} as never, plugin as never);
+        Object.assign(tab, {
+            _editingSettings: {
+                ...DEFAULT_SETTINGS,
+                hashCacheMaxCount: 300,
+                displayLanguage: "",
+            },
+            initialSettings: {
+                ...DEFAULT_SETTINGS,
+                hashCacheMaxCount: 300,
+                displayLanguage: "",
+            },
+        });
+        return { tab, saveSettingData };
+    }
+
+    it("loads the imperative fallback without a SettingPage runtime export", () => {
+        const { tab } = createSettingsTab();
+
+        expect(tab.display).toBeTypeOf("function");
+        expect(tab.getSettingDefinitions()).toEqual([]);
+    });
+
+    it("reads and writes registered controls through the editing buffer and existing save owner", async () => {
+        const { tab } = createSettingsTab();
+        const saveSettings = vi.spyOn(tab, "saveSettings").mockResolvedValue(undefined);
+
+        expect(tab.getControlValue("hashCacheMaxCount")).toBe(300);
+
+        await tab.setControlValue("hashCacheMaxCount", 321);
+
+        expect(tab.editingSettings.hashCacheMaxCount).toBe(321);
+        expect(saveSettings).toHaveBeenCalledOnce();
+        expect(saveSettings).toHaveBeenCalledWith(["hashCacheMaxCount"]);
+    });
+
+    it("rejects unregistered declarative control keys", async () => {
+        const { tab } = createSettingsTab();
+
+        expect(() => tab.getControlValue("couchDB_PASSWORD")).toThrow(/Unknown declarative setting key/u);
+        await expect(tab.setControlValue("couchDB_PASSWORD", "secret")).rejects.toThrow(
+            /Unknown declarative setting key/u
+        );
+    });
+
+    it("rejects declarative values outside the registered control contract", async () => {
+        const { tab } = createSettingsTab();
+        const saveSettings = vi.spyOn(tab, "saveSettings").mockResolvedValue(undefined);
+
+        await expect(tab.setControlValue("hashCacheMaxCount", 9)).rejects.toThrow(
+            /Invalid value for declarative setting/u
+        );
+        await expect(tab.setControlValue("chunkSplitterVersion", "unknown-splitter")).rejects.toThrow(
+            /Invalid value for declarative setting/u
+        );
+
+        expect(saveSettings).not.toHaveBeenCalled();
+    });
+
+    it("replaces a saved-setting handler when a page is rendered again", async () => {
+        const { tab } = createSettingsTab();
+        const first = vi.fn();
+        const replacement = vi.fn();
+        tab.addOnSaved("displayLanguage", first);
+        tab.addOnSaved("displayLanguage", replacement);
+        tab.editingSettings.displayLanguage = "ja";
+
+        await tab.saveSettings(["displayLanguage"]);
+
+        expect(first).not.toHaveBeenCalled();
+        expect(replacement).toHaveBeenCalledOnce();
+    });
+});

src/modules/features/SettingDialogue/PaneAdvanced.ts

@@ -1,53 +1,18 @@
-import { ChunkAlgorithmNames } from "@vrtmrz/livesync-commonlib/compat/common/types";
 import { LiveSyncSetting as Setting } from "./LiveSyncSetting.ts";
 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts";
 import type { PageFunctions } from "./SettingPane.ts";
+import { createAdvancedSettingSpecGroups } from "./AdvancedSettingSpecs.ts";
+import { renderLegacySettingSpec } from "./SettingSpec.ts";
 
 export function paneAdvanced(this: ObsidianLiveSyncSettingTab, paneEl: HTMLElement, { addPanel }: PageFunctions): void {
-    void addPanel(paneEl, "Memory cache").then((paneEl) => {
-        new Setting(paneEl).autoWireNumeric("hashCacheMaxCount", { clampMin: 10 });
-        // new Setting(paneEl).autoWireNumeric("hashCacheMaxAmount", { clampMin: 1 });
+    const groups = createAdvancedSettingSpecGroups({
+        isCouchDB: () => this.onlyOnCouchDB().visibility !== false,
     });
-    void addPanel(paneEl, "Local Database Tweak").then((paneEl) => {
-        paneEl.addClass("wizardHidden");
-
-        const items = ChunkAlgorithmNames;
-        new Setting(paneEl).autoWireDropDown("chunkSplitterVersion", {
-            options: items,
+    for (const group of groups) {
+        void addPanel(paneEl, group.heading).then((panelEl) => {
+            for (const spec of group.items) {
+                renderLegacySettingSpec(new Setting(panelEl), spec);
+            }
         });
-        new Setting(paneEl).autoWireNumeric("customChunkSize", { clampMin: 0, acceptZero: true });
-    });
-
-    void addPanel(paneEl, "Transfer Tweak").then((paneEl) => {
-        new Setting(paneEl)
-            .setClass("wizardHidden")
-            .autoWireToggle("readChunksOnline", { onUpdate: this.onlyOnCouchDB });
-        new Setting(paneEl)
-            .setClass("wizardHidden")
-            .autoWireToggle("useOnlyLocalChunk", { onUpdate: this.onlyOnCouchDB });
-
-        new Setting(paneEl).setClass("wizardHidden").autoWireNumeric("concurrencyOfReadChunksOnline", {
-            clampMin: 10,
-            onUpdate: this.onlyOnCouchDB,
-        });
-
-        new Setting(paneEl).setClass("wizardHidden").autoWireNumeric("minimumIntervalOfReadChunksOnline", {
-            clampMin: 10,
-            onUpdate: this.onlyOnCouchDB,
-        });
-        new Setting(paneEl)
-            .setClass("wizardHidden")
-            .autoWireToggle("autoAcceptCompatibleTweak", { defaultToggleValue: true });
-        // new Setting(paneEl)
-        //     .setClass("wizardHidden")
-        //     .autoWireToggle("sendChunksBulk", { onUpdate: onlyOnCouchDB })
-        // new Setting(paneEl)
-        //     .setClass("wizardHidden")
-        //     .autoWireNumeric("sendChunksBulkMaxSize", {
-        //         clampMax: 100, clampMin: 1, onUpdate: onlyOnCouchDB
-        //     })
-    });
-    void addPanel(paneEl, "Remote Database Tweak").then((paneEl) => {
-        new Setting(paneEl).setClass("wizardHidden").autoWireToggle("enableCompression");
-    });
+    }
 }

src/modules/features/SettingDialogue/PaneAdvanced.unit.spec.ts

@@ -0,0 +1,83 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { paneAdvanced } from "./PaneAdvanced.ts";
+
+const settingHarness = vi.hoisted(() => ({
+    createdIn: [] as HTMLElement[],
+    rendered: [] as unknown[],
+}));
+
+vi.mock("./LiveSyncSetting.ts", () => ({
+    LiveSyncSetting: class LiveSyncSetting {
+        constructor(containerEl: HTMLElement) {
+            settingHarness.createdIn.push(containerEl);
+        }
+    },
+}));
+
+vi.mock("./SettingSpec.ts", async (importOriginal) => {
+    const original = await importOriginal<typeof import("./SettingSpec.ts")>();
+    return {
+        ...original,
+        renderLegacySettingSpec: vi.fn((_renderer: unknown, spec: unknown) => {
+            settingHarness.rendered.push(spec);
+        }),
+    };
+});
+
+afterEach(() => {
+    settingHarness.createdIn.length = 0;
+    settingHarness.rendered.length = 0;
+    vi.clearAllMocks();
+});
+
+describe("paneAdvanced", () => {
+    it("renders the shared specifications into the four existing panels", async () => {
+        const panelElements = new Map<string, HTMLElement>();
+        const addPanel = vi.fn((_parent: HTMLElement, heading: string) => {
+            const panel = { heading } as unknown as HTMLElement;
+            panelElements.set(heading, panel);
+            return Promise.resolve(panel);
+        });
+        const host = {
+            onlyOnCouchDB: vi.fn(() => ({ visibility: false })),
+        };
+
+        paneAdvanced.call(host as never, {} as HTMLElement, { addPanel } as never);
+        await vi.waitFor(() => expect(settingHarness.rendered).toHaveLength(9));
+
+        expect(addPanel.mock.calls.map(([, heading]) => heading)).toEqual([
+            "Memory cache",
+            "Local Database Tweak",
+            "Transfer Tweak",
+            "Remote Database Tweak",
+        ]);
+        expect(settingHarness.createdIn).toEqual([
+            panelElements.get("Memory cache"),
+            panelElements.get("Local Database Tweak"),
+            panelElements.get("Local Database Tweak"),
+            panelElements.get("Transfer Tweak"),
+            panelElements.get("Transfer Tweak"),
+            panelElements.get("Transfer Tweak"),
+            panelElements.get("Transfer Tweak"),
+            panelElements.get("Transfer Tweak"),
+            panelElements.get("Remote Database Tweak"),
+        ]);
+        expect(settingHarness.rendered.map((spec) => (spec as { key: string }).key)).toEqual([
+            "hashCacheMaxCount",
+            "chunkSplitterVersion",
+            "customChunkSize",
+            "readChunksOnline",
+            "useOnlyLocalChunk",
+            "concurrencyOfReadChunksOnline",
+            "minimumIntervalOfReadChunksOnline",
+            "autoAcceptCompatibleTweak",
+            "enableCompression",
+        ]);
+
+        const readChunksOnline = settingHarness.rendered.find(
+            (spec) => (spec as { key: string }).key === "readChunksOnline"
+        ) as { visible: () => boolean };
+        expect(readChunksOnline.visible()).toBe(false);
+        expect(host.onlyOnCouchDB).toHaveBeenCalledOnce();
+    });
+});

src/modules/features/SettingDialogue/PaneChangeLog.ts

@@ -6,7 +6,8 @@ const updateInformation: string = UPDATE_INFO || "";
 
 export function paneChangeLog(this: ObsidianLiveSyncSettingTab, paneEl: HTMLElement): void {
     const informationDivEl = this.createEl(paneEl, "div", { text: "" });
+    const lifetimeComponent = this.lifetimeComponent;
     fireAndForget(() =>
-        MarkdownRenderer.render(this.plugin.app, updateInformation, informationDivEl, "/", this.lifetimeComponent)
+        MarkdownRenderer.render(this.plugin.app, updateInformation, informationDivEl, "/", lifetimeComponent)
     );
 }

src/modules/features/SettingDialogue/PaneGeneral.ts

@@ -1,60 +1,22 @@
-import { $msg, $t } from "@/common/translation";
-import { SUPPORTED_I18N_LANGS, type I18N_LANGS } from "@/common/rosetta";
 import { LiveSyncSetting as Setting } from "./LiveSyncSetting.ts";
 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts";
 import type { PageFunctions } from "./SettingPane.ts";
-import { visibleOnly } from "./SettingPane.ts";
-import { EVENT_ON_UNRESOLVED_ERROR, eventHub } from "@/common/events.ts";
-import { NetworkWarningStyles } from "@vrtmrz/livesync-commonlib/compat/common/models/setting.const";
-export function paneGeneral(
-    this: ObsidianLiveSyncSettingTab,
-    paneEl: HTMLElement,
-    { addPanel, addPane }: PageFunctions
-): void {
-    void addPanel(paneEl, $msg("obsidianLiveSyncSettingTab.titleAppearance")).then((paneEl) => {
-        const languages = Object.fromEntries([
-            // ["", $msg("obsidianLiveSyncSettingTab.defaultLanguage")],
-            ...SUPPORTED_I18N_LANGS.map((e) => [e, $t(`lang-${e}`)]),
-        ]) as Record<I18N_LANGS, string>;
-        new Setting(paneEl).autoWireDropDown("displayLanguage", {
-            options: languages,
-        });
-        this.addOnSaved("displayLanguage", () => this.display());
-        new Setting(paneEl).autoWireToggle("showStatusOnEditor");
-        this.addOnSaved("showStatusOnEditor", () => {
-            eventHub.emitEvent(EVENT_ON_UNRESOLVED_ERROR);
-        });
-        new Setting(paneEl).autoWireToggle("showOnlyIconsOnEditor", {
-            onUpdate: visibleOnly(() => this.isConfiguredAs("showStatusOnEditor", true)),
-        });
-        new Setting(paneEl).autoWireToggle("showStatusOnStatusbar");
-        new Setting(paneEl).autoWireToggle("hideFileWarningNotice");
-        new Setting(paneEl).autoWireDropDown("networkWarningStyle", {
-            options: {
-                [NetworkWarningStyles.BANNER]: "Show full banner",
-                [NetworkWarningStyles.ICON]: "Show icon only",
-                [NetworkWarningStyles.HIDDEN]: "Hide completely",
-            },
-        });
-        this.addOnSaved("networkWarningStyle", () => {
-            eventHub.emitEvent(EVENT_ON_UNRESOLVED_ERROR);
-        });
-    });
-    void addPanel(paneEl, $msg("obsidianLiveSyncSettingTab.titleLogging")).then((paneEl) => {
-        paneEl.addClass("wizardHidden");
+import { createExtraMenuSettingSpecGroup, createGeneralSettingSpecGroups } from "./GeneralSettingSpecs.ts";
+import { renderLegacySettingSpec } from "./SettingSpec.ts";
 
-        new Setting(paneEl).autoWireToggle("lessInformationInLog");
-
-        new Setting(paneEl).autoWireToggle("showVerboseLog", {
-            onUpdate: visibleOnly(() => this.isConfiguredAs("lessInformationInLog", false)),
+export function paneGeneral(this: ObsidianLiveSyncSettingTab, paneEl: HTMLElement, { addPanel }: PageFunctions): void {
+    const groups = [
+        ...createGeneralSettingSpecGroups({
+            showEditorStatusDetails: () => this.isConfiguredAs("showStatusOnEditor", true),
+            showVerboseLog: () => this.isConfiguredAs("lessInformationInLog", false),
+        }),
+        createExtraMenuSettingSpecGroup(),
+    ];
+    for (const group of groups) {
+        void addPanel(paneEl, group.heading).then((panelEl) => {
+            for (const spec of group.items) {
+                renderLegacySettingSpec(new Setting(panelEl), spec);
+            }
         });
-    });
-    new Setting(paneEl).setClass("wizardOnly").addButton((button) =>
-        button
-            .setButtonText($msg("obsidianLiveSyncSettingTab.btnNext"))
-            .setCta()
-            .onClick(() => {
-                this.changeDisplay("0");
-            })
-    );
+    }
 }

src/modules/features/SettingDialogue/PaneHatch.ts

@@ -7,7 +7,7 @@ import {
     type EntryDoc,
     type diff_result,
 } from "@vrtmrz/livesync-commonlib/compat/common/types";
-import { createBlob, readAsBlob } from "@vrtmrz/livesync-commonlib/compat/common/utils";
+import { createBlob, escapeMarkdownValue, readAsBlob } from "@vrtmrz/livesync-commonlib/compat/common/utils";
 import { Logger } from "@vrtmrz/livesync-commonlib/compat/common/logger";
 import { shouldBeIgnored } from "@vrtmrz/livesync-commonlib/compat/string_and_binary/path";
 import { Menu, diff_match_patch, setIcon } from "@/deps.ts";
@@ -24,7 +24,7 @@ import {
 import { HiddenFileSync } from "@/features/HiddenFileSync/CmdHiddenFileSync.ts";
 import { EVENT_REQUEST_SHOW_HISTORY } from "@/common/obsidianEvents.ts";
 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts";
-import type { PageFunctions } from "./SettingPane.ts";
+import { setButtonDestructiveState, type PageFunctions } from "./SettingPane.ts";
 import { isNotFoundError } from "@vrtmrz/livesync-commonlib/compat/common/utils.doc";
 import {
     chooseAndCopyFileDatabaseInfo,
@@ -44,6 +44,21 @@ import {
     getFileRepairRevisionComparison,
 } from "@/serviceFeatures/fileRepairPresentation.ts";
 import { ConflictResolveModal } from "@/modules/features/InteractiveConflictResolving/ConflictResolveModal.ts";
+import {
+    inspectMetadataDocumentIdentities,
+    MetadataDocumentRepairResults,
+    OfflineScanUnresolvedReasons,
+    repairMetadataDocumentIdentity,
+    type MetadataDocumentIdentityIssue,
+} from "@vrtmrz/livesync-commonlib/compat/serviceFeatures/offlineScanner";
+import {
+    metadataIdentityPathKey,
+    selectUnresolvedMetadataIdentityEntries,
+} from "@/serviceFeatures/metadataIdentityInspection.ts";
+import {
+    executeMetadataIdentityRepair,
+    MetadataIdentityRepairExecutions,
+} from "@/serviceFeatures/metadataIdentityRepair.ts";
 export function paneHatch(this: ObsidianLiveSyncSettingTab, paneEl: HTMLElement, { addPanel }: PageFunctions): void {
     // const hatchWarn = this.createEl(paneEl, "div", { text: `To stop the boot up sequence for fixing problems on databases, you can put redflag.md on top of your vault (Rebooting obsidian is required).` });
     // hatchWarn.addClass("op-warn-info");
@@ -178,6 +193,150 @@ export function paneHatch(this: ObsidianLiveSyncSettingTab, paneEl: HTMLElement,
                 });
             });
         };
+        const addMetadataIdentityResult = (entry: MetadataDocumentIdentityIssue) => {
+            const { diagnostic } = entry.inspection;
+            const card = this.createEl(resultArea, "div", { cls: "sls-repair-result" });
+            this.createEl(card, "h6", { text: diagnostic.declaredPath });
+            this.createEl(card, "div", {
+                text: $msg("Metadata entry requires review and was left unchanged"),
+                cls: "sls-repair-status-warning",
+            });
+            this.createEl(card, "div", {
+                text:
+                    diagnostic.reason === OfflineScanUnresolvedReasons.DOCUMENT_ID_MISMATCH
+                        ? $msg("The stored document ID does not match the ID derived from its recorded path.")
+                        : $msg(
+                              "The stored document ID and recorded path are handled by different synchronisation features."
+                          ),
+                cls: "sls-repair-metric",
+            });
+            this.createEl(card, "div", {
+                text: $msg("Stored document ID: ${ID}", { ID: diagnostic.actualDocumentId }),
+                cls: "sls-repair-metric",
+            });
+            if (diagnostic.expectedDocumentId !== undefined) {
+                this.createEl(card, "div", {
+                    text: $msg("Expected document ID: ${ID}", { ID: diagnostic.expectedDocumentId }),
+                    cls: "sls-repair-metric",
+                });
+            }
+            this.createEl(card, "div", {
+                text: $msg("Source revision: ${REVISION}", {
+                    REVISION: entry.sourceRevision ?? $msg("Unknown revision"),
+                }),
+                cls: "sls-repair-metric",
+            });
+            if (entry.logicallyDeleted) {
+                this.createEl(card, "div", {
+                    text: $msg("🗑️ Logical deletion"),
+                    cls: "sls-repair-metric mod-warning",
+                });
+            }
+            if (entry.conflictRevisions.length > 0) {
+                this.createEl(card, "div", {
+                    text: $msg("⚠️ Conflicts: ${COUNT}", { COUNT: `${entry.conflictRevisions.length}` }),
+                    cls: "sls-repair-metric mod-warning",
+                });
+            }
+
+            if (
+                !entry.repairAvailable ||
+                diagnostic.expectedDocumentId === undefined ||
+                entry.sourceRevision === null
+            ) {
+                this.createEl(card, "div", {
+                    text: $msg(
+                        "One-step repair is unavailable because this entry is ambiguous, no longer current, or unsafe to change."
+                    ),
+                    cls: "sls-repair-metric mod-warning",
+                });
+                return;
+            }
+
+            this.createEl(card, "div", {
+                text: entry.targetAlreadyPresent
+                    ? $msg("An exact target is already present; repair can remove the obsolete ID.")
+                    : $msg("Repair is available for this entry."),
+                cls: "sls-repair-status-ok",
+            });
+            const request = {
+                actualDocumentId: diagnostic.actualDocumentId,
+                expectedDocumentId: diagnostic.expectedDocumentId,
+                sourceRevision: entry.sourceRevision,
+            };
+            const repairAction = $msg("Repair Metadata ID");
+            const keepAction = $msg("Keep unchanged");
+            addActionMenu(card, $msg("More actions for ${FILE}", { FILE: diagnostic.declaredPath }), [
+                {
+                    title: $msg("Repair this Metadata document ID"),
+                    warning: true,
+                    run: async () => {
+                        const execution = await executeMetadataIdentityRepair(request, {
+                            confirm: async () =>
+                                (await this.core.confirm.confirmWithMessage(
+                                    $msg("Repair Metadata document ID"),
+                                    $msg(
+                                        "This moves one local Metadata entry to the ID derived from its recorded path.\n\n**File:** `${FILE}`  \n**Source:** `${SOURCE}@${REVISION}`  \n**Target:** `${TARGET}`\n\nThe target is verified before the source is removed. Its CouchDB revision ancestry cannot be preserved.\n\n> [!warning] Before repairing\n> - Back up this device.\n> - If file-name case or path obfuscation was intentionally changed for the whole database, use Rebuild instead.\n> - If other devices share this database, pause them, allow this device to upload the repair, then resume them one at a time.",
+                                        {
+                                            FILE: escapeMarkdownValue(diagnostic.declaredPath),
+                                            SOURCE: escapeMarkdownValue(diagnostic.actualDocumentId),
+                                            REVISION: escapeMarkdownValue(entry.sourceRevision!),
+                                            TARGET: escapeMarkdownValue(diagnostic.expectedDocumentId!),
+                                        }
+                                    ),
+                                    [repairAction, keepAction],
+                                    keepAction,
+                                    undefined,
+                                    "vertical"
+                                )) === repairAction,
+                            repair: async (repairRequest) =>
+                                await repairMetadataDocumentIdentity(this.core, repairRequest),
+                            requestOrdinaryScan: async () => await this.services.vault.scanVault(true, false),
+                        });
+
+                        if (execution.status === MetadataIdentityRepairExecutions.CANCELLED) return;
+
+                        const result = execution.result;
+                        if (result.message) Logger(result.message, LOG_LEVEL_VERBOSE);
+                        if (result.status === MetadataDocumentRepairResults.COMPLETED) {
+                            if (execution.scanError !== undefined) {
+                                Logger(execution.scanError, LOG_LEVEL_VERBOSE);
+                            }
+                            resultArea.replaceChildren();
+                            this.createEl(resultArea, "div", {
+                                text: execution.scanCompleted
+                                    ? $msg(
+                                          "Metadata document ID repair and the ordinary Vault scan completed. Run this inspection again after synchronisation."
+                                      )
+                                    : $msg(
+                                          "Metadata document ID repair completed, but the ordinary Vault scan did not run. Keep synchronisation paused, resolve the scan condition, then run 'Scan storage and database again'."
+                                      ),
+                                cls: execution.scanCompleted
+                                    ? "sls-repair-status-ok"
+                                    : "sls-repair-metric mod-warning",
+                            });
+                            return;
+                        }
+
+                        const resultMessage =
+                            result.status === MetadataDocumentRepairResults.STALE ||
+                            result.status === MetadataDocumentRepairResults.BLOCKED
+                                ? $msg("The inspected state changed. No repair was performed; run inspection again.")
+                                : result.targetCreated
+                                  ? $msg(
+                                        "Repair stopped after creating the target. The source was retained. Run inspection again before retrying."
+                                    )
+                                  : $msg(
+                                        "Repair failed before the source was removed. Run inspection again before retrying."
+                                    );
+                        this.createEl(card, "div", {
+                            text: resultMessage,
+                            cls: "sls-repair-metric mod-warning",
+                        });
+                    },
+                },
+            ]);
+        };
         const findHiddenFile = async (path: string) => {
             const addOn = this.core.getAddOn<HiddenFileSync>(HiddenFileSync.name);
             if (!addOn) {
@@ -827,7 +986,7 @@ export function paneHatch(this: ObsidianLiveSyncSettingTab, paneEl: HTMLElement,
             .setName($msg("Inspect conflicts and file/database differences"))
             .setDesc(
                 $msg(
-                    "Scan every Vault file and live local-database revision for conflicts, missing chunks, and differences. Each result provides actions for the exact revision."
+                    "Scan Vault files and local-database Metadata for conflicts, missing chunks, identity mismatches, and differences. Each result provides actions for one exact entry or revision."
                 )
             )
             .addButton((button) =>
@@ -839,6 +998,13 @@ export function paneHatch(this: ObsidianLiveSyncSettingTab, paneEl: HTMLElement,
                         resultArea.replaceChildren();
                         Logger("Start inspecting file/database state", LOG_LEVEL_NOTICE, "verify");
                         this.core.localDatabase.clearCaches();
+                        const identityEntries = await inspectMetadataDocumentIdentities(this.core);
+                        const handleFilenameCaseSensitive = this.core.settings.handleFilenameCaseSensitive;
+                        const unresolvedIdentity = selectUnresolvedMetadataIdentityEntries(
+                            identityEntries,
+                            handleFilenameCaseSensitive
+                        );
+                        unresolvedIdentity.entries.forEach(addMetadataIdentityResult);
                         const allPaths = await collectFileDatabaseInfoPaths(this.core);
                         let i = 0;
                         const incProc = () => {
@@ -853,6 +1019,13 @@ export function paneHatch(this: ObsidianLiveSyncSettingTab, paneEl: HTMLElement,
                         const semaphore = Semaphore(10);
                         const processes = allPaths.map(async (path) => {
                             try {
+                                if (
+                                    unresolvedIdentity.unresolvedPathKeys.has(
+                                        metadataIdentityPathKey(path, handleFilenameCaseSensitive)
+                                    )
+                                ) {
+                                    return incProc();
+                                }
                                 if (shouldBeIgnored(path)) {
                                     return incProc();
                                 }
@@ -924,10 +1097,9 @@ export function paneHatch(this: ObsidianLiveSyncSettingTab, paneEl: HTMLElement,
             .setName("Check and convert non-path-obfuscated files")
             .setDesc("")
             .addButton((button) =>
-                button
+                setButtonDestructiveState(button)
                     .setButtonText("Perform")
                     .setDisabled(false)
-                    .setWarning()
                     .onClick(async () => {
                         for await (const docName of this.core.localDatabase.findAllDocNames()) {
                             if (!docName.startsWith("f:")) {
@@ -1012,10 +1184,9 @@ export function paneHatch(this: ObsidianLiveSyncSettingTab, paneEl: HTMLElement,
         );
 
         new Setting(paneEl).setName("Delete all customization sync data").addButton((button) =>
-            button
+            setButtonDestructiveState(button)
                 .setButtonText("Delete")
                 .setDisabled(false)
-                .setWarning()
                 .onClick(async () => {
                     Logger(`Deleting customization sync data`, LOG_LEVEL_NOTICE);
                     const entriesToDelete = await this.core.localDatabase.allDocsRaw({

src/modules/features/SettingDialogue/PaneHelp.ts

@@ -0,0 +1,102 @@
+import { MarkdownRenderer, request } from "@/deps.ts";
+import { $msg } from "@/common/translation";
+import { LiveSyncError } from "@vrtmrz/livesync-commonlib/compat/common/LSError";
+import { fireAndForget } from "octagonal-wheels/promises";
+import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts";
+import type { PageFunctions } from "./SettingPane.ts";
+
+/** Render the online help and troubleshooting browser. */
+export function paneHelp(this: ObsidianLiveSyncSettingTab, paneEl: HTMLElement, { addPanel }: PageFunctions): void {
+    void addPanel(paneEl, $msg("obsidianLiveSyncSettingTab.titleOnlineTips")).then((panelEl) => {
+        const lifetimeComponent = this.lifetimeComponent;
+        let pageDisposed = false;
+        lifetimeComponent.register(() => {
+            pageDisposed = true;
+        });
+        const repo = "vrtmrz/obsidian-livesync";
+        const topPath = $msg("obsidianLiveSyncSettingTab.linkTroubleshooting");
+        const rawRepoURI = `https://raw.githubusercontent.com/${repo}/main`;
+        this.createEl(panelEl, "div", "", (el) => {
+            el.createEl("a", { text: $msg("obsidianLiveSyncSettingTab.linkOpenInBrowser") }, (anchor) => {
+                anchor.href = `https://github.com/${repo}/blob/main${topPath}`;
+                anchor.target = "_blank";
+                anchor.rel = "noopener";
+            });
+        });
+        const troubleShootEl = this.createEl(panelEl, "div", {
+            text: "",
+            cls: "sls-troubleshoot-preview",
+        });
+        const loadMarkdownPage = async (pathAll: string, basePathParam: string = "") => {
+            troubleShootEl.setCssStyles({ minHeight: troubleShootEl.clientHeight + "px" });
+            troubleShootEl.empty();
+            const fullPath = pathAll.startsWith("/") ? pathAll : `${basePathParam}/${pathAll}`;
+
+            const directoryArr = fullPath.split("/");
+            const filename = directoryArr.pop();
+            const basePath = directoryArr.join("/");
+
+            let remoteTroubleShootMDSrc = "";
+            try {
+                remoteTroubleShootMDSrc = await request(`${rawRepoURI}${basePath}/${filename}`);
+            } catch (ex) {
+                const err = LiveSyncError.fromError(ex);
+                remoteTroubleShootMDSrc = `${$msg("obsidianLiveSyncSettingTab.logErrorOccurred")}\n${err.toString()}`;
+            }
+            if (pageDisposed) return;
+            const remoteTroubleShootMD = remoteTroubleShootMDSrc.replace(
+                /\((.*?(.png)|(.jpg))\)/g,
+                `(${rawRepoURI}${basePath}/$1)`
+            );
+            await MarkdownRenderer.render(
+                this.plugin.app,
+                `<a class='sls-troubleshoot-anchor'></a> [${$msg("obsidianLiveSyncSettingTab.linkTipsAndTroubleshooting")}](${topPath}) [${$msg("obsidianLiveSyncSettingTab.linkPageTop")}](${filename})\n\n${remoteTroubleShootMD}`,
+                troubleShootEl,
+                `${rawRepoURI}`,
+                lifetimeComponent
+            );
+            if (pageDisposed) return;
+            troubleShootEl.querySelector<HTMLAnchorElement>(".sls-troubleshoot-anchor")?.parentElement?.setCssStyles({
+                position: "sticky",
+                top: "-1em",
+                backgroundColor: "var(--modal-background)",
+            });
+            troubleShootEl.querySelectorAll<HTMLAnchorElement>("a.internal-link").forEach((anchorEl) => {
+                anchorEl.addEventListener("click", (evt) => {
+                    fireAndForget(async () => {
+                        const uri = anchorEl.getAttr("data-href");
+                        if (!uri) return;
+                        if (uri.startsWith("#")) {
+                            evt.preventDefault();
+                            const elements = Array.from(
+                                troubleShootEl.querySelectorAll<HTMLHeadingElement>("[data-heading]")
+                            );
+                            const target = elements.find(
+                                (element) =>
+                                    element.getAttr("data-heading")?.toLowerCase().split(" ").join("-") ===
+                                    uri.substring(1).toLowerCase()
+                            );
+                            if (target) {
+                                target.setCssStyles({ scrollMargin: "3em" });
+                                target.scrollIntoView({
+                                    behavior: "instant",
+                                    block: "start",
+                                });
+                            }
+                        } else {
+                            evt.preventDefault();
+                            await loadMarkdownPage(uri, basePath);
+                            troubleShootEl.setCssStyles({ scrollMargin: "1em" });
+                            troubleShootEl.scrollIntoView({
+                                behavior: "instant",
+                                block: "start",
+                            });
+                        }
+                    });
+                });
+            });
+            troubleShootEl.setCssStyles({ minHeight: "" });
+        };
+        void loadMarkdownPage(topPath);
+    });
+}

src/modules/features/SettingDialogue/PaneMaintenance.ts

@@ -1,11 +1,16 @@
 import { EVENT_REQUEST_PERFORM_GC_V3, eventHub } from "@/common/events.ts";
+import { $msg } from "@/common/translation";
+import {
+    createCoreSettingsAfterFullReset,
+    createEditingSettingsAfterFullReset,
+} from "@/serviceFeatures/setupObsidian/settingsReset.ts";
 import { LOG_LEVEL_NOTICE, Logger } from "@vrtmrz/livesync-commonlib/compat/common/logger";
-import { FlagFilesHumanReadable, FLAGMD_REDFLAG } from "@vrtmrz/livesync-commonlib/compat/common/types";
+import { FlagFilesHumanReadable, FlagFilesOriginal } from "@vrtmrz/livesync-commonlib/compat/common/types";
 import { fireAndForget } from "@vrtmrz/livesync-commonlib/compat/common/utils";
 import { LiveSyncCouchDBReplicator } from "@vrtmrz/livesync-commonlib/compat/replication/couchdb/LiveSyncReplicator";
 import { LiveSyncSetting as Setting } from "./LiveSyncSetting.ts";
 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab";
-import { visibleOnly, type PageFunctions } from "./SettingPane";
+import { setButtonDestructiveState, visibleOnly, type PageFunctions } from "./SettingPane";
 export function paneMaintenance(
     this: ObsidianLiveSyncSettingTab,
     paneEl: HTMLElement,
@@ -33,7 +38,7 @@ export function paneMaintenance(
                     e.addEventListener("click", () => {
                         fireAndForget(async () => {
                             await this.services.replication.markResolved();
-                            this.display();
+                            this.requestPageRefresh();
                         });
                     });
                 }
@@ -60,7 +65,7 @@ export function paneMaintenance(
                     e.addEventListener("click", () => {
                         fireAndForget(async () => {
                             await this.services.replication.markUnlocked();
-                            this.display();
+                            this.requestPageRefresh();
                         });
                     });
                 }
@@ -73,10 +78,9 @@ export function paneMaintenance(
             .setName("Lock Server")
             .setDesc("Lock the remote server to prevent synchronization with other devices.")
             .addButton((button) =>
-                button
+                setButtonDestructiveState(button)
                     .setButtonText("Lock")
                     .setDisabled(false)
-                    .setWarning()
                     .onClick(async () => {
                         await this.services.replication.markLocked();
                     })
@@ -87,12 +91,11 @@ export function paneMaintenance(
             .setName("Emergency restart")
             .setDesc("Disables all synchronization and restart.")
             .addButton((button) =>
-                button
+                setButtonDestructiveState(button)
                     .setButtonText("Flag and restart")
                     .setDisabled(false)
-                    .setWarning()
                     .onClick(async () => {
-                        await this.core.storageAccess.writeFileAuto(FLAGMD_REDFLAG, "");
+                        await this.core.storageAccess.writeFileAuto(FlagFilesOriginal.SUSPEND_ALL, "");
                         this.services.appLifecycle.performRestart();
                     })
             );
@@ -132,9 +135,8 @@ export function paneMaintenance(
             .setName("Resend")
             .setDesc("Resend all chunks to the remote.")
             .addButton((button) =>
-                button
+                setButtonDestructiveState(button)
                     .setButtonText("Send chunks")
-                    .setWarning()
                     .setDisabled(false)
                     .onClick(async () => {
                         if (this.core.replicator instanceof LiveSyncCouchDBReplicator) {
@@ -150,9 +152,8 @@ export function paneMaintenance(
                 "Initialise journal received history. On the next sync, every item except this device sent will be downloaded again."
             )
             .addButton((button) =>
-                button
+                setButtonDestructiveState(button)
                     .setButtonText("Reset received")
-                    .setWarning()
                     .setDisabled(false)
                     .onClick(async () => {
                         await this.getMinioJournalSyncClient().updateCheckPointInfo((info) => ({
@@ -171,9 +172,8 @@ export function paneMaintenance(
                 "Initialise journal sent history. On the next sync, every item except this device received will be sent again."
             )
             .addButton((button) =>
-                button
+                setButtonDestructiveState(button)
                     .setButtonText("Reset sent history")
-                    .setWarning()
                     .setDisabled(false)
                     .onClick(async () => {
                         await this.getMinioJournalSyncClient().updateCheckPointInfo((info) => ({
@@ -314,9 +314,8 @@ export function paneMaintenance(
             .setName("Overwrite remote")
             .setDesc("Overwrite remote with local DB and passphrase.")
             .addButton((button) =>
-                button
+                setButtonDestructiveState(button)
                     .setButtonText("Send")
-                    .setWarning()
                     .setDisabled(false)
                     .onClick(async () => {
                         await this.rebuildDB("remoteOnly");
@@ -327,9 +326,8 @@ export function paneMaintenance(
             .setName("Reset all journal counter")
             .setDesc("Initialise all journal history, On the next sync, every item will be received and sent.")
             .addButton((button) =>
-                button
+                setButtonDestructiveState(button)
                     .setButtonText("Reset all")
-                    .setWarning()
                     .setDisabled(false)
                     .onClick(async () => {
                         await this.getMinioJournalSyncClient().resetCheckpointInfo();
@@ -342,9 +340,8 @@ export function paneMaintenance(
             .setName("Purge all journal counter")
             .setDesc("Purge all download/upload cache.")
             .addButton((button) =>
-                button
+                setButtonDestructiveState(button)
                     .setButtonText("Reset all")
-                    .setWarning()
                     .setDisabled(false)
                     .onClick(() => {
                         this.getMinioJournalSyncClient().resetAllCaches();
@@ -357,9 +354,8 @@ export function paneMaintenance(
             .setName("Fresh Start Wipe")
             .setDesc("Delete all data on the remote server.")
             .addButton((button) =>
-                button
+                setButtonDestructiveState(button)
                     .setButtonText("Delete")
-                    .setWarning()
                     .setDisabled(false)
                     .onClick(async () => {
                         await this.getMinioJournalSyncClient().updateCheckPointInfo((info) => ({
@@ -378,12 +374,35 @@ export function paneMaintenance(
     });
 
     void addPanel(paneEl, "Reset").then((paneEl) => {
+        new Setting(paneEl)
+            .setName($msg("obsidianLiveSyncSettingTab.nameDiscardSettings"))
+            .addButton((button) => {
+                setButtonDestructiveState(button)
+                    .setButtonText($msg("obsidianLiveSyncSettingTab.btnDiscard"))
+                    .onClick(async () => {
+                        if (
+                            (await this.core.confirm.askYesNoDialog(
+                                $msg("obsidianLiveSyncSettingTab.msgDiscardConfirmation"),
+                                { defaultOption: "No" }
+                            )) !== "yes"
+                        ) {
+                            return;
+                        }
+                        this.editingSettings = createEditingSettingsAfterFullReset(this.editingSettings);
+                        await this.saveAllDirtySettings();
+                        this.core.settings = createCoreSettingsAfterFullReset();
+                        await this.services.setting.saveSettingData();
+                        await this.services.database.resetDatabase();
+                        this.services.appLifecycle.askRestart();
+                    });
+            })
+            .addOnUpdate(visibleOnly(() => this.isConfiguredAs("isConfigured", true)));
+
         new Setting(paneEl)
             .setName("Delete local database to reset or uninstall Self-hosted LiveSync")
             .addButton((button) =>
-                button
+                setButtonDestructiveState(button)
                     .setButtonText("Delete")
-                    .setWarning()
                     .setDisabled(false)
                     .onClick(async () => {
                         await this.services.database.resetDatabase();